Merge branch 'master' into 01-show-cost-in-trade-output

build.gradle

@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.6-SNAPSHOT'
+    version = '1.5.7-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

common/src/main/java/bisq/common/app/Version.java

@@ -30,14 +30,14 @@ 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.5.6";
+    public static final String VERSION = "1.5.7";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
      * This must not contain each version but only those where we add new version-tagged resource files for
      * historical data stores.
      */
-    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", "1.5.5");
+    public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", "1.5.5", "1.5.7");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

core/src/main/resources/i18n/displayStrings_cs.properties

@@ -78,6 +78,7 @@ shared.offerType=Typ nabídky
 shared.details=Detaily
 shared.address=Adresa
 shared.balanceWithCur=Zůstatek v {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID transakce
 shared.confirmations=Potvrzení
 shared.revert=Návratová Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=DŮLEŽITÉ POŽADAVKY:\nPo proved
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Zaplaťte prosím {0} prodejci BTC pomocí Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=DŮLEŽITÉ POŽADAVKY:\nPo provedení platby zašlete prodejci BTC e-mail s MTCN (sledovací číslo) a fotografii s potvrzením o přijetí.\nPotvrzení musí jasně uvádět celé jméno prodávajícího, město, zemi a částku. E-mail prodejce je: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Kupte si na svém účtu Amazon kartu Amazon eGift za {0} a jako příjemce použijte e-mail nebo mobilní číslo prodejce BTC. V případě, že částka obchodu překročí povolenou částku, pošlete více karet.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Zašlete prosím {0} prodejci BTC pomocí \"US Postal Money Order\".\n\n
@@ -937,6 +936,7 @@ support.noTickets=Žádné otevřené úkoly
 support.sendingMessage=Odesílání zprávy...
 support.receiverNotOnline=Příjemce není online. Zpráva je uložena v jejich schránce.
 support.sendMessageError=Odeslání zprávy se nezdařilo. Chyba: {0}
+support.receiverNotKnown=Příjemce není znám
 support.wrongVersion=Nabídka v tomto sporu byla vytvořena se starší verzí Bisq.\nTento spor nemůžete ukončit s touto verzí aplikace.\n\nPoužijte prosím starší verzi s verzí protokolu {0}
 support.openFile=Otevřete soubor, který chcete připojit (maximální velikost souboru: {0} kb)
 support.attachmentTooLarge=Celková velikost vašich příloh je {0} kb a překračuje maximální povolenou velikost zprávy {1} kB.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Použít tmavý režim
 setting.preferences.sortWithNumOffers=Seřadit seznamy trhů s počtem nabídek/obchodů
 setting.preferences.onlyShowPaymentMethodsFromAccount=Skrýt nepodporované způsoby platby
 setting.preferences.denyApiTaker=Odmítat příjemce, kteří používají API
+setting.preferences.notifyOnPreRelease=Získávat oznámení o beta verzích
 setting.preferences.resetAllFlags=Zrušit všechny "Nezobrazovat znovu"
 settings.preferences.languageChange=Chcete-li použít změnu jazyka na všech obrazovkách, musíte restartovat aplikaci.
 settings.preferences.supportLanguageWarning=V případě sporu mějte na paměti, že zprostředkování je řešeno v {0} a arbitráž v {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=BSQ adresa příjemce
 dao.wallet.send.receiverBtcAddress=BTC adresa příjemce
 dao.wallet.send.setDestinationAddress=Vyplňte svou cílovou adresu
 dao.wallet.send.send=Pošlete BSQ prostředky
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Pošlete BTC prostředky
 dao.wallet.send.sendFunds.headline=Potvrďte žádost o výběr
 dao.wallet.send.sendFunds.details=Odesílání: {0}\nNa adresu pro příjem: {1}.\nPožadovaný poplatek za těžbu je: {2} ({3} satoshi/vbyte)\nVelikost transakce: {4} vKb\n\nPříjemce obdrží: {5}\n\nOpravdu chcete tuto částku vybrat?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transakce BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Průměrná obchodní cena BSQ/BTC za 90 dní
 dao.factsAndFigures.dashboard.avgPrice30=Průměrná obchodní cena BSQ/BTC za 30 dní
-dao.factsAndFigures.dashboard.avgUSDPrice90=90denní objemově vážená průměrná cena USD/BSQ
-dao.factsAndFigures.dashboard.avgUSDPrice30=30denní objemově vážená průměrná cena USD/BSQ
-dao.factsAndFigures.dashboard.marketCap=Tržní kapitalizace (na základě průměrné ceny USD/BSQ za posledních 30 dní)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Celkem k dispozici BSQ
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=Vydaných BSQ vs. Spálených BSQ
 
 dao.factsAndFigures.supply.issued=Vydáno BSQ
+dao.factsAndFigures.supply.compReq=Compensation requests
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ vydané při první (genesis) transakci
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ vydáno na žádosti o odměnu
 dao.factsAndFigures.supply.reimbursementAmount=BSQ vydáno na žádosti o vyrovnání
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=Spálených BSQ
-dao.factsAndFigures.supply.burntMovingAverage=15denní klouzavý průměr
-dao.factsAndFigures.supply.burntZoomToInliers=Přiblížit klouzavý průměr
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Objem obchodu
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Globální stav uzamčených BSQ
 dao.factsAndFigures.supply.totalLockedUpAmount=Zamčeno v úpisech
 dao.factsAndFigures.supply.totalUnlockingAmount=Odemykání BSQ z úpisů
 dao.factsAndFigures.supply.totalUnlockedAmount=Odemčené BSQ z úpisů
 dao.factsAndFigures.supply.totalConfiscatedAmount=Konfiskované BSQ z úpisů
-dao.factsAndFigures.supply.invalidTxs=Spálené BSQ (neplatné transakce)
-dao.factsAndFigures.supply.burntAmount=Spálené BSQ (poplatky)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Genesis transakce
 dao.factsAndFigures.transactions.genesisBlockHeight=Výška počátečního (genesis) bloku
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Počet všech poplatků platebních tra
 dao.factsAndFigures.transactions.invalidTx=Počet všech neplatných transakcí
 dao.factsAndFigures.transactions.irregularTx=Počet všech nepravidelných transakcí
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Dostupný zůstatek
+
 contractWindow.title=Podrobnosti o sporu
 contractWindow.dates=Datum nabídky / Datum obchodu
 contractWindow.btcAddresses=Bitcoinová adresa kupujícího BTC / prodávajícího BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Vyberte vkladovou transakci
 sendAlertMessageWindow.headline=Odeslat globální oznámení
 sendAlertMessageWindow.alertMsg=Výstražná zpráva
 sendAlertMessageWindow.enterMsg=Zadejte zprávu
-sendAlertMessageWindow.isUpdate=Aktualizované oznámení
+sendAlertMessageWindow.isSoftwareUpdate=Oznámení o nové verzi software
+sendAlertMessageWindow.isUpdate=Plná verze
+sendAlertMessageWindow.isPreRelease=Beta verze
 sendAlertMessageWindow.version=Číslo nové verze
 sendAlertMessageWindow.send=Odeslat oznámení
 sendAlertMessageWindow.remove=Odebrat oznámení
@@ -2290,6 +2314,7 @@ popup.warning.seed=seed
 popup.warning.mandatoryUpdate.trading=Aktualizujte prosím na nejnovější verzi Bisq. Byla vydána povinná aktualizace, která zakazuje obchodování se starými verzemi. Další informace naleznete na fóru Bisq.
 popup.warning.mandatoryUpdate.dao=Aktualizujte prosím na nejnovější verzi Bisq. Byla vydána povinná aktualizace, která zakazuje Bisq DAO a BSQ pro staré verze. Další informace naleznete na fóru Bisq.
 popup.warning.disable.dao=Bisq DAO a BSQ jsou dočasně deaktivovány. Další informace naleznete na fóru Bisq.
+popup.warning.noFilter="We did not receive a filter object from the seed nodes." Toto je neočekávaná situace. Prosím upozorněte vývojáře Bisq.
 popup.warning.burnBTC=Tato transakce není možná, protože poplatky za těžbu {0} by přesáhly částku převodu {1}. Počkejte prosím, dokud nebudou poplatky za těžbu opět nízké nebo dokud nenahromadíte více BTC k převodu.
 
 popup.warning.openOffer.makerFeeTxRejected=Transakční poplatek tvůrce za nabídku s ID {0} byl bitcoinovou sítí odmítnut.\nID transakce = {1}.\nNabídka byla odstraněna, aby se předešlo dalším problémům.\nPřejděte do \"Nastavení/Informace o síti\" a proveďte synchronizaci SPV.\nPro další pomoc prosím kontaktujte podpůrný kanál v Bisq Keybase týmu.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Vyberte nebo vyhledejte altcoin
 payment.secret=Tajná otázka
 payment.answer=Odpověď
 payment.wallet=ID peněženky
+payment.amazon.site=Kupte Amazon eGift zde:
+payment.ask=Zjistěte pomocí obchodního chatu
 payment.uphold.accountId=Uživatelské jméno, e-mail nebo číslo telefonu
 payment.moneyBeam.accountId=E-mail nebo číslo telefonu
 payment.venmo.venmoUserName=Uživatelské jméno Venmo
@@ -2655,12 +2682,16 @@ payment.revolut.info=Revolut vyžaduje „uživatelské jméno“ jako ID účtu
 payment.account.revolut.addUserNameInfo={0}\nVáš stávající účet Revolut ({1}) nemá "Uživatelské jméno".\nChcete-li aktualizovat údaje o svém účtu, zadejte své "Uživatelské jméno" Revolut.\nTo neovlivní stav podepisování věku vašeho účtu.
 payment.revolut.addUserNameInfo.headLine=Aktualizujte účet Revolut
 
+payment.amazonGiftCard.upgrade=Platba kartou Amazon eGift nyní vyžaduje také nastavení země.
+payment.account.amazonGiftCard.addCountryInfo={0}\nVáš stávající účet pro platbu kartou Amazon eGift ({1}) nemá nastavenou zemi.\nVyberte prosím zemi, ve které je možné vaše karty Amazon eGift uplatnit.\nTato aktualizace vašeho účtu nebude mít vliv na stáří tohoto účtu.
+payment.amazonGiftCard.upgrade.headLine=Aktualizace účtu pro platbu kartou Amazon eGift
+
 payment.usPostalMoneyOrder.info=Obchodování pomocí amerických poštovních poukázek (USPMO) na Bisq vyžaduje, abyste rozuměli následujícímu:\n\n- Kupující BTC musí před odesláním napsat jméno prodejce BTC do polí plátce i příjemce a pořídit fotografii USPMO a obálku s dokladem o sledování ve vysokém rozlišení.\n- Kupující BTC musí odeslat USPMO prodejci BTC s potvrzením dodávky.\n\nV případě, že je nutná mediace, nebo pokud dojde k obchodnímu sporu, budete povinni poslat fotografie mediátorovi Bisq nebo zástupci pro vrácení peněz spolu s pořadovým číslem USPMO, číslem pošty a částkou dolaru, aby mohli ověřit podrobnosti na webu US Post Office.\n\nNeposkytnutí požadovaných informací mediátorovi nebo arbitrovi bude mít za následek ztrátu případu sporu.\n\nVe všech sporných případech nese odesílatel USPMO 100% břemeno odpovědnosti za poskytnutí důkazů mediátorovi nebo arbitrovi.\n\nPokud těmto požadavkům nerozumíte, neobchodujte pomocí USPMO na Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.
 
 payment.cashByMail.contact=Kontaktní informace
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.cashByMail.contact.prompt=Obálka se jménem nebo pseudonymem by měla být adresována
 payment.f2f.contact=Kontaktní informace
 payment.f2f.contact.prompt=Jak byste chtěli být kontaktováni obchodním partnerem? (e-mailová adresa, telefonní číslo, ...)
 payment.f2f.city=Město pro setkání „tváří v tvář“

core/src/main/resources/i18n/displayStrings_de.properties

@@ -78,6 +78,7 @@ shared.offerType=Angebotstyp
 shared.details=Details
 shared.address=Adresse
 shared.balanceWithCur=Guthaben in {0}
+shared.utxo=Unspent transaction output
 shared.txId=Transaktions-ID
 shared.confirmations=Bestätigungen
 shared.revert=Tx umkehren
@@ -445,8 +446,8 @@ createOffer.warning.buyAboveMarketPrice=Sie zahlen immer {0}% mehr als der aktue
 createOffer.tradeFee.descriptionBTCOnly=Handelsgebühr
 createOffer.tradeFee.descriptionBSQEnabled=Gebührenwährung festlegen
 
-createOffer.triggerPrice.prompt=Optionalen Auslösepreis einstellen
-createOffer.triggerPrice.label=Angebot deaktivieren wenn Marktpreis {0} ist
+createOffer.triggerPrice.prompt=Auslösepreis (optional)
+createOffer.triggerPrice.label=Angebot deaktivieren {0} einem Marktpreis von
 createOffer.triggerPrice.tooltip=Als Schutz vor drastischen Preisbewegungen können Sie einen Auslösepreis festlegen, der das Angebot deaktiviert, wenn der Marktpreis diesen Wert erreicht.
 createOffer.triggerPrice.invalid.tooLow=Wert muss höher sein als {0}
 createOffer.triggerPrice.invalid.tooHigh=Wert muss niedriger sein als {0}
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=WICHTIGE VORAUSSETZUNG: \nNachdem
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Bitte zahlen Sie {0} an den BTC-Verkäufer mit Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=WICHTIGE VORAUSSETZUNG: \nNachdem Sie die Zahlung getätigt haben, senden Sie die MTCN (Tracking-Nummer) und ein Foto der Quittung per E-Mail an den BTC-Verkäufer.\nDie Quittung muss den vollständigen Namen, die Stadt, das Land des Verkäufers und den Betrag deutlich zeigen. Die E-Mail-Adresse des Verkäufers lautet: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Bitte kaufen Sie eine Amazon eGift Card für {0} in Ihrem Amazon-Konto und verwenden Sie die E-Mail- oder Mobilfunknummer des BTC-Verkäufers als Empfänger. Falls der Handelsbetrag den zulässigen Betrag überschreitet, senden Sie mehrere Karten.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Bitte senden Sie {0} per \"US Postal Money Order\" an den BTC-Verkäufer.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Keine offenen Tickets vorhanden
 support.sendingMessage=Nachricht wird gesendet...
 support.receiverNotOnline=Empfänger ist nicht online. Nachricht wird in der Mailbox gespeichert.
 support.sendMessageError=Senden der Nachricht fehlgeschlagen. Fehler: {0}
+support.receiverNotKnown=Empfänger unbekannt
 support.wrongVersion=Das Angebot im Konflikt wurde mit einer älteren Bisq-Version erstellt.\nSie können den Konflikt nicht mir Ihrer Version der Anwendung schließen.\n\nNutzen Sie bitte eine ältere Version mit der Protokollversion {0}
 support.openFile=Anzufügende Datei öffnen (max. Dateigröße: {0} kb)
 support.attachmentTooLarge=Die Gesamtgröße Ihres Anhangs ist {0} kb und überschreitet die maximal erlaubte Nachrichtengröße von {1} kB.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Nacht-Modus benutzen
 setting.preferences.sortWithNumOffers=Marktlisten nach Anzahl der Angebote/Trades sortieren
 setting.preferences.onlyShowPaymentMethodsFromAccount=Nicht unterstützte Zahlungsmethoden ausblenden
 setting.preferences.denyApiTaker=Taker die das API nutzen vermeiden
+setting.preferences.notifyOnPreRelease=Pre-Release Benachrichtungen erhalten
 setting.preferences.resetAllFlags=Alle \"Nicht erneut anzeigen\"-Häkchen zurücksetzen
 settings.preferences.languageChange=Um den Sprachwechsel auf alle Bildschirme anzuwenden ist ein Neustart nötig.
 settings.preferences.supportLanguageWarning=Wenn es zu einem Streitfall kommen sollte, beachten Sie bitte, dass die Mediation in {0} und das Vermittlungsverfahren in {1} geregelt wird.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Adresse des BSQ Empfängers
 dao.wallet.send.receiverBtcAddress=Adresse des BTC Empfängers
 dao.wallet.send.setDestinationAddress=Tragen Sie Ihre Zieladresse ein
 dao.wallet.send.send=BSQ-Gelder senden
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=BTC-Gelder senden
 dao.wallet.send.sendFunds.headline=Abhebeanfrage bestätigen
 dao.wallet.send.sendFunds.details=Senden: {0}\nEmpfangsadresse: {1}.\nBenötigte Mining-Gebühr beträgt: {2} ({3} satoshis/vbyte)\nTransaktion vsize: {4} vKb\n\nDer empfänger wird erhalten: {5}\n\nSind Sie sich sicher die Menge abzuheben?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=BSQ Transaktionen
 
 dao.factsAndFigures.dashboard.avgPrice90=90 Tage durchschnittlicher BSQ/BTC-Handelspreis
 dao.factsAndFigures.dashboard.avgPrice30=30 Tage durchschnittlicher BSQ/BTC-Handelspreis
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 Tage volumengewichteter durchschnittlicher USD/BSQ Trade-Preis
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 Tage volumengewichteter durchschnittlicher USD/BSQ Trade-Preis
-dao.factsAndFigures.dashboard.marketCap=Marktkapitalisierung (basierend auf Handelspreis)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Insgesamt verfügbare BSQ
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=Ausgestellte BSQ v. verbrannte BSQ
 
 dao.factsAndFigures.supply.issued=Ausgestellte BSQ
+dao.factsAndFigures.supply.compReq=Entlohnungsanfragen
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=Ausgestellte BSQ in Genesis-Transaktion
 dao.factsAndFigures.supply.compRequestIssueAmount=Ausgestellte BSQ für Entlohnungsanträge
 dao.factsAndFigures.supply.reimbursementAmount=Ausgestellte BSQ für Rückerstattungsanträge
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=Verbrannte BSQ (Gebühren und Proof-of-Burn)
-dao.factsAndFigures.supply.burntMovingAverage=15-Tage-Gleitender Durchschnitt
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom zu Inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Handelsvolumen
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Globaler Zustand der gesperrten BSQ
 dao.factsAndFigures.supply.totalLockedUpAmount=In Pfänden gesperrt
 dao.factsAndFigures.supply.totalUnlockingAmount=BSQ von Pfand auslösen
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ von Pfand ausgelöst
 dao.factsAndFigures.supply.totalConfiscatedAmount=Konfiszierte BSQ von Pfänden
-dao.factsAndFigures.supply.invalidTxs=Verbrannte BSQ (ungültige Transaktionen)
-dao.factsAndFigures.supply.burntAmount=Verbrannte BSQ (Gebühren)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Ursprungstransaktion
 dao.factsAndFigures.transactions.genesisBlockHeight=Genesisblock-Höhe
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Anzahl aller Transaktionen von bezahlte
 dao.factsAndFigures.transactions.invalidTx=Anzahl aller ungültigen Transaktionen
 dao.factsAndFigures.transactions.irregularTx=Anzahl aller irregulären Transaktionen
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Verfügbarer Betrag
+
 contractWindow.title=Konfliktdetails
 contractWindow.dates=Angebotsdatum / Handelsdatum
 contractWindow.btcAddresses=Bitcoinadresse BTC-Käufer / BTC-Verkäufer
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Kautionstransaktion auswählen
 sendAlertMessageWindow.headline=Globale Benachrichtigung senden
 sendAlertMessageWindow.alertMsg=Warnmeldung
 sendAlertMessageWindow.enterMsg=Nachricht eingeben
-sendAlertMessageWindow.isUpdate=Ist Aktualisierungs-Benachrichtigung
+sendAlertMessageWindow.isSoftwareUpdate=Software Download Benachrichtigung
+sendAlertMessageWindow.isUpdate=Ist voller Release
+sendAlertMessageWindow.isPreRelease=Ist Pre-Release
 sendAlertMessageWindow.version=Neue Versionsnummer
 sendAlertMessageWindow.send=Benachrichtigung senden
 sendAlertMessageWindow.remove=Benachrichtigung entfernen
@@ -2290,6 +2314,7 @@ popup.warning.seed=Seed
 popup.warning.mandatoryUpdate.trading=Bitte aktualisieren Sie auf die neueste Bisq-Version. Es wurde ein obligatorisches Update veröffentlicht, das den Handel mit alten Versionen deaktiviert. Bitte besuchen Sie das Bisq-Forum für weitere Informationen.
 popup.warning.mandatoryUpdate.dao=Bitte aktualisieren Sie auf die neueste Bisq-Version. Ein obligatorisches Update wurde veröffentlicht, das die Bisq DAO und BSQ für alte Versionen deaktiviert. Bitte besuchen Sie das Bisq-Forum für weitere Informationen.
 popup.warning.disable.dao=Der Bisq DAO und BSQ sind temporär deaktiviert. Bitte besuchen sie das Bisq-Forum für weitere Informationen.
+popup.warning.noFilter=Wir haben kein Filterobjekt von den Seed Nodes erhalten. Diese Situation ist unerwartet. Bitte informieren Sie die Bisq Entwickler.
 popup.warning.burnBTC=Die Transaktion ist nicht möglich, da die Mininggebühren von {0} den übertragenen Betrag von {1} überschreiten würden. Bitte warten Sie, bis die Gebühren wieder niedrig sind, oder Sie mehr BTC zum übertragen angesammelt haben.
 
 popup.warning.openOffer.makerFeeTxRejected=Die Verkäufergebühren-Transaktion für das Angebot mit der ID {0} wurde vom Bitcoin-Netzwerk abgelehnt.\nTransaktions-ID={1}.\nDas Angebot wurde entfernt, um weitere Probleme zu vermeiden.\nBitte gehen Sie zu \"Einstellungen/Netzwerkinformationen\" und führen Sie eine SPV-Resynchronisierung durch.\nFür weitere Hilfe wenden Sie sich bitte an den Bisq-Support-Kanal des Bisq Keybase Teams.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Altcoin wählen oder suchen
 payment.secret=Geheimfrage
 payment.answer=Antwort
 payment.wallet=Wallets-ID
+payment.amazon.site=Kaufe Geschenkkarte auf
+payment.ask=Im Trader Chat fragen
 payment.uphold.accountId=Nutzername oder Email oder Telefonnr.
 payment.moneyBeam.accountId=E-Mail oder Telefonnummer
 payment.venmo.venmoUserName=Venmo Nutzername
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut benötigt den "Benutzernamen" als Account ID und ni
 payment.account.revolut.addUserNameInfo={0}\nDein existierendes Revolut Konto ({1}) hat keinen "Benutzernamen".\nBitte geben Sie Ihren Revolut "Benutzernamen" ein um Ihre Kontodaten zu aktualisieren.\nDas wird Ihr Kontoalter und die Verifizierung nicht beeinflussen.
 payment.revolut.addUserNameInfo.headLine=Revolut Account updaten
 
+payment.amazonGiftCard.upgrade=Bei der Zahlungsmethode Amazon Geschenkkarten muss das Land angegeben werden.
+payment.account.amazonGiftCard.addCountryInfo={0}\nDein bestehendes Amazon Geschenkkarten Konto ({1}) wurde keinem Land zugeteilt.\nBitte geben Sie das Amazon Geschenkkarten Land ein um Ihre Kontodaten zu aktualisieren.\nDas wird ihr Kontoalter nicht beeinflussen.
+payment.amazonGiftCard.upgrade.headLine=Amazon Geschenkkarte Konto updaten
+
 payment.usPostalMoneyOrder.info=Der Handel auf Bisq unter Verwendung eines US Postal Money Orders (USPMO) setzt voraus, dass Sie Folgendes verstehen:\n\n- Der BTC-Käufer muss den Namen des BTC-Verkäufers sowohl in das Feld des Zahlers als auch in das Feld des Zahlungsempfängers eintragen und vor dem Versand ein hochauflösendes Foto des USPMO und des Umschlags mit dem Tracking-Nachweis machen.\n- Der BTC-Käufer muss den USPMO zusammen mit der Lieferbestätigung an den BTC-Verkäufer schicken.\n\nFür den Fall, dass eine Mediation erforderlich ist oder es zu einem Handelskonflikt kommt, müssen Sie die Fotos zusammen mit der USPMO-Seriennummer, der Nummer des Postamtes und dem Dollarbetrag an den Bisq-Mediator oder Erstattungsagenten schicken, damit dieser die Angaben auf der Website des US-Postamtes überprüfen kann.\n\nWenn Sie dem Mediator oder Vermittler die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nIn allen Konfliktfällen trägt der USPMO-Absender 100 % der Verantwortung für die Bereitstellung von Beweisen/Nachweisen für den Mediator oder Vermittler.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie bitte nicht auf Bisq unter Verwendung eines USPMO.
 
 payment.cashByMail.info=Beim Bargeld per Post Handel auf Bisq, müssen Sie folgendes verstehen: \n\n● Der BTC Käufer sollte das Bargeld in einen manipulationssicheren Geldbeutel verpacken.\n● Der BTC Käufer sollte den Verpackungsprozess des Bargeldes filmen oder mit hochauflösenden Fotos dokumentieren. Die Adresse & Tracking Nummer sollen auf der Packung bereits angebracht sein.\n● Der BTC Käufer sollte das Bargeld mit Versandbestätigung und ausreichender Versicherung an den Verkäufer senden.\n● Der BTC Verkäufer sollte die Öffnung des Bargeld-Paketes so filmen, dass die Tracking Nummer des Senders im Video sichtbar ist.\n● Der Ersteller des Angebots muss spezielle Bedingungen oder Abmachungen im 'Zusätzliche Informationen'-Feld des Zahlungskontos eintragen.\n● Der Annehmer des Angebots akzeptiert die Bedingungen und Abmachungen des Ersteller des Angebots durch die Annahme des Angebots.\n\nBargeld per Post Trades benötigen die Ehrlichkeit und das Vertrauen beider Peers.\n\n● Bargeld per Post Trades haben weniger verifizierbare Handlungen als andere FIAT Trades. Das macht die Abwicklung von Konflikten viel schwerer.\nCBM trades put the onus to act honestly squarely on both peers.\n● Versuchen Sie den Konflikt mit dem Handelspartner direkt über den Trader Chat zu lösen. Das ist der vielversprechendste Weg Konflikte bei solchen  Trades zu lösen.\n● Mediatoren können den Fall untersuchen und einen Vorschlag machen aber es ist nicht garantiert, dass sie wirklich helfen können.\n● Wenn ein Mediator eingeschalten wurde und beide Peers den Vorschlag des Mediators ablehnen, werden die Gelder beider Peers zu einer Bisq Spendenadresse [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] gesendet und der Trade ist somit abgeschlossen.\n● Wenn ein Trader den Vorschlag des Mediators ablehnt und eine Arbitration eröffnet, kann es zu einem Verlust der Trading- und der Deposit-Funds kommen.\n● Arbitratoren werden ihre Entscheidungen basierend auf den zur Verfügung gestellten Beweisen treffen. Deshalb sollten Sie die Abläufe von oben befolgen und dokumentieren um im Falle eines Konflikts Beweise zu haben. Bei Bargeld per Post Trades ist die Entscheidung des Arbitrators entscheidend.\n● Rückerstattungsanfragen, von verlorenen Funds durch einen Bargeld per Post Trade, über die DAO werden nicht berücksichtigt.\n\nUm sicherzustellen, dass Sie die Anforderungen bei Bargeld per Post Trades verstanden haben lesen Sie: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\nWenn Sie diese Anforderungen nicht verstehen, nutzen Sie die Bisq-Zahlungsmethode Bargeld per Post nicht.

core/src/main/resources/i18n/displayStrings_es.properties

@@ -78,6 +78,7 @@ shared.offerType=Tipo de oferta
 shared.details=Detalles
 shared.address=Dirección
 shared.balanceWithCur=Saldo en {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID de la transacción
 shared.confirmations=Confirmaciones
 shared.revert=Revertir Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=REQUERIMIENTO IMPORTANTE:\nDespué
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Por favor pague {0} al vendedor de BTC usando Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=REQUERIMIENTO IMPORTANTE:\nDespués de haber realizado el pago envíe el MTCN (número de seguimiento) y una foto de el recibo por email a el vendedor de BTC.\nEl recibo debe mostrar claramente el nombre completo del emisor, la ciudad, país y la cantidad. El email del vendedor es: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Por favor compre una Tarjeta Amazon eGift por {0} en su cuenta Amazon y use el email del vendedor BTC o el número de móvil como receptor. En caso de que la cantidad de intercambio exceda la cantidad permitida, envíe múltiples tarjetas.
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Por favor envíe {0} mediante \"US Postal Money Order\" a el vendedor de BTC.\n\n
@@ -633,7 +632,7 @@ portfolio.pending.step2_buyer.f2f=Por favor contacte al vendedor de BTC con el c
 portfolio.pending.step2_buyer.startPaymentUsing=Comenzar pago utilizando {0}
 portfolio.pending.step2_buyer.recipientsAccountData=Receptores {0}
 portfolio.pending.step2_buyer.amountToTransfer=Cantidad a transferir
-portfolio.pending.step2_buyer.sellersAddress=Dirección de vendedor {0}
+portfolio.pending.step2_buyer.sellersAddress=Dirección  {0} del vendedor
 portfolio.pending.step2_buyer.buyerAccount=Su cuenta de pago para ser usada
 portfolio.pending.step2_buyer.paymentStarted=Pago iniciado
 portfolio.pending.step2_buyer.warn=¡Todavía no ha realizado su pago {0}!\nPor favor, tenga en cuenta que el pago tiene que completarse antes de {1}.
@@ -937,6 +936,7 @@ support.noTickets=No hay tickets abiertos
 support.sendingMessage=Enviando mensaje...
 support.receiverNotOnline=El receptor no está conectado. El mensaje se ha guardado en su bandeja de entrada.
 support.sendMessageError=El envío del mensaje no tuvo éxito. Error: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=La oferta en esta disputa ha sido creada con una versión antigua de Bisq.\nNo puede cerrar esta disputa con su versión de la aplicación.\n\nPor favor, utilice una versión anterior con la versión de protocolo {0}
 support.openFile=Abrir archivo a adjuntar (tamaño máximo del archivo: {0} kb)
 support.attachmentTooLarge=El tamaño total de sus adjuntos es {0} kb y excede el máximo permitido por mensaje de {1} kB.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Usar modo oscuro
 setting.preferences.sortWithNumOffers=Ordenar listas de mercado por número de ofertas/intercambios
 setting.preferences.onlyShowPaymentMethodsFromAccount=Ocultar métodos de pago no soportados
 setting.preferences.denyApiTaker=Denegar tomadores usando la misma API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Restablecer todas las casillas \"No mostrar de nuevo\"
 settings.preferences.languageChange=Para aplicar un cambio de idioma en todas las pantallas, se precisa reiniciar.
 settings.preferences.supportLanguageWarning=En caso de disputa, tenga en cuenta que la mediación se maneja en {0} y el arbitraje en {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Dirección BSQ del receptor
 dao.wallet.send.receiverBtcAddress=Dirección BTC del receptor
 dao.wallet.send.setDestinationAddress=Introduzca su dirección de destino
 dao.wallet.send.send=Enviar fondos BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Enviar fondos BTC
 dao.wallet.send.sendFunds.headline=Confirme la petición de retiro
 dao.wallet.send.sendFunds.details=Enviando: {0}\nA la dirección receptora: {1}.\nLa tasa de minado requerida es: {2} ({3} satoshis/vbyte)\nTamaño de la transacción: {4} Kb\n\nEl receptor recibirá: {5}\n\nEstá seguro de que quiere retirar esa cantidad?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transacciones BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Medía de 90 días del precio de intercambio BSQ/BTC
 dao.factsAndFigures.dashboard.avgPrice30=Medía de 30 días del precio de intercambio BSQ/BTC
-dao.factsAndFigures.dashboard.avgUSDPrice90=Media ponderada por volumen de 90 días del precio de USD/BSQ
-dao.factsAndFigures.dashboard.avgUSDPrice30=Media ponderada por volumen de 30 días del precio de USD/BSQ
-dao.factsAndFigures.dashboard.marketCap=Capitalización de mercado (basado en la media de 30 días del precio USD/BSQ)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=BSQ totales disponibles
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ emitidos v. BSQ quemados
 
 dao.factsAndFigures.supply.issued=BSQ emitidos
+dao.factsAndFigures.supply.compReq=Solicitudes de compensación
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ emitidos en la transacción génesis
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ emitidos para solicitudes de compensación
 dao.factsAndFigures.supply.reimbursementAmount=BSQ emitidos para solicitudes de reembolso
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ quemados
-dao.factsAndFigures.supply.burntMovingAverage=media móvil de 15 días
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom a inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Volumen de intercambio
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Estado global de BSQ bloqueados
 dao.factsAndFigures.supply.totalLockedUpAmount=Bloqueados en garantías
 dao.factsAndFigures.supply.totalUnlockingAmount=Desbloqueando BSQ de garantías
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ desbloqueados de garantías
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ confiscados de garantías
-dao.factsAndFigures.supply.invalidTxs=BSQ quemados (transacciones inválidas)
-dao.factsAndFigures.supply.burntAmount=BSQ quemados (comisiones)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Transacción génesis
 dao.factsAndFigures.transactions.genesisBlockHeight=Altura de bloque génesis
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=No. de todas las transacciones de tasa
 dao.factsAndFigures.transactions.invalidTx=No. de todas las transacciones inválidas
 dao.factsAndFigures.transactions.irregularTx=No. de todas las transacciones irregulares
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Saldo disponible
+
 contractWindow.title=Detalles de la disputa
 contractWindow.dates=Fecha oferta / Fecha intercambio
 contractWindow.btcAddresses=Dirección Bitcoin comprador BTC / vendedor BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Selección depósito de transacción
 sendAlertMessageWindow.headline=Enviar notificación global
 sendAlertMessageWindow.alertMsg=Mensaje de alerta:
 sendAlertMessageWindow.enterMsg=Introducir mensaje
-sendAlertMessageWindow.isUpdate=Es notificación actualización
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Nueva versión no.
 sendAlertMessageWindow.send=Enviar notificación
 sendAlertMessageWindow.remove=Eliminar notificación
@@ -2290,6 +2314,7 @@ popup.warning.seed=semilla
 popup.warning.mandatoryUpdate.trading=Por favor, actualice a la última versión de Bisq. Se lanzó una actualización obligatoria que inhabilita intercambios con versiones anteriores. Por favor, lea el Foro de Bisq para más información\n
 popup.warning.mandatoryUpdate.dao=Por favor, actualice a la última versión de Bisq. Se lanzó una actualización obligatoria que inhabilita la DAO Bisq y BSQ para las versiones anteriores. Por favor, visite el Foro de Bisq para más información
 popup.warning.disable.dao=El DAO Bisq y BSQ estén temporalmente deshabilitados. Por favor revise el foro de Bisq para más información.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Esta transacción no es posible, ya que las comisiones de minado de {0} excederían la cantidad a transferir de {1}. Por favor, espere a que las comisiones de minado bajen o hasta que haya acumulado más BTC para transferir.
 
 popup.warning.openOffer.makerFeeTxRejected=La tasa de transacción para la oferta con ID {0} se rechazó por la red Bitcoin.\nID de transacción={1}\nLa oferta se ha eliminado para evitar futuros problemas.\nPor favor vaya a \"Configuración/Información de red\" y haga una resincronización SPV.\nPara más ayuda por favor contacte con el equipo de soporte de Bisq en el canal de Bisq en Keybase.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Seleccionar o buscar altcoin
 payment.secret=Pregunta secreta
 payment.answer=Respuesta
 payment.wallet=ID de cartera:
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Nombre de usuario, correo electrónico o núm de teléfono
 payment.moneyBeam.accountId=Correo electrónico o núm. de telefóno
 payment.venmo.venmoUserName=Nombre de usuario Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requiere el 'nombre de usuario' como ID de cuenta y
 payment.account.revolut.addUserNameInfo={0}\nSu cuenta de Revolut ({1}) no tiene un "nombre de usuario".\nPor favor introduzca su "nombre de usuario" en Revolut para actualizar sus datos de cuenta.\nEsto no afectará a su estado de edad de firmado de cuenta.
 payment.revolut.addUserNameInfo.headLine=Actualizar cuenta Revolut
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Los intercambios usando US Postal Money Orders (USPMO) en Bisq requiere que entienda lo siguiente:\n\n- Los compradores de BTC deben escribir la dirección del vendedor en los campos de "Payer" y "Payee" y tomar una foto en alta resolución de la USPMO y del sobre con la prueba de seguimiento antes de enviar.\n- Los compradores de BTC deben enviar la USPMO con confirmación de entrega.\n\nEn caso de que sea necesaria la mediación, se requerirá al comprador que entregue las fotos al mediador o agente de devolución de fondos, junto con el número de serie de la USPMO, número de oficina postal, y la cantidad de USD, para que puedan verificar los detalles en la web de US Post Office.\n\nNo entregar la información requerida al Mediador o Árbitro resultará en pérdida del caso de disputa. \n\nEn todos los casos de disputa, el emisor de la USPMO tiene el 100% de responsabilidad en aportar la evidencia al Mediador o Árbitro.\n\nSi no entiende estos requerimientos, no comercie usando USPMO en Bisq.
 
 payment.cashByMail.info=Comerciar usando efectivo por correo (CBM) en Bisq requiere que entienda lo siguiente:\n\n● El comprador de BTC debe empaquetar el efectivo en una bolsa de efectivo a prueba de manipulación.\n● El comprador de BTC debe filmar o tomar fotos de alta resolución del empaquetado junto con la dirección y el número de seguimiento ya añadido al paquete.\n● El comprador de BTC debe enviar el paquete de efectivo al vendedor con la confirmación de entrega y un seguro apropiado.\n●  El vendedor de BTC debe filmar la apertura del paquete, asegurándose de que el número de seguimiento entregado por el emisor es visible en todo el video.\n● El creador de la oferta debe especificar cualquier términos o condiciones especiales en el campo 'Información adicional' de la cuenta de pago.\n● Al tomar la oferta, el tomador indica estar de acuredo con los términos y condiciones del tomador.\n\nLos intercambios CBM responsabilizan a ambos pares de actuar honestamente.\n\n● Los intercambios CBM tienen menos acciones verificables que otrosintrecambios de fiat. Esto hace más complicado manejar disputas.\n● Intente a resolver las disputas directamente con su par utilizando el chat de intercambio. Esta es la ruta más prometedora.\n● Los mediadores pueden considerar su caso y hacer una sugerencia, pero no está garantizado que vayan a ayudar.\n● Si se solicita mediación, y si algún par rechaza la sugerencia de mediación, los fondos de ambos pares se enviarán a la dirección de 'donación' de Bisq[HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], y el intercambio concluirá.\n● Si un comerciante rechaza la sugerencia de mediación y abre arbitraje, podría llevar a la pérdida de todos los fondos, de intercambio y depósitos de seguridad.\n● El árbitro tomará una decisión basada en la evidencia entregada. Por tanto, por favor siga y documente el proceso indicado arriba para tener evidencia en caso de disputa.\n● Las solicitudes de reembolso de fondos perdidos resultantes de CBM en la DAO no serán considerados.\n\nAsegúrese de que entiende los requerimientos de los intercambios CBM leyendo: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nSi no entiende estos requisitos, no intercambie usando CBM.

core/src/main/resources/i18n/displayStrings_fa.properties

@@ -78,6 +78,7 @@ shared.offerType=نوع پیشنهاد
 shared.details=جزئیات
 shared.address=آدرس
 shared.balanceWithCur=تراز در {0}
+shared.utxo=Unspent transaction output
 shared.txId=شناسه تراکنش
 shared.confirmations=تاییدیه‌ها
 shared.revert=بازگرداندن تراکنش
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=مورد الزامی مهم:\nب
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=لطفاً {0} را با استفاده از Western Union به فروشنده‌ی بیتکوین پرداخت کنید.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=مورد الزامی مهم:\nبعد از اینکه پرداخت را انجام دادید، MTCN (عدد پیگیری) و یک عکس از رسید را با ایمیل به فروشنده‌ی بیتکوین ارسال کنید.\nرسید باید به طور واضح نام کامل، کشور، ایالت فروشنده و مقدار را نشان دهد. ایمیل فروشنده: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=لطفاً {0} را توسط \"US Postal Money Order\" به فروشنده‌ی بیتکوین پرداخت کنید.\n\n
@@ -937,6 +936,7 @@ support.noTickets=هیچ تیکتی به صورت باز وجود ندارد
 support.sendingMessage=در حال ارسال پیام ...
 support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox.
 support.sendMessageError=ارسال پیام ناموفق بود. خطا: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=پیشنهاد در آن مناقشه با یک نسخه‌ی قدیمی از Bisq ایجاد شده است.\nشما نمی توانید آن مناقشه را با نسخه‌ی برنامه‌ی خودتان ببندید.\n\nلطفاً از یک نسخه‌ی قدیمی‌تر با پروتکل نسخه‌ی {0} استفاده کنید
 support.openFile=انتخاب فایل به منظور پیوست (حداکثر اندازه فایل: {0} کیلوبایت)
 support.attachmentTooLarge=مجموع اندازه ضمائم شما {0} کیلوبایت است و از حداکثر اندازه ی مجاز پیام {1} کیلوبایت، بیشتر شده است.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Use dark mode
 setting.preferences.sortWithNumOffers=مرتب سازی لیست‌ها با تعداد معاملات/پیشنهادها
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=تنظیم مجدد تمام پرچم‌های \"دوباره نشان نده\"
 settings.preferences.languageChange=اعمال تغییر زبان به تمام صفحات مستلزم یک راه‌اندازی مجدد است.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=آدرس BSQ گیرنده
 dao.wallet.send.receiverBtcAddress=آدرس BTC گیرنده
 dao.wallet.send.setDestinationAddress=آدرس مقصد خود را پر کنید
 dao.wallet.send.send=ارسال وجوه BSQ 
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=ارسال وجوه BTC
 dao.wallet.send.sendFunds.headline=تأیید درخواست برداشت
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=تراکنش‌های BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=90 days average BSQ/BTC trade price
 dao.factsAndFigures.dashboard.avgPrice30=30 days average BSQ/BTC trade price
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=مجموع BSQ در دسترس
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ issued v. BSQ burnt
 
 dao.factsAndFigures.supply.issued=BSQ issued
+dao.factsAndFigures.supply.compReq=درخواست های خسارت
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ صادر شده در تراکنش پیدایش
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ صادر شده برای درخواست‌های مصادره
 dao.factsAndFigures.supply.reimbursementAmount=BSQ صادر شده برای درخواست‌های بازپرداخت
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ burnt
-dao.factsAndFigures.supply.burntMovingAverage=15-day moving average
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom to inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=حجم معامله
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=وضعیت جهانی BSQ های قفل شده
 dao.factsAndFigures.supply.totalLockedUpAmount=قفل شده در ضمانت‌ها
 dao.factsAndFigures.supply.totalUnlockingAmount=رها کردن BSQ از ضمانت‌ها
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ رها شده از ضمانت‌ها
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ مصادره شده از ضمانت‌ها
-dao.factsAndFigures.supply.invalidTxs=Burned BSQ (invalid transactions)
-dao.factsAndFigures.supply.burntAmount=BSQ امحا شده (کارمزدها)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=تراکنش پیدایش
 dao.factsAndFigures.transactions.genesisBlockHeight=طول بلاک پیدایش
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=تعداد تمام تراکنش‌ها
 dao.factsAndFigures.transactions.invalidTx=No. of all invalid transactions
 dao.factsAndFigures.transactions.irregularTx=No. of all irregular transactions
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=موجودی در دسترس
+
 contractWindow.title=جزئیات مناقشه
 contractWindow.dates=تاریخ پیشنهاد / تاریخ معامله
 contractWindow.btcAddresses=آدرس بیت‌کوین خریدار BTC / فروشنده BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=انتخاب تراکنش سپرده
 sendAlertMessageWindow.headline=ارسال اطلاع رسانی جهانی
 sendAlertMessageWindow.alertMsg=پیام هشدار
 sendAlertMessageWindow.enterMsg=وارد کردن پیام
-sendAlertMessageWindow.isUpdate=اعلان بروز رسانی باشد
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=شماره نسخه جدید
 sendAlertMessageWindow.send=ارسال اطلاع رسانی
 sendAlertMessageWindow.remove=حذف اطلاع رسانی
@@ -2290,6 +2314,7 @@ popup.warning.seed=دانه
 popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information.
 popup.warning.mandatoryUpdate.dao=Please update to the latest Bisq version. A mandatory update was released which disables the Bisq DAO and BSQ for old versions. Please check out the Bisq Forum for more information.
 popup.warning.disable.dao=The Bisq DAO and BSQ are temporary disabled. Please check out the Bisq Forum for more information.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more BTC to transfer.
 
 popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=سوال محرمانه
 payment.answer=پاسخ
 payment.wallet=شناسه کیف پول
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=نام کاربری یا ایمیل یا شماره تلفن
 payment.moneyBeam.accountId=ایمیل یا شماره تلفن
 payment.venmo.venmoUserName=نام کاربری Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_fr.properties

@@ -78,6 +78,7 @@ shared.offerType=Type d'ordre
 shared.details=Détails
 shared.address=Adresse
 shared.balanceWithCur=Balance en {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID de la transaction
 shared.confirmations=Confirmations
 shared.revert=Revertir le Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=CONDITIONS REQUISES:\nAprès avoir
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Veuillez s''il vous plaît payer {0} au vendeur de BTC en utilisant Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=CONDITIONS REQUISES:\nAprès avoir effectué le paiement envoyez le MTCN (numéro de suivi) et une photo du reçu par e-mail au vendeur de BTC.\nLe reçu doit faire clairement figurer le nom complet du vendeur, son pays, l''état et le montant. Le mail du vendeur est: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Merci d''envoyer {0} par \"US Postal Money Order\" au vendeur de BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Il n'y a pas de tickets ouverts
 support.sendingMessage=Envoi du message...
 support.receiverNotOnline=Le destinataire n'est pas en ligne. Le message est enregistré dans leur boîte mail.
 support.sendMessageError=Échec de l''envoi du message. Erreur: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=L''ordre relatif au litige en question a été créé avec une ancienne version de Bisq.\nVous ne pouvez pas clore ce litige avec votre version de l''application.\n\nVeuillez utiliser une version plus ancienne avec la version du protocole {0}
 support.openFile=Ouvrir le fichier à joindre (taille max. du fichier : {0} kb)
 support.attachmentTooLarge=La taille totale de vos pièces jointes est de {0} ko ce qui dépasse la taille maximale autorisée de {1} ko pour les messages.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Utiliser le mode sombre
 setting.preferences.sortWithNumOffers=Trier les listes de marché avec le nombre d'ordres/de transactions
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Réinitialiser toutes les balises de notification \"Don't show again\"
 settings.preferences.languageChange=Un redémarrage est nécessaire pour appliquer le changement de langue à tous les écrans.
 settings.preferences.supportLanguageWarning=En cas de litige, veuillez noter que la médiation est traitée en {0} et l'arbitrage en {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Adresse BSQ du destinataire
 dao.wallet.send.receiverBtcAddress=Adresse BTC du destinataire
 dao.wallet.send.setDestinationAddress=Remplissez votre adresse de destination
 dao.wallet.send.send=Envoyer des fonds en BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Envoyer des fonds en BTC
 dao.wallet.send.sendFunds.headline=Confirmer la demande de retrait
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transactions BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Moyenne sur 90 jours du prix d'échange BSQ/BTC
 dao.factsAndFigures.dashboard.avgPrice30=Moyenne sur 30 jours du prix d'échange BSQ/BTC
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=BSQ disponible au total
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ issued v. BSQ burnt
 
 dao.factsAndFigures.supply.issued=BSQ émis
+dao.factsAndFigures.supply.compReq=Requêtes de compensation
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ émis lors de la transaction genesis
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ émis pour les demandes de compensation
 dao.factsAndFigures.supply.reimbursementAmount=BSQ émis pour les demandes de remboursement
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ précédemment burn
-dao.factsAndFigures.supply.burntMovingAverage=15-day moving average
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom to inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Volume d'échange
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=État global des BSQ verrouillés
 dao.factsAndFigures.supply.totalLockedUpAmount=Verrouillé dans les bonds
 dao.factsAndFigures.supply.totalUnlockingAmount=Déverrouillage des BSQ en bonds
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ déverrouillés des bonds
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ confisqués en bonds
-dao.factsAndFigures.supply.invalidTxs=BSQ burn (transactions invalides)
-dao.factsAndFigures.supply.burntAmount=BSQ burn (frais)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Transaction genesis
 dao.factsAndFigures.transactions.genesisBlockHeight=Hauteur de bloc du bloc genesis
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Nombre de transactions ayant occasionn
 dao.factsAndFigures.transactions.invalidTx=Nombre de transactions invalides
 dao.factsAndFigures.transactions.irregularTx=Nombre des transactions irrégulières
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Solde disponible
+
 contractWindow.title=Détails du conflit
 contractWindow.dates=Date de l'ordre / date de l'échange
 contractWindow.btcAddresses=Adresse Bitcoin BTC acheteur / vendeur BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Sélectionner la transaction de dépôt
 sendAlertMessageWindow.headline=Envoyer une notification globale
 sendAlertMessageWindow.alertMsg=Message d'alerte
 sendAlertMessageWindow.enterMsg=Entrer le message
-sendAlertMessageWindow.isUpdate=Est la notification de mise à jour
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Nouvelle version N°
 sendAlertMessageWindow.send=Envoyer une notification
 sendAlertMessageWindow.remove=Supprimer une notification
@@ -2290,6 +2314,7 @@ popup.warning.seed=seed
 popup.warning.mandatoryUpdate.trading=Veuillez faire une mise à jour vers la dernière version de Bisq. Une mise à jour obligatoire a été publiée, laquelle désactive le trading sur les anciennes versions. Veuillez consulter le Forum Bisq pour obtenir plus d'informations.
 popup.warning.mandatoryUpdate.dao=Veuillez faire une mise à jour vers la dernière version de Bisq. Une mise à jour obligatoire a été publiée, laquelle désactive la DAO de Bisq et BSQ  sur les anciennes versions. Veuillez consulter le Forum Bisq pour obtenir plus d'informations.
 popup.warning.disable.dao=La DAO de Bisq et BSQ sont désactivés temporairement. Veuillez consulter le Forum Bisq pour obtenir plus d'informations.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Cette transaction n''est pas possible, car les frais de minage de {0} dépasseraient le montant à transférer de {1}. Veuillez patienter jusqu''à ce que les frais de minage soient de nouveau bas ou jusqu''à ce que vous ayez accumulé plus de BTC à transférer.
 
 popup.warning.openOffer.makerFeeTxRejected=La transaction de frais de maker pour l''offre avec ID {0} a été rejetée par le réseau Bitcoin.\nID de transaction={1}.\nL''offre a été retirée pour éviter d''autres problèmes.\nAllez dans \"Paramètres/Info sur le réseau réseau\" et faites une resynchronisation SPV.\nPour obtenir de l''aide, le canal support de l''équipe Bisq disposible sur Keybase.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Question secrète
 payment.answer=Réponse
 payment.wallet=ID du portefeuille
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Nom d'utilisateur ou email ou N° de téléphone
 payment.moneyBeam.accountId=Email ou N° de téléphone
 payment.venmo.venmoUserName=Nom d'utilisateur Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Pour échanger US Postal Money Orders (USPMO) sur Bisq, vous devez comprendre les termes suivants: \n\n- L'acheteur BTC doit écrire le nom du vendeur BTC dans les champs expéditeur et bénéficiaire, et prendre une photo à haute résolution de USPMO et de l'enveloppe avec une preuve de suivi avant l'envoi. \n\n- L'acheteur BTC doit envoyer USPMO avec la confirmation de livraison au vendeur BTC. \n\nSi une médiation est nécessaire, ou s'il y a un différend de transaction, vous devrez envoyer la photo avec le numéro USPMO, le numéro du bureau de poste et le montant de la transaction au médiateur Bisq ou à l'agent de remboursement afin qu'ils puissent vérifier les détails sur le site web de la poste américaine. \n\nSi vous ne fournissez pas les données de transaction requises, vous perdrez directement dans le différend. \n\nDans tous les cas de litige, l'expéditeur de l'USPMO assume à 100% la responsabilité lors de la fourniture de preuves / certification au médiateur ou à l'arbitre. \n\nSi vous ne comprenez pas ces exigences, veuillez ne pas échanger USPMO sur Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_it.properties

@@ -78,6 +78,7 @@ shared.offerType=Tipo di offerta
 shared.details=Dettagli
 shared.address=Indirizzo
 shared.balanceWithCur=Saldo in {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID Transazione
 shared.confirmations=Conferme
 shared.revert=Storno Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=REQUISITO IMPORTANTE:\nDopo aver e
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Si prega di pagare {0} al venditore BTC utilizzando Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDopo aver effettuato il pagamento, invia l'MTCN (numero di tracciamento) e una foto della ricevuta via e-mail al venditore BTC.\nLa ricevuta deve mostrare chiaramente il nome completo, la città, il paese e l'importo del venditore. L'email del venditore è: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Invia {0} tramite \"Vaglia Postale Statunitense\" al venditore BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Non ci sono ticket aperti
 support.sendingMessage=Inviando il messaggio ...
 support.receiverNotOnline=Il destinatario non è online. Il messaggio viene salvato nella loro casella di posta.
 support.sendMessageError=Invio messaggio non riuscito. Errore: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=L'offerta in quella controversia è stata creata con una versione precedente di Bisq.\nNon puoi chiudere quella controversia con la versione della tua applicazione.\n\nUtilizza una versione precedente con la versione del protocollo {0}
 support.openFile=Apri il file da allegare (dimensione massima del file: {0})
 support.attachmentTooLarge=La dimensione dei tuoi allegati è di {0} e supera il massimo consentito di {1} kB.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Usa modalità notte
 setting.preferences.sortWithNumOffers=Ordina le liste di mercato con n. di offerte/scambi
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Ripristina tutti i flag \"Non mostrare più\"
 settings.preferences.languageChange=Per applicare la modifica della lingua a tutte le schermate è necessario riavviare.
 settings.preferences.supportLanguageWarning=In caso di controversia, tenere presente che la mediazione è gestita in {0} e l'arbitrato in {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Indirizzo BSQ del destinatario
 dao.wallet.send.receiverBtcAddress=Indirizzo BTC del destinatario
 dao.wallet.send.setDestinationAddress=Inserisci il tuo indirizzo di destinazione
 dao.wallet.send.send=Invia fondi BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Invia fondi BTC
 dao.wallet.send.sendFunds.headline=Conferma richiesta di prelievo
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transazioni BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Prezzo di scambio medio BSQ/BTC di 90 giorni
 dao.factsAndFigures.dashboard.avgPrice30=Prezzo di scambio medio BSQ/BTC di 30 giorni
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=BSQ totale disponibile
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ emessi v. BSQ bruciati
 
 dao.factsAndFigures.supply.issued=BSQ coniati
+dao.factsAndFigures.supply.compReq=Compensation requests
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ coniati nella trasazione di genesi
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ coniati per le richieste di compensazione
 dao.factsAndFigures.supply.reimbursementAmount=BSQ coniati per le richieste di rimborso
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ bruciati
-dao.factsAndFigures.supply.burntMovingAverage=Media mobile di 15 giorni
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom su inlier
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Volume di scambio
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Stato globale dei BSQ bloccati
 dao.factsAndFigures.supply.totalLockedUpAmount=Bloccati in bond
 dao.factsAndFigures.supply.totalUnlockingAmount=Sbloccando i BSQ dai vincoli
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ sbloccati dalle obbligazioni
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ confiscati dalle obbligazioni
-dao.factsAndFigures.supply.invalidTxs=BSQ burciati (transazioni non valide)
-dao.factsAndFigures.supply.burntAmount=BSQ bruciati (commissioni)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Transazione genesi
 dao.factsAndFigures.transactions.genesisBlockHeight=Altezza del blocco genesi
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Numero di tutte le transazioni di pagam
 dao.factsAndFigures.transactions.invalidTx=N. di tutte le transazioni invalide
 dao.factsAndFigures.transactions.irregularTx=N. di tutte le transazioni irregolari
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Saldo disponibile
+
 contractWindow.title=Dettagli disputa
 contractWindow.dates=Data dell'offerta / Data di scambio
 contractWindow.btcAddresses=Indirizzo Bitcoin acquirente BTC / venditore BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Seleziona la transazione di deposito
 sendAlertMessageWindow.headline=Invia notifica globale
 sendAlertMessageWindow.alertMsg=Messaggio d'avvertimento
 sendAlertMessageWindow.enterMsg=Inserisci messaggio
-sendAlertMessageWindow.isUpdate=Notifica di aggiornamento
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Nuova versione numero
 sendAlertMessageWindow.send=Invia notifica
 sendAlertMessageWindow.remove=Rimuovi notifica
@@ -2290,6 +2314,7 @@ popup.warning.seed=seme
 popup.warning.mandatoryUpdate.trading=Si prega di aggiornare Bisq all'ultima versione. È stato rilasciato un aggiornamento obbligatorio che disabilita il trading per le vecchie versioni. Per ulteriori informazioni, consultare il forum Bisq.
 popup.warning.mandatoryUpdate.dao=Si prega di aggiornare Bisq all'ultima versione. È stato rilasciato un aggiornamento obbligatorio che disabilita Bisq DAO e BSQ per le vecchie versioni. Per ulteriori informazioni, consultare il forum Bisq.\n 
 popup.warning.disable.dao=Bisq DAO e BSQ sono temporaneamente disabilitati. Per ulteriori informazioni, consultare il forum Bisq.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Questa transazione non è possibile, poiché le commissioni di mining di {0} supererebbero l'importo da trasferire di {1}. Attendi fino a quando le commissioni di mining non saranno nuovamente basse o fino a quando non avrai accumulato più BTC da trasferire.
 
 popup.warning.openOffer.makerFeeTxRejected=La commissione della transazione del creatore dell'offerta con ID {0} è stata rifiutata dalla rete Bitcoin.\nTransazione ID={1}.\nL'offerta è stata rimossa per evitare ulteriori problemi.\nVai su \"Impostazioni/Informazioni di rete\" ed esegui una risincronizzazione SPV.\nPer ulteriore assistenza, contattare il canale di supporto Bisq nel team di Bisq Keybase.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Domanda segreta
 payment.answer=Risposta
 payment.wallet=ID portafoglio
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Nome utente o e-mail o n. di telefono
 payment.moneyBeam.accountId=Email o numero di telefono fisso
 payment.venmo.venmoUserName=Nome utente Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_ja.properties

@@ -78,6 +78,7 @@ shared.offerType=オファーの種類
 shared.details=詳細
 shared.address=アドレス
 shared.balanceWithCur={0}での残高
+shared.utxo=Unspent transaction output
 shared.txId=トランザクションID
 shared.confirmations=確認
 shared.revert=トランザクションを取り消す
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=重要な要件: \n支払いが完
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Western Unionを使用してBTCの売り手へ{0}をお支払いください。\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=重要な要件: \n支払いが完了したら、MTCN（追跡番号）と領収書の写真を電子メールでBTCの売り手へ送信して下さい。\n領収書には、売り手の氏名、市区町村、国、金額が明確に示されている必要があります。売り手のメールアドレス: {0}
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard={0}のためのeGiftカードをアマゾンアカウントから買って、BTC売り手のEメールアドレスあるいは携帯電話番号を受取人に設定して下さい。トレード金額は最大許容量を越える場合、複数のカードを送って下さい。\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal={0}を「米国の郵便為替」でBTCの売り手に送付してください。\n\n
@@ -937,6 +936,7 @@ support.noTickets=オープンなチケットはありません
 support.sendingMessage=メッセージを送信中
 support.receiverNotOnline=受信者はオンラインではありません。 メッセージは彼のメールボックスに保存されます。
 support.sendMessageError=メッセージ送信失敗。エラー: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=その係争の申し出はBisqの古いバージョンで作成されました。\nあなたのアプリケーションのバージョンではその係争を閉じることはできません。\n\n次のより古いバージョンを使用してください:プロトコルバージョン{0}
 support.openFile=添付ファイルを開く（最大ファイルサイズ: {0} kb）
 support.attachmentTooLarge=添付ファイルの合計サイズは{0} kbで、最大サイズを超えています。 許容されるメッセージサイズは{1} KBです。
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=ダークモードを利用
 setting.preferences.sortWithNumOffers=市場リストをオファー/トレードの数で並び替える
 setting.preferences.onlyShowPaymentMethodsFromAccount=サポートされていない支払い方法を非表示にする
 setting.preferences.denyApiTaker=APIを使用するテイカーを拒否する
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=「次回から表示しない」フラグを全てリセット
 settings.preferences.languageChange=言語の変更をすべての画面に適用するには再起動が必要です。
 settings.preferences.supportLanguageWarning=係争が発生した場合、調停は{0}で、仲裁は{1}で処理されることに注意して下さい。
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=受信者のBSQアドレス
 dao.wallet.send.receiverBtcAddress=受信者のBTCアドレス
 dao.wallet.send.setDestinationAddress=あなたの出金先アドレスを記入
 dao.wallet.send.send=BSQ残高の送信
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=BTC残高の送信
 dao.wallet.send.sendFunds.headline=出金リクエストを承認
 dao.wallet.send.sendFunds.details=送金中: {0}\n入金先アドレス: {1}\n必要なマイニング手数料: {2} ({3} サトシ/vbyte)\nトランザクションvサイズ: {4} vKb\n\n入金先の受け取る金額: {5}\n\n本当にこの金額を出金しますか？
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=BSQ トランザクション
 
 dao.factsAndFigures.dashboard.avgPrice90=90日間の平均BSQ/BTCのトレード価格
 dao.factsAndFigures.dashboard.avgPrice30=30日間の平均BSQ/BTCのトレード価格
-dao.factsAndFigures.dashboard.avgUSDPrice90=90日間の加重平均USD/BSQ価格
-dao.factsAndFigures.dashboard.avgUSDPrice30=30日間の加重平均USD/BSQ価格
-dao.factsAndFigures.dashboard.marketCap=時価総額（30日間の平均USD/BSQ価格に基づく）
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=合計利用可能BSQ
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=発行されたBSQ v. バーンされたBSQ
 
 dao.factsAndFigures.supply.issued=発行されたBSQ
+dao.factsAndFigures.supply.compReq=Compensation requests
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=ジェネシストランザクションで発行されたBSQ
 dao.factsAndFigures.supply.compRequestIssueAmount=報酬リクエストの為に発行されたBSQ
 dao.factsAndFigures.supply.reimbursementAmount=払い戻しリクエストの為に発行されたBSQ
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=バーン済BSQ
-dao.factsAndFigures.supply.burntMovingAverage=15日間移動平均
-dao.factsAndFigures.supply.burntZoomToInliers=inlierにズームイン
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=取引量
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=ロックされたBSQのグローバル状態
 dao.factsAndFigures.supply.totalLockedUpAmount=担保でロックされている
 dao.factsAndFigures.supply.totalUnlockingAmount=担保からアンロック中のBSQ
 dao.factsAndFigures.supply.totalUnlockedAmount=担保からアンロックされたBSQ
 dao.factsAndFigures.supply.totalConfiscatedAmount=担保から没収されたBSQ
-dao.factsAndFigures.supply.invalidTxs=バーン済BSQ（無効なトランザクション）
-dao.factsAndFigures.supply.burntAmount=バーン済みBSQ（手数料）
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=ジェネシストランザクション
 dao.factsAndFigures.transactions.genesisBlockHeight=ジェネシスブロックの高さ
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=全ての手数料支払いトランザ
 dao.factsAndFigures.transactions.invalidTx=全ての無効なトランザクションの数
 dao.factsAndFigures.transactions.irregularTx=不整なトランザクションの数
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=利用可能残高
+
 contractWindow.title=係争の詳細
 contractWindow.dates=オファーの日付 / トレードの日付
 contractWindow.btcAddresses=ビットコインアドレス BTC買い手 / BTC売り手
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=デポジットトランザクションを選択
 sendAlertMessageWindow.headline=グローバル通知を送信
 sendAlertMessageWindow.alertMsg=警告メッセージ
 sendAlertMessageWindow.enterMsg=メッセージを入力
-sendAlertMessageWindow.isUpdate=更新通知
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=新バージョンナンバー
 sendAlertMessageWindow.send=通知を送信
 sendAlertMessageWindow.remove=通知を削除
@@ -2290,6 +2314,7 @@ popup.warning.seed=シード
 popup.warning.mandatoryUpdate.trading=最新のBisqバージョンに更新してください。古いバージョンのトレードを無効にする必須の更新プログラムがリリースされました。詳細については、Bisqフォーラムをご覧ください。
 popup.warning.mandatoryUpdate.dao=最新のBisqバージョンに更新してください。古いバージョンのBisq DAOとBSQを無効にする必須の更新プログラムがリリースされました。詳細については、Bisqフォーラムをご覧ください。
 popup.warning.disable.dao=Bisq DAOとBSQは一時的に無効になっています。詳細については、Bisqフォーラムをご覧ください。
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC={0}のマイニング手数料が{1}の送金額を超えるため、このトランザクションは利用不可です。マイニング手数料が再び低くなるか、送金するBTCがさらに蓄積されるまでお待ちください。
 
 popup.warning.openOffer.makerFeeTxRejected=ID{0}で識別されるオファーのためのメイカー手数料トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。
@@ -2596,6 +2621,8 @@ payment.select.altcoin=アルトコイン選択、または検索する
 payment.secret=秘密の質問
 payment.answer=答え
 payment.wallet=ウォレットID
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=ユーザーネームかメールか電話番号
 payment.moneyBeam.accountId=メールか電話番号
 payment.venmo.venmoUserName=Venmo ユーザー名
@@ -2655,6 +2682,10 @@ payment.revolut.info=以前の場合と違って、Revolutは電話番号やメ
 payment.account.revolut.addUserNameInfo={0}\n現在の「Revolut」アカウント（{1}）には「ユーザ名」がありません。 \nアカウントデータを更新するのにRevolutの「ユーザ名」を入力して下さい。\nアカウント年齢署名状況に影響を及ぼしません。
 payment.revolut.addUserNameInfo.headLine=Revolutアカウントをアップデートする
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Bisqでアメリカ合衆国郵便為替（USPMO）をトレードするには、以下を理解する必要があります：\n\n-送る前に、BTC買い手は必ずBTC売り手の名前を支払人そして支払先フィールド両方に書いて、追跡証明も含めるUSPMOそして封筒の高解像度写真を取る必要があります。\n-BTC買い手は必ず配達確認を利用してBTC売り手にUSPMOを送る必要があります。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人がアメリカ合衆国郵便のサイトで詳細を確認できるように、取った写真、USPMOシリアル番号、郵便局番号、そしてドル金額を送る必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。\n\n全ての係争には、調停者や調停人に証明を提供するのは100%USPMO送付者の責任です。\n\n以上の条件を理解しない場合、BisqでUSPMOのトレードをしないで下さい。
 
 payment.cashByMail.info=Bisqで、郵送で現金（CBM)を利用してトレードするには、以下を理解する必要があります：\n● BTC買い手は現金を開封明示機構のある袋に入れるべき。\n● 送り先住所とトラッキング番号が袋に貼ってある状態で、包装過程の動画あるいはHD写真を取るべき。\n● 配達確認と保険を掛けて、BTC買い手はBTC売り手に袋を送るべき。\n● BTC売り手は送り手にもらったトラッキング番号が見えるように、袋の開梱の動画を撮影するべき。\n● オファーのメイカーは支払いアカウントの「追加情報」フィールドに特別な契約条件を述べるべき。\n● テイカーはオファーを受けることによってその契約条件に同意することを示す。\n\nCBMでトレードする場合では、正直に行動する責任は完全にトレードピアのみに負わされます。\n\n● 他の法定通貨トレードと比べて、CBTトレードには検証可能な行動は少ない。つまり、係争は処理しにくい。\n● 係争が発生した場合、取引者チャットで解決する方が一番効果的です。\n● 調停者が問題を検討し提案できますが、問題を解決できること保障されるものではない。\n● 調停者は取り組まれる場合、何れのトレードピアが調停者の提案を拒否したら両方のピアの資金はBisqの寄付アドレス [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] まで送られ、トレードは事実上に終了されることになります。\n● 1人の取引者が調停者の提案を拒否して仲裁を開始したら、両方のトレードピアのトレードとデポジット金額両方は失われる可能性があります。\n● 調停人は提供される証拠に基づいて決定を下すので、前もって係争の場合の準備として、以上のトレードプロセスを記録して下さい。郵送で現金トレードの場合、調停人の決定は最終的なものです。\n● 郵送で現金トレードから失われた金額はBisqのDAOから払い戻しできませんので、払い戻しリクエストは否定されます。\n\n以上の要件を十分に理解することを断言するため、Wikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nこれらの要件を理解していない場合は、BisqでCBMを利用してトレードしないで下さい。

core/src/main/resources/i18n/displayStrings_pt-br.properties

@@ -78,6 +78,7 @@ shared.offerType=Tipo de oferta
 shared.details=Detalhes
 shared.address=Endereço
 shared.balanceWithCur=Saldo em {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID da Transação
 shared.confirmations=Confirmações
 shared.revert=Reverter transação
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=IMPORTANTE:\nApós ter feito o pag
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Pague {0} ao vendedor de BTC usando Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=IMPORTANTE:\nApós ter feito o pagamento, envie o número de rastreamento (MTCN) e uma foto do comprovante por e-mail para o vendedor de BTC.\nO comprovante deve exibir claramente o nome completo, o país e o estado do vendedor, assim como a quantia. O e-mail do vendedor é: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Envie {0} através de \"US Postal Money Order\" para o vendedor de BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Não há tickets de suporte abertos
 support.sendingMessage=Enviando mensagem...
 support.receiverNotOnline=O recipiente não está online. A mensagem será salva na caixa postal dele.
 support.sendMessageError=Erro ao enviar a mensagem: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=A oferta nessa disputa foi criada com uma versão anterior do Bisq.\nVocê não pode fechar aquela disputa com a sua versão atual do programa.\n\nFavor utilizar uma versão mais velha com protocolo versão {0}
 support.openFile=Abrir arquivo para anexar (tamanho máximo: {0} kb)
 support.attachmentTooLarge=O tamanho total de seus arquivos anexados é {0} kb e excede o máximo permitido para mensagens de {1} kb.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Usar modo escuro
 setting.preferences.sortWithNumOffers=Ordenar pelo nº de ofertas/negociações
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Esquecer marcações \"Não exibir novamente\"
 settings.preferences.languageChange=Aplicar a mudança de idioma em todas as telas requer uma reinicialização.
 settings.preferences.supportLanguageWarning=Em caso de disputa, por favor note que a mediação é feita em {0} e a arbitração em {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Endereço BSQ do destinatário
 dao.wallet.send.receiverBtcAddress=Endereço BTC do destinatário
 dao.wallet.send.setDestinationAddress=Preencha seu endereço de destino
 dao.wallet.send.send=Enviar fundos BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Enviar fundos BTC
 dao.wallet.send.sendFunds.headline=Confirmar solicitação de retirada.
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transações BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Média de 90 dias BSQ/BTC
 dao.factsAndFigures.dashboard.avgPrice30=Média de 30 dias BSQ/BTC
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Total de BSQ disponível
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ emitido vs. BSQ queimado
 
 dao.factsAndFigures.supply.issued=BSQ emitido
+dao.factsAndFigures.supply.compReq=Pedidos de compensação
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ emitido na transação genesis
 dao.factsAndFigures.supply.compRequestIssueAmount=BDQ emitido para pedidos de compensação
 dao.factsAndFigures.supply.reimbursementAmount=BSQ emitido para pedidos de reembolso
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ destruído
-dao.factsAndFigures.supply.burntMovingAverage=média móvel de 15 dias
-dao.factsAndFigures.supply.burntZoomToInliers=Ampliar para convergentes
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Volume de negociação
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Estado global de BSQ bloqueado
 dao.factsAndFigures.supply.totalLockedUpAmount=Bloqueado em vínculos
 dao.factsAndFigures.supply.totalUnlockingAmount=Desbloqueando BSQ de vínculos
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ desbloqueado de vínculos
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ confiscado de vínculos
-dao.factsAndFigures.supply.invalidTxs=BSQ destruído (transações inválidas)
-dao.factsAndFigures.supply.burntAmount=BSQ destruído (taxas)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Transação gênesis
 dao.factsAndFigures.transactions.genesisBlockHeight=Altura do bloco gênese
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Nº de todas transações de pagamentos
 dao.factsAndFigures.transactions.invalidTx=Nº de todas as transações inválidas
 dao.factsAndFigures.transactions.irregularTx=Nº de todas as transações irregulares
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Saldo disponível
+
 contractWindow.title=Detalhes da disputa
 contractWindow.dates=Data da oferta / Data da negociação
 contractWindow.btcAddresses=Endereço bitcoin do comprador de BTC / vendedor de BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Selecionar transação de depósito
 sendAlertMessageWindow.headline=Enviar notificação global
 sendAlertMessageWindow.alertMsg=Mensagem de alerta
 sendAlertMessageWindow.enterMsg=Digitar mensagem
-sendAlertMessageWindow.isUpdate=É notificação de atualização
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Nº da nova versão
 sendAlertMessageWindow.send=Enviar notificação
 sendAlertMessageWindow.remove=Remover notificação
@@ -2290,6 +2314,7 @@ popup.warning.seed=semente
 popup.warning.mandatoryUpdate.trading=Faça o update para a última versão do Bisq. Um update obrigatório foi lançado e desabilita negociações em versões antigas. Por favor, veja o Fórum do Bisq para mais informações.
 popup.warning.mandatoryUpdate.dao=Faça o update para a última versão do Bisq. Um update obrigatório foi publicado, ele desabilita a DAO Bisq e BSQ em versões anteriores. Por gentileza, veja o Fórum do Bisq para mais informações.\n\n
 popup.warning.disable.dao=A DAO Bisq e BSQ estão temporariamente desativados. Verifique o fórum Bisq para mais informações.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Esta transação não é possível, pois as taxas de mineração de {0} excederiam o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais BTC para transferir.
 
 popup.warning.openOffer.makerFeeTxRejected=A transação de taxa de ofertante para a oferta com ID {0} foi rejeitada pela rede Bitcoin.\nID da transação: {1}.\nA oferta foi removida para evitar problemas adicionais.\nPor favor, vá até "Configurações/Informações da rede" e ressincronize o arquivo SPV.\nPara mais informações, por favor acesse o canal #support do time da Bisq na Keybase.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Pergunta secreta
 payment.answer=Resposta
 payment.wallet=ID da carteira
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Nome de usuário, e-mail ou nº de telefone
 payment.moneyBeam.accountId=E-mail ou nº de telefone
 payment.venmo.venmoUserName=Nome do usuário do Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_pt.properties

@@ -78,6 +78,7 @@ shared.offerType=Tipo de oferta
 shared.details=Detalhes
 shared.address=Endereço
 shared.balanceWithCur=Saldo em {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID de transação
 shared.confirmations=Confirmações
 shared.revert=Reverter Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=REQUERIMENTO IMPORTANTE:\nDepois d
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Por favor pague {0} ao vendedor de BTC usando Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDepois de ter feito o pagamento, envie o MTCN (número de rastreamento) e uma foto do recibo por e-mail para o vendedor de BTC.\nO recibo deve mostrar claramente o nome completo do vendedor, a cidade, o país e a quantia. O e-mail do vendedor é: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Por favor envie {0} por \"US Postal Money Order\" para o vendedor de BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Não há bilhetes abertos
 support.sendingMessage=Enviando mensagem...
 support.receiverNotOnline=O recipiente não está online. A mensagem foi guardada na caixa de correio.
 support.sendMessageError=Falha de envio de mensagem. Erro: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=A oferta nessa disputa foi criada com uma versão mais antiga do Bisq.\nVocê não pode fechar essa disputa com sua versão do programa.\n\nPor favor, use uma versão mais antiga com a versão do protocolo {0}
 support.openFile=Abrir ficheiro para anexar (tamanho máx.: {0} kb)
 support.attachmentTooLarge=O tamanho total de seus anexos anexados é {0} kb e excede o máximo permitido para mensagens de {1} kb.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Usar o modo escuro
 setting.preferences.sortWithNumOffers=Ordenar listas de mercado por nº de ofertas/negociações:
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Reiniciar todos os marcadores \"Não mostrar novamente\"
 settings.preferences.languageChange=Para aplicar a mudança de língua em todas os ecrãs requer uma reinicialização.
 settings.preferences.supportLanguageWarning=Em caso de disputa, por favor saiba que a mediação será tratada em {0} e a arbitragem em {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Endereço BSQ do recipiente
 dao.wallet.send.receiverBtcAddress=Endereço BTC do recipiente
 dao.wallet.send.setDestinationAddress=Preencha seu endereço de destino
 dao.wallet.send.send=Enviar fundos BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Enviar fundos BTC
 dao.wallet.send.sendFunds.headline=Confirmar pedido de levantamento.
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Transações BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=Média de 90 dias do preço de negócio de BSQ/BTC
 dao.factsAndFigures.dashboard.avgPrice30=Média de 30 dias do preço de negócio de BSQ/BTC
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Total BSQ disponível
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ emitido v. BSQ queimado
 
 dao.factsAndFigures.supply.issued=BSQ emitido
+dao.factsAndFigures.supply.compReq=Pedidos de compensação
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ emitido na transação genesis
 dao.factsAndFigures.supply.compRequestIssueAmount=BDQ emitido para pedidos de compensação
 dao.factsAndFigures.supply.reimbursementAmount=BSQ emitido para pedidos de reembolso
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ destruído
-dao.factsAndFigures.supply.burntMovingAverage=Média móvel de 15 dias
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom para inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Volume de negócio
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Estado global do BSQ bloqueado
 dao.factsAndFigures.supply.totalLockedUpAmount=Bloqueado em vínculos
 dao.factsAndFigures.supply.totalUnlockingAmount=Desbloqueando BSQ de vínculos
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ desbloqueado de vínculos
 dao.factsAndFigures.supply.totalConfiscatedAmount=BSQ confiscado de vínculos
-dao.factsAndFigures.supply.invalidTxs=BSQ destruído (transações inválidas)
-dao.factsAndFigures.supply.burntAmount=BSQ destruído (taxas)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Transação gênesis
 dao.factsAndFigures.transactions.genesisBlockHeight=Altura do bloco genesis
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Nº de todas transações de pagamentos
 dao.factsAndFigures.transactions.invalidTx=Nº de todas as transações inválidas
 dao.factsAndFigures.transactions.irregularTx=Nº de todas as transações irregulares
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Saldo disponível
+
 contractWindow.title=Detalhes da disputa
 contractWindow.dates=Data de oferta / Data de negócio
 contractWindow.btcAddresses=Endereço bitcoin comprador BTC / vendendor BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Selecionar transação de depósito
 sendAlertMessageWindow.headline=Enviar notificação global
 sendAlertMessageWindow.alertMsg=Mensagem de alerta
 sendAlertMessageWindow.enterMsg=Digitar mensagem
-sendAlertMessageWindow.isUpdate=É notificação de atualização
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Nº da nova versão
 sendAlertMessageWindow.send=Enviar notificação
 sendAlertMessageWindow.remove=Remover notificação
@@ -2290,6 +2314,7 @@ popup.warning.seed=semente
 popup.warning.mandatoryUpdate.trading=Por favor, atualize para a versão mais recente do Bisq. Uma atualização obrigatória que desativa negociação para versões antigas foi lançada. Por favor, confira o Fórum Bisq para mais informações.
 popup.warning.mandatoryUpdate.dao=Por favor, atualize para a versão mais recente Bisq. Uma atualização obrigatória que desativa a OAD do Bisq e BSQ para versões antigas foi lançada. Por favor, confira o Fórum Bisq para mais informações.
 popup.warning.disable.dao=A OAD do Bisq e BSQ foram temporariamente desativados. Por favor, confira o Fórum Bisq para mais informações.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Esta transação não é possível, pois as taxas de mineração de {0} excederia o montante a transferir de {1}. Aguarde até que as taxas de mineração estejam novamente baixas ou até você ter acumulado mais BTC para transferir.
 
 popup.warning.openOffer.makerFeeTxRejected=A transação da taxa de ofertante para a oferta com o ID {0} foi rejeitada pela rede do Bitcoin.\nID da transação={1}.\nA oferta foi removida para evitar futuros problemas.\nPor favor vá à \"Definições/Informação da Rede\" e re-sincronize o ficheiro SPV.\nPara mais ajuda por favor contacte o canal de apoio do Bisq na equipa Keybase do Bisq.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Pergunta secreta
 payment.answer=Resposta
 payment.wallet=ID da carteira
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Nome de utilizador, email ou nº de telemóvel
 payment.moneyBeam.accountId=Email ou nº de telemóvel
 payment.venmo.venmoUserName=Nome de utilizador do Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_ru.properties

@@ -78,6 +78,7 @@ shared.offerType=Тип предложения
 shared.details=Подробности
 shared.address=Адрес
 shared.balanceWithCur=Баланс в {0}
+shared.utxo=Unspent transaction output
 shared.txId=Идентификатор транзакции
 shared.confirmations=Подтверждения
 shared.revert=Отменить транзакцию
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=ВАЖНОЕ ТРЕБОВАНИЕ:
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Заплатите {0} продавцу BTC через Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=ВАЖНОЕ ТРЕБОВАНИЕ: \nПосле оплаты отправьте по электронной почте продавцу BTC контрольный номер MTCN и фото квитанции.\nВ квитанции должно быть четко указано полное имя продавца, город, страна и сумма. Электронный адрес продавца: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Отправьте {0} \«Почтовым денежным переводом США\» продавцу BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Нет текущих обращений
 support.sendingMessage=Отправка сообщения...
 support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox.
 support.sendMessageError=Сбой отправки сообщения. Ошибка: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=Предложение, по которому открыт этот спор, было создано в устаревшей версии Bisq.\nНевозможно закрыть спор с помощью текущей версии приложения.\n\nВоспользуйтесь старой версией протокола: {0}
 support.openFile=Открыть файл для отправки (макс. размер файла: {0} Кб)
 support.attachmentTooLarge=Общий объём вложенных файлов составляет {0} Кб, что превышает максимально допустимый размер сообщения ({1} Кб).
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Use dark mode
 setting.preferences.sortWithNumOffers=Сортировать списки по кол-ву предложений/сделок
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Сбросить все флажки \«Не показывать снова\»
 settings.preferences.languageChange=Изменение языка во всех разделах вступит в силу после перезагрузки приложения.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=BSQ-адрес получателя
 dao.wallet.send.receiverBtcAddress=BTC-адрес получателя
 dao.wallet.send.setDestinationAddress=Укажите адрес получателя
 dao.wallet.send.send=Отправить BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Отправить BTC
 dao.wallet.send.sendFunds.headline=Подтвердите запрос на вывод средств
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Транзакции в BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=90 days average BSQ/BTC trade price
 dao.factsAndFigures.dashboard.avgPrice30=30 days average BSQ/BTC trade price
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Доступное количество BSQ
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ issued v. BSQ burnt
 
 dao.factsAndFigures.supply.issued=Эмиссия BSQ
+dao.factsAndFigures.supply.compReq=Запросы компенсации
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=Эмиссия BSQ в первичной транзакции
 dao.factsAndFigures.supply.compRequestIssueAmount=Эмиссия BSQ в качестве компенсации
 dao.factsAndFigures.supply.reimbursementAmount=Эмиссия BSQ в качестве возмещения затрат
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=Выведено из обращения BSQ
-dao.factsAndFigures.supply.burntMovingAverage=15-day moving average
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom to inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Объём сделки
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Глобальное состояние заблокированных BSQ
 dao.factsAndFigures.supply.totalLockedUpAmount=Заблокировано в гарантийных депозитах
 dao.factsAndFigures.supply.totalUnlockingAmount=Разблокировка BSQ из гарантийных депозитов
 dao.factsAndFigures.supply.totalUnlockedAmount=Разблокировано BSQ из гарантийных депозитов
 dao.factsAndFigures.supply.totalConfiscatedAmount=Конфисковано BSQ из гарантийных депозитов
-dao.factsAndFigures.supply.invalidTxs=Выведено из обращения BSQ (недействительные транзакции)
-dao.factsAndFigures.supply.burntAmount=Выведено из обращения BSQ (комиссии)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Первичная транзакция
 dao.factsAndFigures.transactions.genesisBlockHeight=Номер первичного блока
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Общее кол-во транзакц
 dao.factsAndFigures.transactions.invalidTx=Кол-во недействительных транзакций
 dao.factsAndFigures.transactions.irregularTx=Кол-во неправильных транзакций
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Доступный баланс
+
 contractWindow.title=Подробности спора
 contractWindow.dates=Дата предложения / Дата сделки
 contractWindow.btcAddresses=Биткойн-адрес покупателя BTC / продавца BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Выберите транзакцию ввода с
 sendAlertMessageWindow.headline=Отправить глобальное уведомление
 sendAlertMessageWindow.alertMsg=Предупреждение
 sendAlertMessageWindow.enterMsg=Введите сообщение
-sendAlertMessageWindow.isUpdate=Уведомление об обновлении
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Номер новой версии
 sendAlertMessageWindow.send=Отправить уведомление
 sendAlertMessageWindow.remove=Удалить уведомление
@@ -2290,6 +2314,7 @@ popup.warning.seed=мнемоническая фраза
 popup.warning.mandatoryUpdate.trading=Обновите Bisq до последней версии. Вышло обязательное обновление, которое делает невозможной торговлю в старых версиях приложения. Посетите форум Bisq, чтобы узнать подробности.
 popup.warning.mandatoryUpdate.dao=Обновите Bisq до последней версии. Вышло обязательное обновление, которое делает невозможным участие в ДАО Bisq и торговлю BSQ в старых версиях приложения. Посетите форум Bisq, чтобы узнать подробности.
 popup.warning.disable.dao=ДАО Bisq и торговля BSQ временно недоступны. Посетите форум Bisq, чтобы узнать подробности.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Данную транзакцию невозможно завершить, так как плата за нее ({0}) превышает сумму перевода ({1}). Подождите, пока плата за транзакцию не снизится или пока у вас не появится больше BTC для завершения перевода.
 
 popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Секретный вопрос
 payment.answer=Ответ
 payment.wallet=Идентификатор кошелька
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Имя пользователя, эл. адрес или тел. номер
 payment.moneyBeam.accountId=Эл. адрес или тел. номер
 payment.venmo.venmoUserName=Имя пользователя Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_th.properties

@@ -78,6 +78,7 @@ shared.offerType=ประเภทข้อเสนอ
 shared.details=รายละเอียด
 shared.address=ที่อยู่
 shared.balanceWithCur=ยอดคงเหลือใน {0}
+shared.utxo=Unspent transaction output
 shared.txId=เลขอ้างอิงการทำธุรกรรม
 shared.confirmations=การยืนยัน
 shared.revert=ย้อนกลับสู่การทำธุรกรรม
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=ข้อกำหนดที่
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=โปรดชำระเงิน {0} ให้กับผู้ขาย BTC โดยใช้ Western Union
 portfolio.pending.step2_buyer.westernUnion.extra=ข้อกำหนดที่สำคัญ: \nหลังจากที่คุณได้ชำระเงินแล้วให้ส่ง MTCN (หมายเลขติดตาม) และรูปใบเสร็จรับเงินไปยังผู้ขาย BTC ทางอีเมล\nใบเสร็จจะต้องแสดงชื่อเต็ม เมือง ประเทศ และจำนวนเงินทั้งหมดของผู้ขาย อีเมลของผู้ขายคือ: {0}
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=โปรดส่ง {0} โดยธนาณัติ \"US Postal Money Order \" ไปยังผู้ขาย BTC\n
@@ -937,6 +936,7 @@ support.noTickets=ไม่มีการเปิดรับคำขอร
 support.sendingMessage=กำลังส่งข้อความ...
 support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox.
 support.sendMessageError=การส่งข้อความล้มเหลว ข้อผิดพลาด: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=ข้อเสนอในข้อพิพาทดังกล่าวได้รับการสร้างขึ้นโดยใช้ Bisq เวอร์ชั่นเก่ากว่า\nคุณไม่สามารถปิดข้อพิพาทดังกล่าวกับแอปพลิเคชั่นเวอร์ชั่นของคุณได้\n\nโปรดใช้เวอร์ชันที่เก่ากว่ากับเวอร์ชั่นโปรโตคอล {0}
 support.openFile=เปิดไฟล์ที่จะแนบ (ขนาดไฟล์สูงสุด: {0} kb)
 support.attachmentTooLarge=ขนาดไฟล์แนบทั้งหมด {0} กิโลไบต์และเกินจำนวนไฟล์สูงสุด ขนาดข้อความที่อนุญาตเท่ากับ {1} kB
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Use dark mode
 setting.preferences.sortWithNumOffers=จัดเรียงรายการโดยเลขของข้อเสนอ / การซื้อขาย
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=รีเซ็ตทั้งหมด \"ไม่ต้องแสดงอีกครั้ง \" ปักธง
 settings.preferences.languageChange=หากต้องการเปลี่ยนภาษากับทุกหน้าต้องทำการรีสตาร์ท
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=ที่อยู่ BSQ ของผู้ร
 dao.wallet.send.receiverBtcAddress=ที่อยู่ BTC ของผู้รับ
 dao.wallet.send.setDestinationAddress=กรอกที่อยู่ปลายทางของคุณ
 dao.wallet.send.send=ส่งเงิน BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=ส่งเงินทุน BTC
 dao.wallet.send.sendFunds.headline=ยืนยันคำขอถอนเงิน
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=BSQ Transactions
 
 dao.factsAndFigures.dashboard.avgPrice90=90 days average BSQ/BTC trade price
 dao.factsAndFigures.dashboard.avgPrice30=30 days average BSQ/BTC trade price
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=BSQ ที่ใช้งานได้ทั้งหมด
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ issued v. BSQ burnt
 
 dao.factsAndFigures.supply.issued=BSQ issued
+dao.factsAndFigures.supply.compReq=คำขอการชดเชย
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=BSQ ที่ได้ดำเนินการในส่วนธุรกรรมทั่วไป
 dao.factsAndFigures.supply.compRequestIssueAmount=BSQ ที่ได้ดำเนินการสำหรับการเรียกร้องค่าชดเชย
 dao.factsAndFigures.supply.reimbursementAmount=BSQ ที่ได้ดำเนินการสำหรับการเรียกร้องการชำระเงินคืน
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ burnt
-dao.factsAndFigures.supply.burntMovingAverage=15-day moving average
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom to inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=ปริมาณการซื้อขาย
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=สถานะทั่วโลกของ BSQ ที่ล็อกไว้
 dao.factsAndFigures.supply.totalLockedUpAmount=ถูกล็อคไว้ในการประกัน
 dao.factsAndFigures.supply.totalUnlockingAmount=การปลดล็อค BSQ จากการประกัน
 dao.factsAndFigures.supply.totalUnlockedAmount=ปลดล็อค BSQ จากการประกันไว้แล้ว
 dao.factsAndFigures.supply.totalConfiscatedAmount=ยึด BSQ จากการประกันไว้แล้ว
-dao.factsAndFigures.supply.invalidTxs=Burned BSQ (invalid transactions)
-dao.factsAndFigures.supply.burntAmount=BSQ ที่ทำลายทิ้ง (ค่าธรรมเนียม)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=ธุรกรรมต้นกำเนิด
 dao.factsAndFigures.transactions.genesisBlockHeight=ความสูงของบล็อกต้นกำเนิด (Genesis block)
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=เลขที่การทำธุ
 dao.factsAndFigures.transactions.invalidTx=No. of all invalid transactions
 dao.factsAndFigures.transactions.irregularTx=No. of all irregular transactions
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=ยอดคงเหลือที่พร้อมใช้งาน
+
 contractWindow.title=รายละเอียดข้อพิพาท
 contractWindow.dates=วันที่เสนอ / วันที่ซื้อขาย
 contractWindow.btcAddresses=ที่อยู่ Bitcoin ผู้ซื้อ BTC / ผู้ขาย BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=เลือกรายการเงินฝา
 sendAlertMessageWindow.headline=ส่งการแจ้งเตือนทั่วโลก
 sendAlertMessageWindow.alertMsg=ข้อความแจ้งเตือน
 sendAlertMessageWindow.enterMsg=ใส่ข้อความ
-sendAlertMessageWindow.isUpdate=มีการแจ้งเตือนการอัปเดต
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=หมายเลขเวอร์ชชั่นรุ่นใหม่
 sendAlertMessageWindow.send=ส่งการแจ้งเตือน
 sendAlertMessageWindow.remove=นำการแจ้งเตือนออก
@@ -2290,6 +2314,7 @@ popup.warning.seed=รหัสลับเพื่อกู้ข้อมู
 popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information.
 popup.warning.mandatoryUpdate.dao=Please update to the latest Bisq version. A mandatory update was released which disables the Bisq DAO and BSQ for old versions. Please check out the Bisq Forum for more information.
 popup.warning.disable.dao=The Bisq DAO and BSQ are temporary disabled. Please check out the Bisq Forum for more information.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=This transaction is not possible, as the mining fees of {0} would exceed the amount to transfer of {1}. Please wait until the mining fees are low again or until you''ve accumulated more BTC to transfer.
 
 popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=คำถามลับ
 payment.answer=คำตอบ
 payment.wallet=ID กระเป๋าสตางค์
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=ชื่อผู้ใช้ หรือ อีเมล หรือ หมายเลขโทรศัพท์
 payment.moneyBeam.accountId=อีเมลหรือหมายเลขโทรศัพท์
 payment.venmo.venmoUserName=ชื่อผู้ใช้ Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_vi.properties

@@ -78,6 +78,7 @@ shared.offerType=Loại chào giá
 shared.details=Thông tin chi tiết
 shared.address=Địa chỉ
 shared.balanceWithCur=Số dư bằng {0}
+shared.utxo=Unspent transaction output
 shared.txId=ID giao dịch
 shared.confirmations=Xác nhận
 shared.revert=Khôi phục Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=Yêu cầu quan trọng:\nSau khi
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=Hãy thanh toán {0} cho người bán BTC bằng cách sử dụng Western Union.\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=YÊU CẦU QUAN TRỌNG:\nSau khi bạn đã thanh toán xong hãy gửi MTCN (số theo dõi) và ảnh giấy biên nhận bằng email cho người bán BTC.\nGiấy biên nhận phải ghi rõ họ tên của người bán, thành phố, quốc gia và số tiền. Địa chỉ email của người bán là: {0}.
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Card for {0} at your Amazon account and use the BTC seller''s email or mobile number as receiver. In case the trade amount exceeds the permitted amount send multiple cards.\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Hãy gửi {0} bằng \"Phiếu chuyển tiền US\" cho người bán BTC.\n\n
@@ -937,6 +936,7 @@ support.noTickets=Không có đơn hỗ trợ được mở
 support.sendingMessage=Đang gửi tin nhắn...
 support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox.
 support.sendMessageError=Gửi tin nhắn thất bại. Lỗi: {0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=Báo giá trong khiếu nại này được tạo với phiên bản Bisq cũ.\nBạn không thể đóng khiếu nại với phiên bản ứng dụng của bạn.\n\nVui lòng sử dụng phiên bản giao thức cũ hơn {0}
 support.openFile=Mở file để đính kèm (dung lượng file tối đa: {0} kb)
 support.attachmentTooLarge=Tổng dung lượng file đính kèm là {0} kb và vượt quá dung lượng tối đa cho phép {1} kB.
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=Use dark mode
 setting.preferences.sortWithNumOffers=Sắp xếp danh sách thị trường với số chào giá/giao dịch
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Cài đặt lại tất cả nhãn \"Không hiển thị lại\"
 settings.preferences.languageChange=Áp dụng thay đổi ngôn ngữ cho tất cả màn hình yêu cầu khởi động lại.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=Địa chỉ BSQ của người nhận
 dao.wallet.send.receiverBtcAddress=Địa chỉ BTC của người nhận
 dao.wallet.send.setDestinationAddress=Điền địa chỉ đến của bạn
 dao.wallet.send.send=Gửi vốn BSQ
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=Gửi vốn BTC
 dao.wallet.send.sendFunds.headline=Xác nhận yêu cầu rút
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2} ({3} satoshis/vbyte)\nTransaction vsize: {4} vKb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=Giao dịch BSQ
 
 dao.factsAndFigures.dashboard.avgPrice90=90 days average BSQ/BTC trade price
 dao.factsAndFigures.dashboard.avgPrice30=30 days average BSQ/BTC trade price
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average USD/BSQ price
-dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average USD/BSQ price)
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=Tổng lượng BSQ hiện có
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=BSQ issued v. BSQ burnt
 
 dao.factsAndFigures.supply.issued=BSQ đã phát hành
+dao.factsAndFigures.supply.compReq=Các yêu cầu bồi thường
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=Lượng BSQ phát hành tại giao dịch Genesis
 dao.factsAndFigures.supply.compRequestIssueAmount=Lượng BSQ phát hành dành cho yêu cầu bồi thường
 dao.factsAndFigures.supply.reimbursementAmount=Lượng BSQ phát hành dành cho yêu cầu bồi hoàn
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ đã đốt
-dao.factsAndFigures.supply.burntMovingAverage=15-day moving average
-dao.factsAndFigures.supply.burntZoomToInliers=Zoom to inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=Khối lượng giao dịch
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=Trạng thái toàn cầu của BSQ đã khóa
 dao.factsAndFigures.supply.totalLockedUpAmount=Bị khóa làm tải sản đảm bảo
 dao.factsAndFigures.supply.totalUnlockingAmount=Đang mở khóa BSQ từ tài sản đảm bảo
 dao.factsAndFigures.supply.totalUnlockedAmount=BSQ đã được mở khóa từ tài sản đảm bảo
 dao.factsAndFigures.supply.totalConfiscatedAmount=Lượng BSQ đã tịch thu từ tài sản đảm bảo
-dao.factsAndFigures.supply.invalidTxs=BSQ đã đốt (các giao dịch không hợp lệ)
-dao.factsAndFigures.supply.burntAmount=Lượng BSQ đã đốt (các loại phí)
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=Giao dịch chung
 dao.factsAndFigures.transactions.genesisBlockHeight=Chiều cao khối Genesis
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=Tổng số lượng giao dịch thanh
 dao.factsAndFigures.transactions.invalidTx=Số lượng tất cả các giao dịch không hợp lệ
 dao.factsAndFigures.transactions.irregularTx=Số lượng tất cả các giao dịch lạ
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=Số dư hiện có
+
 contractWindow.title=Thông tin khiếu nại
 contractWindow.dates=Ngày chào giá / Ngày giao dịch
 contractWindow.btcAddresses=Địa chỉ Bitcoin người mua BTC / người bán BTC
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=Chọn giao dịch tiền gửi
 sendAlertMessageWindow.headline=Gửi thông báo toàn cầu
 sendAlertMessageWindow.alertMsg=Tin nhắn cảnh báo
 sendAlertMessageWindow.enterMsg=Nhận tin nhắn
-sendAlertMessageWindow.isUpdate=Thông báo cập nhật
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=Phiên bản mới số
 sendAlertMessageWindow.send=Gửi thông báo
 sendAlertMessageWindow.remove=Gỡ bỏ thông báo
@@ -2290,6 +2314,7 @@ popup.warning.seed=seed
 popup.warning.mandatoryUpdate.trading=Please update to the latest Bisq version. A mandatory update was released which disables trading for old versions. Please check out the Bisq Forum for more information.
 popup.warning.mandatoryUpdate.dao=Please update to the latest Bisq version. A mandatory update was released which disables the Bisq DAO and BSQ for old versions. Please check out the Bisq Forum for more information.
 popup.warning.disable.dao=The Bisq DAO and BSQ are temporary disabled. Please check out the Bisq Forum for more information.
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=Không thể thực hiện giao dịch, vì phí đào {0} vượt quá số lượng  {1} cần chuyển. Vui lòng chờ tới khi phí đào thấp xuống hoặc khi bạn tích lũy đủ BTC để chuyển. 
 
 popup.warning.openOffer.makerFeeTxRejected=The maker fee transaction for offer with ID {0} was rejected by the Bitcoin network.\nTransaction ID={1}.\nThe offer has been removed to avoid further problems.\nPlease go to \"Settings/Network info\" and do a SPV resync.\nFor further help please contact the Bisq support channel at the Bisq Keybase team.
@@ -2596,6 +2621,8 @@ payment.select.altcoin=Select or search Altcoin
 payment.secret=Câu hỏi bí mật
 payment.answer=Trả lời
 payment.wallet=ID ví
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=Tên người dùng hoặc email hoặc số điện thoại
 payment.moneyBeam.accountId=Email hoặc số điện thoại
 payment.venmo.venmoUserName=Tên người dùng Venmo
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut requires the 'User name' as account ID not the phon
 payment.account.revolut.addUserNameInfo={0}\nYour existing Revolut account ({1}) does not have a ''User name''.\nPlease enter your Revolut ''User name'' to update your account data.\nThis will not affect your account age signing status.
 payment.revolut.addUserNameInfo.headLine=Update Revolut account
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Bisq.
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_zh-hans.properties

@@ -78,6 +78,7 @@ shared.offerType=报价类型
 shared.details=详情
 shared.address=地址
 shared.balanceWithCur={0} 余额
+shared.utxo=Unspent transaction output
 shared.txId=交易记录 ID
 shared.confirmations=审核
 shared.revert=还原 Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=重要要求：\n完成支付后
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=请使用 Western Union 向 BTC 卖家支付 {0}。\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付后，请通过电邮发送 MTCN（追踪号码）和照片给 BTC 卖家。\n收据必须清楚地向卖家写明您的全名、城市、国家或地区、数量。卖方的电子邮件是：{0}。
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=请使用您的账户购买{0}亚马逊电子礼品卡并使用 BTC 卖家的邮箱或手机号作为接收方。如果交易额超过允许的数量请发送多个礼品卡。\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=请用“美国邮政汇票”发送 {0} 给 BTC 卖家。\n\n
@@ -937,6 +936,7 @@ support.noTickets=没有创建的话题
 support.sendingMessage=发送消息...
 support.receiverNotOnline=收件人未在线。消息被保存到他们的邮箱。
 support.sendMessageError=发送消息失败。错误：{0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=纠纷中的订单创建于一个旧版本的 Bisq。\n您不能在当前版本关闭这个纠纷。\n\n请您使用旧版本/协议版本： {0}
 support.openFile=打开附件文件（文件最大大小：{0} kb）
 support.attachmentTooLarge=您的附件的总大小为 {0} kb，并超过最大值。 允许消息大小为 {1} kB。
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=使用夜间模式
 setting.preferences.sortWithNumOffers=使用“报价ID/交易ID”筛选列表
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=重置所有“不再提示”的提示
 settings.preferences.languageChange=同意重启请求以更换语言
 settings.preferences.supportLanguageWarning=如有任何争议，请注意调解在 {0} 处理，仲裁在 {1} 处理。
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=接收者的 BSQ 地址
 dao.wallet.send.receiverBtcAddress=接收者的 BTC 地址
 dao.wallet.send.setDestinationAddress=输入您的目标地址
 dao.wallet.send.send=发送 BSQ 资金
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=发送 BTC 资金
 dao.wallet.send.sendFunds.headline=确定提现申请
 dao.wallet.send.sendFunds.details=发送：{0}\n来自：{1}\n要求的矿工手续费：{2}（{3}比特/节）\n交易大小：{4}字节\n\n接收方会收到：{5}\n\n您确定您想要提现这些数量吗？
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=BSQ 交易
 
 dao.factsAndFigures.dashboard.avgPrice90=90天平均 BSQ/BTC 交易价格
 dao.factsAndFigures.dashboard.avgPrice30=30天平均 BSQ/BTC 交易价格
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 天成交量加权平均 USD/BSQ 交易价格
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 天成交量加权平均 USD/BSQ 交易价格
-dao.factsAndFigures.dashboard.marketCap=市值（基于 30天平均 USD/BSQ 价格）
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=总共可用的 BSQ 
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=已发放的 BSQ 已销毁的 BSQ
 
 dao.factsAndFigures.supply.issued=已发放的 BSQ
+dao.factsAndFigures.supply.compReq=赔偿要求
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=在初始交易中心有问题的 BSQ
 dao.factsAndFigures.supply.compRequestIssueAmount=报偿申请发放的 BSQ 
 dao.factsAndFigures.supply.reimbursementAmount=退还申请发放的 BSQ 
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ 烧毁总量
-dao.factsAndFigures.supply.burntMovingAverage=15天动态平均线
-dao.factsAndFigures.supply.burntZoomToInliers=放大至 inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=交易总量
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=BSQ 全局锁定状态
 dao.factsAndFigures.supply.totalLockedUpAmount=担保的锁定
 dao.factsAndFigures.supply.totalUnlockingAmount=正在从担保解锁 BSQ
 dao.factsAndFigures.supply.totalUnlockedAmount=已从担保解锁 BSQ
 dao.factsAndFigures.supply.totalConfiscatedAmount=已从担保没收 BSQ
-dao.factsAndFigures.supply.invalidTxs=烧毁 BSQ（无效的交易）
-dao.factsAndFigures.supply.burntAmount=烧毁 BSQ（费用）
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=创始交易
 dao.factsAndFigures.transactions.genesisBlockHeight=初始区块高度
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=所有费用支付记录
 dao.factsAndFigures.transactions.invalidTx=所有无效交易记录
 dao.factsAndFigures.transactions.irregularTx=所有不正常的交易记录:
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=可用余额
+
 contractWindow.title=纠纷详情
 contractWindow.dates=报价时间/交易时间
 contractWindow.btcAddresses=BTC 买家/BTC 卖家的比特币地址
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=选择存款交易
 sendAlertMessageWindow.headline=发送全球通知
 sendAlertMessageWindow.alertMsg=提醒消息
 sendAlertMessageWindow.enterMsg=输入消息：
-sendAlertMessageWindow.isUpdate=是更新通知
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=新版本号
 sendAlertMessageWindow.send=发送通知
 sendAlertMessageWindow.remove=移除通知
@@ -2290,6 +2314,7 @@ popup.warning.seed=种子
 popup.warning.mandatoryUpdate.trading=请更新到最新的 Bisq 版本。强制更新禁止了旧版本进行交易。更多信息请访问 Bisq 论坛。
 popup.warning.mandatoryUpdate.dao=请更新到最新的 Bisq 版本。强制更新禁止了旧版本旧版本的 Bisq DAO 和 BSQ 。更多信息请访问 Bisq 论坛。
 popup.warning.disable.dao=Bisq DAO 和 BSQ 被临时禁用的。更多信息请访问 Bisq 论坛。
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=这笔交易是无法实现，因为 {0} 的挖矿手续费用会超过 {1} 的转账金额。请等到挖矿手续费再次降低或您积累了更多的 BTC 来转账。
 
 popup.warning.openOffer.makerFeeTxRejected=交易 ID 为 {0} 的挂单费交易被比特币网络拒绝。\n交易 ID = {1}\n交易已被移至失败交易。\n请到“设置/网络信息”进行 SPV 重新同步。\n如需更多帮助，请联系 Bisq Keybase 团队的 Support 频道
@@ -2596,6 +2621,8 @@ payment.select.altcoin=选择或搜索数字货币
 payment.secret=密保问题
 payment.answer=答案
 payment.wallet=钱包 ID
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=用户名或电子邮箱或电话号码
 payment.moneyBeam.accountId=电子邮箱或者电话号码
 payment.venmo.venmoUserName=Venmo 用户名：
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut 要求使用“用户名”作为帐户 ID，而不
 payment.account.revolut.addUserNameInfo={0}\n您现有的 Revolut 帐户（{1}）尚未设置“用户名”。\n请输入您的 Revolut ``用户名''以更新您的帐户数据。\n这不会影响您的账龄验证状态。
 payment.revolut.addUserNameInfo.headLine=更新 Revolut 账户
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=在 Bisq 上交易  US Postal Money Orders （USPMO）您必须理解下述条款：\n\n- BTC 买方必须在发送方和收款人字段中都写上 BTC 卖方的名称，并在发送之前对 USPMO 和信封进行高分辨率照片拍照，并带有跟踪证明。\n- BTC 买方必须将 USPMO 连同交货确认书一起发送给 BTC 卖方。\n\n如果需要调解，或有交易纠纷，您将需要将照片连同 USPMO 编号，邮局编号和交易金额一起发送给 Bisq 调解员或退款代理，以便他们进行验证美国邮局网站上的详细信息。\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n在所有争议案件中，USPMO 发送方在向调解人或仲裁员提供证据/证明时承担 100％ 的责任。\n\n如果您不理解这些要求，请不要在 Bisq 上使用 USPMO 进行交易。
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/i18n/displayStrings_zh-hant.properties

@@ -78,6 +78,7 @@ shared.offerType=報價類型
 shared.details=詳情
 shared.address=地址
 shared.balanceWithCur={0} 餘額
+shared.utxo=Unspent transaction output
 shared.txId=交易記錄 ID
 shared.confirmations=審核
 shared.revert=還原 Tx
@@ -619,8 +620,6 @@ portfolio.pending.step2_buyer.moneyGram.extra=重要要求：\n完成支付後
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.westernUnion=請使用 Western Union 向 BTC 賣家支付 {0}。\n\n
 portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付後，請通過電郵發送 MTCN（追蹤號碼）和照片給 BTC 賣家。\n收據必須清楚地向賣家寫明您的全名、城市、國家或地區、數量。賣方的電子郵件是：{0}。
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.amazonGiftCard=請使用您的賬户購買{0}亞馬遜電子禮品卡並使用 BTC 賣家的郵箱或手機號作為接收方。如果交易額超過允許的數量請發送多個禮品卡。\n\n
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=請用“美國郵政匯票”發送 {0} 給 BTC 賣家。\n\n
@@ -937,6 +936,7 @@ support.noTickets=沒有創建的話題
 support.sendingMessage=發送消息...
 support.receiverNotOnline=收件人未在線。消息被保存到他們的郵箱。
 support.sendMessageError=發送消息失敗。錯誤：{0}
+support.receiverNotKnown=Receiver not known
 support.wrongVersion=糾紛中的訂單創建於一箇舊版本的 Bisq。\n您不能在當前版本關閉這個糾紛。\n\n請您使用舊版本/協議版本： {0}
 support.openFile=打開附件文件（文件最大大小：{0} kb）
 support.attachmentTooLarge=您的附件的總大小為 {0} kb，並超過最大值。 允許消息大小為 {1} kB。
@@ -1023,6 +1023,7 @@ setting.preferences.useDarkMode=使用夜間模式
 setting.preferences.sortWithNumOffers=使用“報價ID/交易ID”篩選列表
 setting.preferences.onlyShowPaymentMethodsFromAccount=Hide non-supported payment methods
 setting.preferences.denyApiTaker=Deny takers using the API
+setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=重置所有“不再提示”的提示
 settings.preferences.languageChange=同意重啟請求以更換語言
 settings.preferences.supportLanguageWarning=如有任何爭議，請注意調解在 {0} 處理，仲裁在 {1} 處理。
@@ -1824,6 +1825,7 @@ dao.wallet.send.receiverAddress=接收者的 BSQ 地址
 dao.wallet.send.receiverBtcAddress=接收者的 BTC 地址
 dao.wallet.send.setDestinationAddress=輸入您的目標地址
 dao.wallet.send.send=發送 BSQ 資金
+dao.wallet.send.inputControl=Select inputs
 dao.wallet.send.sendBtc=發送 BTC 資金
 dao.wallet.send.sendFunds.headline=確定提現申請
 dao.wallet.send.sendFunds.details=發送：{0}\n來自：{1}\n要求的礦工手續費：{2}（{3}比特/節）\n交易大小：{4}字節\n\n接收方會收到：{5}\n\n您確定您想要提現這些數量嗎？
@@ -1958,29 +1960,44 @@ dao.factsAndFigures.menuItem.transactions=BSQ 交易
 
 dao.factsAndFigures.dashboard.avgPrice90=90天平均 BSQ/BTC 交易價格
 dao.factsAndFigures.dashboard.avgPrice30=30天平均 BSQ/BTC 交易價格
-dao.factsAndFigures.dashboard.avgUSDPrice90=90 天成交量加權平均 USD/BSQ 交易價格
-dao.factsAndFigures.dashboard.avgUSDPrice30=30 天成交量加權平均 USD/BSQ 交易價格
-dao.factsAndFigures.dashboard.marketCap=市值（基於 30天平均 USD/BSQ 價格）
+dao.factsAndFigures.dashboard.avgUSDPrice90=90 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.avgUSDPrice30=30 days volume weighted average BSQ/USD price
+dao.factsAndFigures.dashboard.marketCap=Market capitalisation (based on 30 days average BSQ/USD price)
 dao.factsAndFigures.dashboard.availableAmount=總共可用的 BSQ
+dao.factsAndFigures.dashboard.volumeUsd=Total trade volume in USD
+dao.factsAndFigures.dashboard.volumeBtc=Total trade volume in BTC
+dao.factsAndFigures.dashboard.averageBsqUsdPriceFromSelection=Average BSQ/USD trade price from selected time period in chart
+dao.factsAndFigures.dashboard.averageBsqBtcPriceFromSelection=Average BSQ/BTC trade price from selected time period in chart
 
 dao.factsAndFigures.supply.issuedVsBurnt=已發放的 BSQ 已銷燬的 BSQ
 
 dao.factsAndFigures.supply.issued=已發放的 BSQ
+dao.factsAndFigures.supply.compReq=Compensation requests
+dao.factsAndFigures.supply.reimbursement=Reimbursement requests
 dao.factsAndFigures.supply.genesisIssueAmount=在初始交易中心有問題的 BSQ
 dao.factsAndFigures.supply.compRequestIssueAmount=報償申請發放的 BSQ
 dao.factsAndFigures.supply.reimbursementAmount=退還申請發放的 BSQ
-
+dao.factsAndFigures.supply.totalIssued=Total issued BSQ
+dao.factsAndFigures.supply.totalBurned=Total burned BSQ
+dao.factsAndFigures.supply.chart.tradeFee.toolTip={0}\n{1}
 dao.factsAndFigures.supply.burnt=BSQ 燒燬總量
-dao.factsAndFigures.supply.burntMovingAverage=15天動態平均線
-dao.factsAndFigures.supply.burntZoomToInliers=放大至 inliers
+
+dao.factsAndFigures.supply.priceChat=BSQ price
+dao.factsAndFigures.supply.volumeChat=交易總量
+dao.factsAndFigures.supply.tradeVolumeInUsd=Trade volume in USD
+dao.factsAndFigures.supply.tradeVolumeInBtc=Trade volume in BTC
+dao.factsAndFigures.supply.bsqUsdPrice=BSQ/USD price
+dao.factsAndFigures.supply.bsqBtcPrice=BSQ/BTC price
+dao.factsAndFigures.supply.btcUsdPrice=BTC/USD price
 
 dao.factsAndFigures.supply.locked=BSQ 全局鎖定狀態
 dao.factsAndFigures.supply.totalLockedUpAmount=擔保的鎖定
 dao.factsAndFigures.supply.totalUnlockingAmount=正在從擔保解鎖 BSQ
 dao.factsAndFigures.supply.totalUnlockedAmount=已從擔保解鎖 BSQ
 dao.factsAndFigures.supply.totalConfiscatedAmount=已從擔保沒收 BSQ
-dao.factsAndFigures.supply.invalidTxs=燒燬 BSQ（無效的交易）
-dao.factsAndFigures.supply.burntAmount=燒燬 BSQ（費用）
+dao.factsAndFigures.supply.proofOfBurn=Proof of Burn
+dao.factsAndFigures.supply.bsqTradeFee=BSQ Trade fees
+dao.factsAndFigures.supply.btcTradeFee=BTC Trade fees
 
 dao.factsAndFigures.transactions.genesis=創始交易
 dao.factsAndFigures.transactions.genesisBlockHeight=初始區塊高度
@@ -1994,10 +2011,15 @@ dao.factsAndFigures.transactions.burntTx=所有費用支付記錄
 dao.factsAndFigures.transactions.invalidTx=所有無效交易記錄
 dao.factsAndFigures.transactions.irregularTx=所有不正常的交易記錄:
 
+
+
 ####################################################################
 # Windows
 ####################################################################
 
+inputControlWindow.headline=Select inputs for transaction
+inputControlWindow.balanceLabel=可用餘額
+
 contractWindow.title=糾紛詳情
 contractWindow.dates=報價時間/交易時間
 contractWindow.btcAddresses=BTC 買家/BTC 賣家的比特幣地址
@@ -2153,7 +2175,9 @@ selectDepositTxWindow.select=選擇存款交易
 sendAlertMessageWindow.headline=發送全球通知
 sendAlertMessageWindow.alertMsg=提醒消息
 sendAlertMessageWindow.enterMsg=輸入消息：
-sendAlertMessageWindow.isUpdate=是更新通知
+sendAlertMessageWindow.isSoftwareUpdate=Software download notification
+sendAlertMessageWindow.isUpdate=Is full release
+sendAlertMessageWindow.isPreRelease=Is pre-release
 sendAlertMessageWindow.version=新版本號
 sendAlertMessageWindow.send=發送通知
 sendAlertMessageWindow.remove=移除通知
@@ -2290,6 +2314,7 @@ popup.warning.seed=種子
 popup.warning.mandatoryUpdate.trading=請更新到最新的 Bisq 版本。強制更新禁止了舊版本進行交易。更多信息請訪問 Bisq 論壇。
 popup.warning.mandatoryUpdate.dao=請更新到最新的 Bisq 版本。強制更新禁止了舊版本舊版本的 Bisq DAO 和 BSQ 。更多信息請訪問 Bisq 論壇。
 popup.warning.disable.dao=Bisq DAO 和 BSQ 被臨時禁用的。更多信息請訪問 Bisq 論壇。
+popup.warning.noFilter=We did not receive a filter object from the seed nodes. This is a not expected situation. Please inform the Bisq developers.
 popup.warning.burnBTC=這筆交易是無法實現，因為 {0} 的挖礦手續費用會超過 {1} 的轉賬金額。請等到挖礦手續費再次降低或您積累了更多的 BTC 來轉賬。
 
 popup.warning.openOffer.makerFeeTxRejected=交易 ID 為 {0} 的掛單費交易被比特幣網絡拒絕。\n交易 ID = {1}\n交易已被移至失敗交易。\n請到“設置/網絡信息”進行 SPV 重新同步。\n如需更多幫助，請聯繫 Bisq Keybase 團隊的 Support 頻道
@@ -2596,6 +2621,8 @@ payment.select.altcoin=選擇或搜索數字貨幣
 payment.secret=密保問題
 payment.answer=答案
 payment.wallet=錢包 ID
+payment.amazon.site=Buy giftcard at
+payment.ask=Ask in Trader Chat
 payment.uphold.accountId=用户名或電子郵箱或電話號碼
 payment.moneyBeam.accountId=電子郵箱或者電話號碼
 payment.venmo.venmoUserName=Venmo 用户名：
@@ -2655,6 +2682,10 @@ payment.revolut.info=Revolut 要求使用“用户名”作為帳户 ID，而不
 payment.account.revolut.addUserNameInfo={0}\n您現有的 Revolut 帳户（{1}）尚未設置“用户名”。\n請輸入您的 Revolut ``用户名''以更新您的帳户數據。\n這不會影響您的賬齡驗證狀態。
 payment.revolut.addUserNameInfo.headLine=更新 Revolut 賬户
 
+payment.amazonGiftCard.upgrade=Amazon gift cards payment method requires the country to be specified.
+payment.account.amazonGiftCard.addCountryInfo={0}\nYour existing Amazon Gift Card account ({1}) does not have a Country specified.\nPlease enter your Amazon Gift Card Country to update your account data.\nThis will not affect your account age status.
+payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
+
 payment.usPostalMoneyOrder.info=在 Bisq 上交易  US Postal Money Orders （USPMO）您必須理解下述條款：\n\n- BTC 買方必須在發送方和收款人字段中都寫上 BTC 賣方的名稱，並在發送之前對 USPMO 和信封進行高分辨率照片拍照，並帶有跟蹤證明。\n- BTC 買方必須將 USPMO 連同交貨確認書一起發送給 BTC 賣方。\n\n如果需要調解，或有交易糾紛，您將需要將照片連同 USPMO 編號，郵局編號和交易金額一起發送給 Bisq 調解員或退款代理，以便他們進行驗證美國郵局網站上的詳細信息。\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n在所有爭議案件中，USPMO 發送方在向調解人或仲裁員提供證據/證明時承擔 100％ 的責任。\n\n如果您不理解這些要求，請不要在 Bisq 上使用 USPMO 進行交易。
 
 payment.cashByMail.info=Trading using cash-by-mail (CBM) on Bisq requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other fiat trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Bisq 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Bisq DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Bisq.

core/src/main/resources/wallet/checkpoints.txt

@@ -1,6 +1,6 @@
 TXT CHECKPOINTS 1
 0
-330
+332
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -331,3 +331,5 @@ Fk7wqQvRa3I8HIU0AAoPIAAAACClMk0cUuhV+1lsN2AW0bLOzyOjOxhvBAAAAAAAAAAAAHvW0itHeUSY
 FtgmMCmxHYDfZVDnAAoXAADg/ydUahAkyDODrqzZ/A9vg1WNyOWPKEjSBgAAAAAAAAAAAIF1YVHIYoFF9C7GrkXnuXeYn2j+2cNXhc5hrQ9iuMiyW5nWX3ITDxcvOs69
 F13fK/nssCNHFGj5AAoe4AAAQCDp4pHELBlNIcdX51i41BvbBjtbfHsECgAAAAAAAAAAAIcgs1NcVR2veWwlmJK7rkICXTqwbukwNfe5scvzGUskkCDpXxciDxc/NQHe
 F+MYpAKDBczv4JWTAAomwAAAACBS1/Bd73vGgmzadPW9r4Vf4TzSyKulDgAAAAAAAAAAALu0Rd+bUPZVV1LffkjQnE9dvY5cjr8wr/G1X47UTZ6Atcr5X6GoDRcUdkaH
+GHax93pF7gaxq0XZAAouoAAAoCCqU8YdV933DGrl49Dn/tEwGvNAEx6tCAAAAAAAAAAAAFYHby9tEq0dadLbjJDzL1bca6HRgkdDHRIWmM7snd7JCQ8MYFeEDRdjn+Zp
+GQvX6N/GOKeq1c5DAAo2gAAAACC4g9jQzny0CwJI9mI2feK6gSKFkJPyBAAAAAAAAAAAACYuf376jLmC/rlDvhOOvKnh4emKgnHG9GJw3WPHFB2b//0dYLkhDRcLx0qQ

desktop/package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.5.6-SNAPSHOT
+ENV version 1.5.7-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

desktop/package/linux/package.sh

@@ -6,7 +6,7 @@
 #   - Update version below
 #   - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
 
-version=1.5.6-SNAPSHOT
+version=1.5.7-SNAPSHOT
 version_base=$(echo $version | awk -F'[_-]' '{print $1}')
 if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
 	if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then

desktop/package/linux/release.sh

@@ -4,7 +4,7 @@
 # Prior to running this script:
 #   - Update version below
 
-version=1.5.6-SNAPSHOT
+version=1.5.7-SNAPSHOT
 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
 package_dir=$base_dir/desktop/package
 release_dir=$base_dir/desktop/release/$version

desktop/package/macosx/Info.plist

@@ -5,10 +5,10 @@
         <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
 
         <key>CFBundleVersion</key>
-        <string>1.5.6</string>
+        <string>1.5.7</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>1.5.6</string>
+        <string>1.5.7</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>

desktop/package/macosx/copy_dbs.sh

@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version="1.5.5"
+version="1.5.7"
 
 # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq
 

desktop/package/macosx/create_app.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="1.5.6-SNAPSHOT"
+version="1.5.7-SNAPSHOT"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar

desktop/package/macosx/finalize.sh

@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.5.6-SNAPSHOT"
+version="1.5.7-SNAPSHOT"
 
 target_dir="releases/$version"
 

desktop/package/macosx/insert_snapshot_version.sh

@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.5.6
+version=1.5.7
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

desktop/package/macosx/replace_version_number.sh

@@ -2,8 +2,8 @@
 
 cd $(dirname $0)/../../../.
 
-oldVersion=1.5.5
-newVersion=1.5.6
+oldVersion=1.5.6
+newVersion=1.5.7
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \
@@ -19,5 +19,6 @@ find . -type f \( -name "finalize.sh" \
 find . -type f \( -name "Info.plist" \
 -o -name "SeedNodeMain.java" \
 -o -name "Version.java" \
+-o -name "copy_dbs.sh" \
 \) -exec sed -i '' s/$oldVersion/$newVersion/ {} +
 

desktop/package/windows/package.bat

@@ -11,7 +11,7 @@
 
 @echo off
 
-set version=1.5.6-SNAPSHOT
+set version=1.5.7-SNAPSHOT
 if not exist "%JAVA_HOME%\bin\javapackager.exe" (
     if not exist "%ProgramFiles%\Java\jdk-10.0.2" (
         echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.

desktop/package/windows/release.bat

@@ -6,7 +6,7 @@
 
 @echo off
 
-set version=1.5.6-SNAPSHOT
+set version=1.5.7-SNAPSHOT
 set release_dir=%~dp0..\..\..\releases\%version%
 set package_dir=%~dp0..
 

relay/src/main/resources/version.txt

@@ -1 +1 @@
-1.5.6-SNAPSHOT
+1.5.7-SNAPSHOT

seednode/src/main/java/bisq/seednode/SeedNodeMain.java

@@ -47,7 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class SeedNodeMain extends ExecutableForAppWithP2p {
     private static final long CHECK_CONNECTION_LOSS_SEC = 30;
-    private static final String VERSION = "1.5.6";
+    private static final String VERSION = "1.5.7";
     private SeedNode seedNode;
     private Timer checkConnectionLossTime;