Merge pull request #5148 from bisq-network/release/v1.5.5

Release/v1.5.5

build.gradle

@@ -386,7 +386,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.5.4-SNAPSHOT'
+    version = '1.5.5-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.4";
+    public static final String VERSION = "1.5.5";
 
     /**
      * 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");
+    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 int getMajorVersion(String version) {
         return getSubVersion(version, 0);

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Čekání na finance...
 shared.depositTransactionId=ID vkladové transakce
 shared.TheBTCBuyer=BTC kupující
 shared.You=Vy
-shared.reasonForPayment=Účel platby
 shared.sendingConfirmation=Posílám potvrzení...
 shared.sendingConfirmationAgain=Prosím pošlete potvrzení znovu
 shared.exportCSV=Exportovat do CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Dostupná aktualizace)
 ####################################################################
 
 market.tabs.offerBook=Seznam nabídek
-market.tabs.spread=Detaily
+market.tabs.spreadCurrency=Nabídky podle měn
+market.tabs.spreadPayment=Nabídky podle způsobů platby
 market.tabs.trades=Obchody
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Koupit BTC ({0})
 market.spread.numberOfSellOffersColumn=Prodat BTC ({0})
 market.spread.totalAmountColumn=Celkem BTC ({0})
 market.spread.spreadColumn=Rozptyl
+market.spread.expanded=Rozbalit
 
 # TradesChartsView
 market.trades.nrOfTrades=Obchodů: {0}
-market.trades.tooltip.volumeBar=Objem: {0}\nPočet obchodů: {1}\nDatum: {2}
+market.trades.tooltip.volumeBar=Objem: {0} / {1}\nPočet obchodů: {2}\nDatum: {3}
 market.trades.tooltip.candle.open=Otevřené:
 market.trades.tooltip.candle.close=Zavřít:
 market.trades.tooltip.candle.high=Nejvyšší:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Nejnižší:
 market.trades.tooltip.candle.average=Průměr:
 market.trades.tooltip.candle.median=Medián:
 market.trades.tooltip.candle.date=Datum:
+market.trades.showVolumeInUSD=Zobrazit objem v USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Přijatá sídla bank (příjemce):\n {0}
 offerbook.availableOffers=Dostupné nabídky
 offerbook.filterByCurrency=Filtrovat podle měny
 offerbook.filterByPaymentMethod=Filtrovat podle platební metody
+offerbook.matchingOffers=Nabídky odpovídající mým účtům
 offerbook.timeSinceSigning=Informace o účtu
 offerbook.timeSinceSigning.info=Tento účet byl ověřen a {0}
 offerbook.timeSinceSigning.info.arbitrator=podepsán rozhodcem a může podepisovat účty partnerů
@@ -449,7 +452,7 @@ createOffer.triggerPrice.invalid.tooLow=Hodnota musí být vyšší než {0}
 createOffer.triggerPrice.invalid.tooHigh=Hodnota musí být nižší než {0}
 
 # new entries
-createOffer.placeOfferButton=Přehled: Umístěte nabídku k {0} bitcoinu
+createOffer.placeOfferButton=Přehled: Umístěte nabídku {0} bitcoin
 createOffer.createOfferFundWalletInfo.headline=Financujte svou nabídku
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Výše obchodu: {0}\n
@@ -504,7 +507,7 @@ takeOffer.success.info=Stav vašeho obchodu můžete vidět v \"Portfolio/Otevř
 takeOffer.error.message=Při převzetí nabídky došlo k chybě.\n\n{0}
 
 # new entries
-takeOffer.takeOfferButton=Přehled: Využijte nabídku {0} bitcoin(y)
+takeOffer.takeOfferButton=Přehled: Využijte nabídku {0} bitcoin
 takeOffer.noPriceFeedAvailable=Tuto nabídku nemůžete vzít, protože používá procentuální cenu založenou na tržní ceně, ale není k dispozici žádný zdroj cen.
 takeOffer.takeOfferFundWalletInfo.headline=Financujte svůj obchod
 # suppress inspection "TrailingSpacesInProperty"
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=Vkladová transakce není stále potvrzena. K tomu
 portfolio.pending.step1.openForDispute=Vkladová transakce není stále potvrzena. Můžete počkat déle nebo požádat o pomoc mediátora.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Váš obchod dosáhl alespoň jednoho potvrzení na blockchainu.\n(Pokud chcete, můžete čekat na další potvrzení - 6 potvrzení je považováno za velmi bezpečné.)\n\n
+portfolio.pending.step2.confReached=Váš obchod má alespoň jedno potvrzení blockchainu.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Po zavření vyskakovacího okna můžete hodnoty z hlavní obrazovky zkopírovat a vložit.)
+portfolio.pending.step2_buyer.refTextWarn=Důležité: když vyplňujete platební informace, nechte pole \"důvod platby\" prázdné. NEPOUŽÍVEJTE ID obchodu ani jiné poznámky jako např. 'bitcoin', 'BTC' nebo 'Bisq'. Můžete se se svým obchodním partnerem domluvit pomocí chatu na identifikaci platby, která bude vyhovovat oběma.
-portfolio.pending.step2_buyer.refTextWarn=NEPOUŽÍVEJTE žádné další poznámky v textu \"důvod platby\", jako je bitcoin, BTC nebo Bisq.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Zde jsou podrobnosti o obchodním účtu prodejce BTC:\n
+portfolio.pending.step2_buyer.fees=Pokud vaše banka účtuje poplatky za převod, musíte tyto poplatky uhradit vy.
-portfolio.pending.step2_buyer.tradeId=Nezapomeňte přidat ID obchodu
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=jako \"důvod platby\", aby příjemce mohl vaši platbu přiřadit tomuto obchodu.\n\n
-portfolio.pending.step2_buyer.fees=Pokud vaše banka účtuje poplatky, musíte tyto poplatky pokrýt.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Převeďte prosím z vaší externí {0} peněženky\n{1} prodejci BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Kupte si na svém účtu Amazon kar
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Zašlete prosím {0} prodejci BTC pomocí \"US Postal Money Order\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Přejděte na webovou stránku online bankovnictví a zaplaťte {0} prodejci BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Zašlete prosím {0} prodejci BTC v poštovní zásilce (\"Cash by Mail\"). Konkrétní instrukce naleznete v obchodní smlouvě. V případě pochybností se můžete zeptat protistrany pomocí obchodního chatu. Více informací naleznete na Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Prosím uhraďte {0} pomocí zvolené platební metody prodejci BTC. V dalším kroku naleznete detaily o účtu prodejce.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Kontaktujte prodejce BTC prostřednictvím poskytnutého kontaktu a domluvte si schůzku kde zaplatíte {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Zahajte platbu pomocí {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Váš obchodní partner potvrdil, že zaháj
 portfolio.pending.step3_seller.altcoin.explorer=ve vašem oblíbeném {0} blockchain exploreru
 portfolio.pending.step3_seller.altcoin.wallet=na vaší {0} peněžence
 portfolio.pending.step3_seller.altcoin={0}Zkontrolujte prosím {1}, zda transakce na vaši přijímací adresu\n{2}\nmá již dostatečné potvrzení na blockchainu.\nČástka platby musí být {3}\n\nPo zavření vyskakovacího okna můžete zkopírovat a vložit svou {4} adresu z hlavní obrazovky.
-portfolio.pending.step3_seller.postal={0} Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"US Postal Money Order\".\n\nObchodní ID (\"důvod platby\" text) transakce je: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"US Postal Money Order\".
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Váš obchodní partner potvrdil, že zahájil platbu {0}.\n\nPřejděte na webovou stránku online bankovnictví a zkontrolujte, zda jste od kupujícího BTC obdrželi {1}.\n\nObchodní ID (\"důvod platby\" text) transakce je: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"Cash by Mail\".
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Váš obchodní partner potvrdil, že zahájil platbu {0}.\n\nPřejděte na webovou stránku online bankovnictví a zkontrolujte, zda jste od kupujícího BTC obdrželi {1}.
 portfolio.pending.step3_seller.cash=Vzhledem k tomu, že se platba provádí prostřednictvím hotovostního vkladu, musí kupující BTC napsat na papírový doklad \"NO REFUND\", roztrhat ho na 2 části a odeslat vám e-mailem fotografii.\n\nAbyste se vyhnuli riziku zpětného zúčtování, potvrďte pouze, zda jste obdrželi e-mail a zda si jste jisti, že papírový doklad je platný.\nPokud si nejste jisti, {0}
 portfolio.pending.step3_seller.moneyGram=Kupující vám musí zaslat e-mailem autorizační číslo a fotografii s potvrzením.\nPotvrzení musí jasně uvádět vaše celé jméno, zemi, stát a částku. Zkontrolujte si prosím váš e-mail, pokud jste obdrželi autorizační číslo.\n\nPo uzavření tohoto vyskakovacího okna se zobrazí jméno a adresa kupujícího BTC pro vyzvednutí peněz z MoneyGram.\n\nPotvrďte příjem až po úspěšném vyzvednutí peněz!
 portfolio.pending.step3_seller.westernUnion=Kupující vám musí zaslat MTCN (sledovací číslo) a fotografii s potvrzením e-mailem.\nPotvrzení musí jasně uvádět vaše celé jméno, město, zemi a částku. Zkontrolujte svůj e-mail, pokud jste obdrželi MTCN.\n\nPo zavření tohoto vyskakovacího okna uvidíte jméno a adresu kupujícího BTC pro vyzvednutí peněz z Western Union.\n\nPotvrďte příjem až po úspěšném vyzvednutí peněz!
@@ -717,13 +719,11 @@ portfolio.pending.step3_seller.warn.part1b=u vašeho poskytovatele plateb (např
 portfolio.pending.step3_seller.warn.part2=Stále jste nepotvrdili přijetí platby. Zkontrolujte {0}, zda jste obdrželi platbu.
 portfolio.pending.step3_seller.openForDispute=Nepotvrdili jste příjem platby!\nUplynulo max. období obchodu.\nPotvrďte nebo požádejte o pomoc mediátora.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.part1=Obdrželi jste od svého obchodního partnera platbu {0}?\n\n
+portfolio.pending.step3_seller.onPaymentReceived.part1=Obdrželi jste od svého obchodního partnera platbu v měně {0}?\n\n
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=ID obchodní (\"důvod platby\" text) transakce je: \"{0}\"\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Ověřte také, zda se jméno odesílatele uvedené v obchodní smlouvě shoduje se jménem uvedeným na výpisu z účtu:\nJméno odesílatele podle obchodní smlouvy: {0}\n\nPokud jména nejsou úplně stejná, nepotvrzujte příjem platby. Místo toho otevřete spor stisknutím \"alt + o\" nebo \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.note=Vezměte prosím na vědomí, že jakmile potvrdíte příjem, bude uzamčená částka obchodu vrácena kupujícímu BTC a záloha bude vrácena.\n\n
+portfolio.pending.step3_seller.onPaymentReceived.note=Vezměte prosím na vědomí, že jakmile potvrdíte příjem, dosud uzamčený obchodovaný BTC bude uvolněn kupujícímu a kauce bude vrácena.\n\n
 portfolio.pending.step3_seller.onPaymentReceived.confirm.headline=Potvrďte, že jste obdržel(a) platbu
 portfolio.pending.step3_seller.onPaymentReceived.confirm.yes=Ano, obdržel(a) jsem platbu
 portfolio.pending.step3_seller.onPaymentReceived.signer=DŮLEŽITÉ: Potvrzením přijetí platby ověřujete také účet protistrany a odpovídajícím způsobem jej podepisujete. Protože účet protistrany dosud nebyl podepsán, měli byste odložit potvrzení platby co nejdéle, abyste snížili riziko zpětného zúčtování.
@@ -775,7 +775,7 @@ portfolio.pending.error.depositTxNotConfirmed=Vkladová transakce není potvrzen
 
 portfolio.pending.support.headline.getHelp=Potřebujete pomoc?
 portfolio.pending.support.text.getHelp=Pokud máte nějaké problémy, můžete zkusit kontaktovat obchodníka v obchodním chatu nebo požádat komunitu Bisq na adrese https://bisq.community. Pokud váš problém stále není vyřešen, můžete požádat mediátora o další pomoc.
-portfolio.pending.support.button.getHelp=Otevřít obchodovací chat
+portfolio.pending.support.button.getHelp=Otevřít obchodní chat
 portfolio.pending.support.headline.halfPeriodOver=Zkontrolujte platbu
 portfolio.pending.support.headline.periodOver=Obchodní období skončilo
 
@@ -900,7 +900,7 @@ funds.tx.memo=Poznámka
 funds.tx.noTxAvailable=Není k dispozici žádná transakce
 funds.tx.revert=Vrátit
 funds.tx.txSent=Transakce byla úspěšně odeslána na novou adresu v lokální peněžence Bisq.
-funds.tx.direction.self=Poslat sobě
+funds.tx.direction.self=Posláno sobě
 funds.tx.daoTxFee=Poplatek za těžbu za BSQ tx
 funds.tx.reimbursementRequestTxFee=Žádost o vyrovnání
 funds.tx.compensationRequestTxFee=Žádost o odměnu
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Zobrazit mé vlastní nabídky v seznamu nabí
 setting.preferences.useAnimations=Použít animace
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peer: {1}
 settings.net.ips=[IP adresa:port | název hostitele:port | onion adresa:port] (oddělené čárkou). Pokud je použit výchozí port (8333), lze port vynechat.
 settings.net.seedNode=Seed node
 settings.net.directPeer=Peer uzel (přímý)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Peer
 settings.net.inbound=příchozí
 settings.net.outbound=odchozí
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Zadejte soukromý klíč pro registraci
 
 filterWindow.headline=Upravit seznam filtrů
 filterWindow.offers=Filtrované nabídky (oddělené čárkami)
-filterWindow.onions=Filtrované onion adresy (oddělené čárkami)
+filterWindow.onions=Onion adresy vyloučené z obchodování (oddělené čárkami)
+filterWindow.bannedFromNetwork=Onion adresy vyloučené ze síťové komunikace (oddělené čárkami)
 filterWindow.accounts=Filtrovaná data obchodního účtu:\nFormát: seznam [ID platební metody | datové pole | hodnota] oddělený čárkami
 filterWindow.bannedCurrencies=Filtrované kódy měn (oddělené čárkami)
 filterWindow.bannedPaymentMethods=ID filtrované platební metody (oddělené čárkami)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Min. verze nutná pro obchodování
 filterWindow.add=Přidat filtr
 filterWindow.remove=Zrušit filtr
 filterWindow.btcFeeReceiverAddresses=Adresy příjemců poplatků BTC
+filterWindow.disableApi=Deaktivovat API
 
 offerDetailsWindow.minBtcAmount=Min. částka BTC
 offerDetailsWindow.min=(min. {0})
@@ -2132,8 +2137,8 @@ offerDetailsWindow.countryBank=Země původu banky tvůrce
 offerDetailsWindow.commitment=Závazek
 offerDetailsWindow.agree=Souhlasím
 offerDetailsWindow.tac=Pravidla a podmínky
-offerDetailsWindow.confirm.maker=Potvrďte: Umístit nabídku na {0} bitcoinu
+offerDetailsWindow.confirm.maker=Potvrďte: Umístit nabídku {0} bitcoin
-offerDetailsWindow.confirm.taker=Potvrďte: Využít nabídku pro {0} bitcoinu
+offerDetailsWindow.confirm.taker=Potvrďte: Využít nabídku {0} bitcoin
 offerDetailsWindow.creationDate=Datum vzniku
 offerDetailsWindow.makersOnion=Onion adresa tvůrce
 
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Stav obchodu
 tradeDetailsWindow.agentAddresses=Rozhodce/Mediátor
 tradeDetailsWindow.detailData=Detailní data
 
+txDetailsWindow.headline=Detaily transakce
+txDetailsWindow.btc.note=Poslali jste BTC.
+txDetailsWindow.bsq.note=Poslali jste BSQ. BSQ je tzv. obarvený bitcoin, takže tato transakce bude viditelná v BSQ exploreru až poté, co bude potvrzena zařazením do bitcoin bloku.
+txDetailsWindow.sentTo=Odesláno na
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Pro odemknutí zadejte heslo
 
 torNetworkSettingWindow.header=Nastavení sítě Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Probíhá vypínání
 popup.shutDownInProgress.msg=Vypnutí aplikace může trvat několik sekund.\nProsím, nepřerušujte tento proces.
 
 popup.attention.forTradeWithId=Je třeba věnovat pozornost obchodu s ID {0}
+popup.attention.reasonForPaymentRuleChange=Verze 1.5.5 přináší zásadní změnu v pravidlech obchodování ohledně \"důvodu platby\" v bankovních převodech. Prosím nechte toto pole prázdné -- ID obchodu již v poli \"důvod platby\" NEPOUŽÍVEJTE.
 
 popup.info.multiplePaymentAccounts.headline=K dispozici jsou účty a více platebními metodami
 popup.info.multiplePaymentAccounts.msg=Pro tuto nabídku máte k dispozici více platebních účtů. Ujistěte se, že jste vybrali ten správný.
@@ -2422,7 +2434,7 @@ peerInfoIcon.tooltip.trade.notTraded={0} onion adresa: {1}\nDosud jste s tímto
 peerInfoIcon.tooltip.age=Platební účet byl vytvořen před {0}.
 peerInfoIcon.tooltip.unknownAge=Stáří platebního účtu není znám.
 
-tooltip.openPopupForDetails=Otevřít vyskakovací okno pro podrobnosti
+tooltip.openPopupForDetails=Otevřít vyskakovací okno s podrobnostmi
 tooltip.invalidTradeState.warning=Tento obchod je v neplatném stavu. Chcete-li získat další informace, otevřete okno s podrobnostmi
 tooltip.openBlockchainForAddress=Otevřít externí blockchain explorer pro adresu: {0}
 tooltip.openBlockchainForTx=Otevřete externí blockchain explorer pro transakci: {0}
@@ -2622,7 +2634,7 @@ payment.bankId=ID Banky (BIC/SWIFT)
 payment.bankIdOptional=ID Banky (BIC/SWIFT) (volitelné)
 payment.branchNr=Číslo pobočky
 payment.branchNrOptional=Číslo pobočky (volitelné)
-payment.accountNrLabel=Číslo účtu. (IBAN)
+payment.accountNrLabel=Číslo účtu (IBAN)
 payment.accountType=Typ účtu
 payment.checking=Kontrola
 payment.savings=Úspory
@@ -2635,7 +2647,7 @@ payment.halCash.info=Při používání HalCash musí kupující BTC poslat prod
 # suppress inspection "UnusedMessageFormatParameter"
 payment.limits.info=Uvědomte si, že u všech bankovních převodů existuje určité riziko zpětného zúčtování. Aby se toto riziko zmírnilo, stanoví Bisq limity pro jednotlivé obchody na základě odhadované úrovně rizika zpětného zúčtování pro použitou platební metodu.\n\nU této platební metody je váš limit pro jednotlivé obchody pro nákup a prodej {2}.\n\nToto omezení se vztahuje pouze na velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits].
 # suppress inspection "UnusedProperty"
-payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Bisq stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro velikost jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits].
+payment.limits.info.withSigning=Aby se omezilo riziko zpětného zúčtování, Bisq stanoví limity pro jednotlivé obchody pro tento typ platebního účtu na základě následujících 2 faktorů:\n\n1. Obecné riziko zpětného zúčtování pro platební metodu\n2. Stav podepisování účtu\n\nTento platební účet ještě není podepsán, takže je omezen na nákup {0} za obchod. Po podpisu se limity nákupu zvýší následovně:\n\n● Před podpisem a 30 dní po podpisu bude váš limit nákupu podle obchodu {0}\n● 30 dní po podpisu bude váš limit nákupu podle obchodu {1}\n● 60 dní po podpisu bude váš limit nákupu podle obchodu {2}\n\nPodpisy účtu neovlivňují prodejní limity. Můžete okamžitě prodat {2} v jednom obchodu.\n\nTato omezení platí pouze pro objem jednoho obchodu - můžete zadat tolik obchodů, kolik chcete.\n\nDalší podrobnosti najdete na wiki [HYPERLINK:https://bisq.wiki/Account_limits].
 
 payment.cashDeposit.info=Potvrďte, že vám vaše banka umožňuje odesílat hotovostní vklady na účty jiných lidí. Například Bank of America a Wells Fargo již takové vklady nepovolují.
 
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Aktualizujte účet Revolut
 
 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.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ář“
 payment.f2f.city.prompt=Město se zobrazí s nabídkou
-payment.f2f.optionalExtra=Volitelné další informace
+payment.shared.optionalExtra=Volitelné další informace
-payment.f2f.extra=Dodatečné informace
+payment.shared.extraInfo=Dodatečné informace
-
+payment.shared.extraInfo.prompt=Uveďte jakékoli speciální požadavky, podmínky a detaily, které chcete zobrazit u vašich nabídek s tímto platebním účtem. (Uživatelé uvidí tyto informace předtím, než akceptují vaši nabídku.)
-payment.f2f.extra.prompt=Tvůrce může definovat „smluvní podmínky“ nebo přidat veřejné kontaktní informace. Zobrazí se s nabídkou.
 payment.f2f.info=Obchody „tváří v tvář“ mají různá pravidla a přicházejí s jinými riziky než online transakce.\n\nHlavní rozdíly jsou:\n● Obchodní partneři si musí vyměňovat informace o místě a čase schůzky pomocí poskytnutých kontaktních údajů.\n● Obchodní partneři musí přinést své notebooky a na místě setkání potvrdit „platba odeslána“ a „platba přijata“.\n● Pokud má tvůrce speciální „podmínky“, musí uvést podmínky v textovém poli „Další informace“ na účtu.\n● Přijetím nabídky zadavatel souhlasí s uvedenými „podmínkami a podmínkami“ tvůrce.\n● V případě sporu nemůže být mediátor nebo rozhodce příliš nápomocný, protože je obvykle obtížné získat důkazy o tom, co se na schůzce stalo. V takových případech mohou být prostředky BTC uzamčeny na dobu neurčitou nebo dokud se obchodní partneři nedohodnou.\n\nAbyste si byli jisti, že plně rozumíte rozdílům v obchodech „tváří v tvář“, přečtěte si pokyny a doporučení na adrese: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Otevřít webovou stránku
 payment.f2f.offerbook.tooltip.countryAndCity=Země a město: {0} / {1}
@@ -2676,7 +2691,8 @@ NATIONAL_BANK=Národní bankovní převod
 SAME_BANK=Převod ve stejné bance
 SPECIFIC_BANKS=Převody u konkrétních bank
 US_POSTAL_MONEY_ORDER=Poukázka US Postal
-CASH_DEPOSIT=Cash Deposit
+CASH_DEPOSIT=Vklad hotovosti na účet prodávajícího
+CASH_BY_MAIL=Odeslání hotovosti poštou
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Tváří v tvář (osobně)
@@ -2692,7 +2708,9 @@ SPECIFIC_BANKS_SHORT=Konkrétní banky
 # suppress inspection "UnusedProperty"
 US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
-CASH_DEPOSIT_SHORT=Cash Deposit
+CASH_DEPOSIT_SHORT=Vklad hotovosti
+# suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=Hotovost poštou
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Warte auf Gelder...
 shared.depositTransactionId=Kautionstransaktions-ID
 shared.TheBTCBuyer=Der BTC-Käufer
 shared.You=Sie
-shared.reasonForPayment=Verwendungszweck
 shared.sendingConfirmation=Sende Bestätigung...
 shared.sendingConfirmationAgain=Bitte senden Sie die Bestätigung erneut
 shared.exportCSV=Als CSV exportieren
@@ -218,7 +217,7 @@ shared.refundAgentForSupportStaff=Rückerstattungsbeauftragten
 shared.delayedPayoutTxId=Verzögerte Auszahlungs-ID der Transaktion
 shared.delayedPayoutTxReceiverAddress=Verzögerte Auszahlungs-Transaktion gesendet zu
 shared.unconfirmedTransactionsLimitReached=Sie haben im Moment zu viele unbestätigte Transaktionen. Bitte versuchen Sie es später noch einmal.
-shared.numItemsLabel=Number of entries: {0}
+shared.numItemsLabel=Anzahl der Einträge: {0}
 shared.filter=Filter
 shared.enabled=Aktiviert
 
@@ -291,7 +290,8 @@ mainView.version.update=(Update verfügbar)
 ####################################################################
 
 market.tabs.offerBook=Angebotsbuch
-market.tabs.spread=Details
+market.tabs.spreadCurrency=Angebote nach Währung
+market.tabs.spreadPayment=Angebote nach Zahlungsmethode
 market.tabs.trades=Trades
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=BTC kaufen ({0})
 market.spread.numberOfSellOffersColumn=BTC verkaufen ({0})
 market.spread.totalAmountColumn=BTC insgesamt ({0})
 market.spread.spreadColumn=Verteilung
+market.spread.expanded=Erweiterte Ansicht
 
 # TradesChartsView
 market.trades.nrOfTrades=Trades: {0}
-market.trades.tooltip.volumeBar=Volumen: {0}\nAnzahl der Trades: {1}\nDatum: {2}
+market.trades.tooltip.volumeBar=Volumen: {0} / {1}\nAnzahl der Trades: {2}\nDatum: {3}
 market.trades.tooltip.candle.open=Eröffnung:
 market.trades.tooltip.candle.close=Abschluss:
 market.trades.tooltip.candle.high=Hoch:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Niedrig:
 market.trades.tooltip.candle.average=Durchschnitt:
 market.trades.tooltip.candle.median=Median:
 market.trades.tooltip.candle.date=Datum:
+market.trades.showVolumeInUSD=Volumen in USD anzeigen
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Als Banksitz akzeptierte Länder (Abnehmer):
 offerbook.availableOffers=Verfügbare Angebote
 offerbook.filterByCurrency=Nach Währung filtern
 offerbook.filterByPaymentMethod=Nach Zahlungsmethode filtern
+offerbook.matchingOffers=Angebote, die dem Zahlungskonto entsprechen
 offerbook.timeSinceSigning=Konto Informationen
 offerbook.timeSinceSigning.info=Dieses Konto wurde verifiziert und {0}
 offerbook.timeSinceSigning.info.arbitrator=von einem Vermittler unterzeichnet und kann Partner-Konten unterzeichnen
@@ -442,11 +445,11 @@ 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=Set optional trigger price
+createOffer.triggerPrice.prompt=Optionalen Auslösepreis einstellen
-createOffer.triggerPrice.label=Deactivate offer if market price is {0}
+createOffer.triggerPrice.label=Angebot deaktivieren wenn Marktpreis {0} ist
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+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=Value must be higher than {0}
+createOffer.triggerPrice.invalid.tooLow=Wert muss höher sein als {0}
-createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
+createOffer.triggerPrice.invalid.tooHigh=Wert muss niedriger sein als {0}
 
 # new entries
 createOffer.placeOfferButton=Überprüfung: Anbieten Bitcoins zu {0}
@@ -534,8 +537,8 @@ takeOffer.tac=Mit der Annahme dieses Angebots stimme ich den oben festgelegten H
 ####################################################################
 
 openOffer.header.triggerPrice=Triggerpreis
-openOffer.triggerPrice=Trigger price {0}
+openOffer.triggerPrice=Auslösepreis {0}
-openOffer.triggered=The offer has been deactivated because the market price reached your trigger price.\nPlease edit the offer to define a new trigger price
+openOffer.triggered=Das Angebot wurde deaktiviert, weil der Marktpreis Ihren Auslösepreis erreicht hat.\nBitte bearbeiten Sie das Angebot, um einen neuen Auslösepreis zu definieren.
 
 editOffer.setPrice=Preis festlegen
 editOffer.confirmEdit=Bestätigen: Angebot bearbeiten
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=Die Kautionstransaktion ist noch nicht bestätigt.
 portfolio.pending.step1.openForDispute=Die Kautionstransaktion ist noch nicht bestätigt. Sie können länger warten oder den Vermittler um Hilfe bitten.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Ihr Handel hat wenigstens eine Blockchain-Bestätigung erreicht.\n(Falls Sie möchten können Sie weitere Bestätigungen abwarten. 6 Bestätigungen werden als sehr sicher angesehen.)\n\n
+portfolio.pending.step2.confReached=Ihr Trade hat mindestens eine Blockchain-Bestätigung.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Sie können die Werte vom Hauptbildschirm kopieren und woanders einfügen, nachdem dieser Dialog geschlossen wurde.)
+portfolio.pending.step2_buyer.refTextWarn=Wichtig: Wenn Sie die Zahlung durchführen, lassen Sie \"das Zahlungsgrund\" Feld leer. Geben Sie nicht die Trade-ID oder einen anderen Text wie 'Bitcoin', 'BTC' oder 'Bisq' an. Sie können im Chat gerne diskutieren ob ein alternativer \"Zahlungsgrund\" für euch beide passend wäre.
-portfolio.pending.step2_buyer.refTextWarn=Nutzen Sie KEINE zusätzlichen Informationen wie Bitcoin, BTC oder Bisq im \"Verwendungszweck\".
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Hier sind die Details zum Handelskonto des BTC-Verkäufers:\n
+portfolio.pending.step2_buyer.fees=Sollte Ihre Bank Gebühren erheben, müssen Sie diese Gebühren selbst bezahlen.
-portfolio.pending.step2_buyer.tradeId=Vergessen Sie bitte nicht, die Handels-ID anzugeben
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=als \"Verwendungszweck\", damit der Empfänger Ihre Zahlung diesem Handel zuordnen kann.\n\n
-portfolio.pending.step2_buyer.fees=Sollte Ihre Bank Gebühren erheben, müssen Sie diese decken.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Bitte überweisen Sie von Ihrer externen {0}-Wallet\n{1} an den BTC-Verkäufer.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Bitte kaufen Sie eine Amazon eGift
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Bitte senden Sie {0} per \"US Postal Money Order\" an den BTC-Verkäufer.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Bitte besuchen Sie Ihre Online-Banking-Website und zahlen Sie {0} an den BTC-Verkäufer.\n\n
+portfolio.pending.step2_buyer.cashByMail=Bitte senden Sie bei Verwendung von \"Bargeld per Post\" {0} zum BTC Verkäufer. Genaue Anweisungen finden Sie im Handelsvertrag oder wenn etwas unklar ist, können Sie Fragen über den Trader Chat stellen. Finden SIe weitere Informationen über Bargeld per Post im Bisq Wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Bitte zahlen Sie {0} mit der gewählten Zahlungsmethode an den BTC Verkäufer. Sie finden die Konto Details des Verkäufers im nächsten Fenster.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Bitte kontaktieren Sie den BTC-Verkäufer, mit den bereitgestellten Daten und organisieren Sie ein Treffen um {0} zu zahlen.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Zahlung per {0} beginnen
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Ihr Handelspartner hat bestätigt, die {0}-Z
 portfolio.pending.step3_seller.altcoin.explorer=in ihrem bevorzugten {0} Blockchain Explorer
 portfolio.pending.step3_seller.altcoin.wallet=in ihrer {0} Wallet
 portfolio.pending.step3_seller.altcoin={0}Bitte überprüfen Sie mit Ihrem bevorzugten {1}-Blockchain-Explorer, ob die Transaktion zu Ihrer Empfangsadresse\n{2}\nschon genug Blockchain-Bestätigungen hat.\nDer Zahlungsbetrag muss {3} sein\n\nSie können Ihre {4}-Adresse vom Hauptbildschirm kopieren und woanders einfügen, nachdem dieser Dialog geschlossen wurde.
-portfolio.pending.step3_seller.postal={0}Bitte überprüfen Sie, ob Sie {1} per \"US Postal Money Order\" vom BTC-Käufer erhalten haben.\n\nDie Handels-ID (\"Verwendungszweck\") der Transaktion ist: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Bitte überprüfen Sie, ob Sie {1} per \"US Postal Money Order\" vom BTC-Käufer erhalten haben.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Ihr Handelspartner hat den Beginn der {0}-Zahlung bestätigt.\n\nBitte gehen Sie auf Ihre Online-Banking-Website und überprüfen Sie, ob Sie {1} vom BTC-Käufer erhalten haben.\n\nDie Handels-ID (\"Verwendungszweck\") der Transaktion ist: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Bitte überprüfen Sie, ob Sie {1} in \"Bargeld per Post\" vom BTC-Käufer erhalten haben.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Ihr Handelspartner hat den Beginn der {0}-Zahlung bestätigt.\n\nBitte gehen Sie auf Ihre Online-Banking-Website und überprüfen Sie, ob Sie {1} vom BTC-Käufer erhalten haben.
 portfolio.pending.step3_seller.cash=Da die Zahlung per Cash Deposit ausgeführt wurde, muss der BTC-Käufer \"NO REFUND\" auf die Quittung schreiben, diese in 2 Teile reißen und Ihnen ein Foto per E-Mail schicken.\n\nUm die Gefahr einer Rückbuchung zu vermeiden bestätigen Sie nur, wenn Sie die E-Mail erhalten haben und Sie sicher sind, dass die Quittung gültig ist.\nWenn Sie nicht sicher sind, {0}
 portfolio.pending.step3_seller.moneyGram=Der Käufer muss Ihnen die Authorisierungs-Nummer und ein Foto der Quittung per E-Mail zusenden.\nDie Quittung muss deutlich Ihren vollständigen Namen, Ihr Land, Ihr Bundesland und den Betrag enthalten. Bitte überprüfen Sie Ihre E-Mail, wenn Sie die Authorisierungs-Nummer erhalten haben.\n\nNach dem Schließen dieses Pop-ups sehen Sie den Namen und die Adresse des BTC-Käufers, um das Geld von MoneyGram abzuholen.\n\nBestätigen Sie den Erhalt erst, nachdem Sie das Geld erfolgreich abgeholt haben!
 portfolio.pending.step3_seller.westernUnion=Der Käufer muss Ihnen die MTCN (Sendungsnummer) und ein Foto der Quittung per E-Mail zusenden.\nDie Quittung muss deutlich Ihren vollständigen Namen, Ihre Stadt, Ihr Land und den Betrag enthalten. Bitte überprüfen Sie Ihre E-Mail, wenn Sie die MTCN erhalten haben.\n\nNach dem Schließen dieses Pop-ups sehen Sie den Namen und die Adresse des BTC-Käufers, um das Geld von Western Union abzuholen.\n\nBestätigen Sie den Erhalt erst, nachdem Sie das Geld erfolgreich abgeholt haben!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=Sie haben den Eingang der Zahlung
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Ist die {0}-Zahlung Ihres Handelspartners eingegangen?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=Die Handels-ID (\"Verwendungszweck\") der Transaktion ist: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Bitte überprüfen Sie auch, ob der Name des im Trade-Vertrag angegebenen Absenders mit dem Namen auf Ihrem Kontoauszug übereinstimmt:\nName des Absenders, pro Trade-Vertrag: {0}\n\nWenn die Namen nicht genau gleich sind, bestätigen Sie den Zahlungseingang nicht. Eröffnen Sie stattdessen einen Konflikt, indem Sie \"alt + o\" oder \"option + o\" drücken.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Bitte beachten Sie, dass, sobald Sie den Erhalt bestätigt haben, der gesperrte Trade-Betrag an den BTC-Käufer freigegeben wird und die Kaution zurückerstattet wird.\n\n
@@ -957,7 +957,7 @@ support.error=Empfänger konnte die Nachricht nicht verarbeiten. Fehler: {0}
 support.buyerAddress=BTC-Adresse des Käufers
 support.sellerAddress=BTC-Adresse des Verkäufers
 support.role=Rolle
-support.agent=Support agent
+support.agent=Support-Mitarbeiter
 support.state=Status
 support.closed=Geschlossen
 support.open=Offen
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Eigenen Angebote im Angebotsbuch zeigen
 setting.preferences.useAnimations=Animationen abspielen
 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.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.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[IP Adresse:Port | Hostname:Port | Onion-Adresse:Port] (Komma getrennt). Port kann weggelassen werden, wenn Standard genutzt wird (8333).
 settings.net.seedNode=Seed-Knoten
 settings.net.directPeer=Peer (direkt)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Peer
 settings.net.inbound=eingehend
 settings.net.outbound=ausgehend
@@ -1178,18 +1181,18 @@ account.menu.paymentAccount=Nationale Währungskonten
 account.menu.altCoinsAccountView=Altcoin-Konten
 account.menu.password=Wallet-Passwort
 account.menu.seedWords=Wallet-Seed
-account.menu.walletInfo=Wallet info
+account.menu.walletInfo=Wallet Info
 account.menu.backup=Backup
 account.menu.notifications=Benachrichtigungen
 
-account.menu.walletInfo.balance.headLine=Wallet balances
+account.menu.walletInfo.balance.headLine=Wallet-Guthaben
-account.menu.walletInfo.balance.info=This shows the internal wallet balance including unconfirmed transactions.\nFor BTC, the internal wallet balance shown below should match the sum of the 'Available' and 'Reserved' balances shown in the top right of this window.
+account.menu.walletInfo.balance.info=Hier wird das interne Wallet-Guthaben einschließlich unbestätigter Transaktionen angezeigt.\nFür BTC sollte das unten angezeigte interne Wallet-Guthaben mit der Summe der oben rechts in diesem Fenster angezeigten "Verfügbaren" und "Reservierten" Guthaben übereinstimmen.
-account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys)
+account.menu.walletInfo.xpub.headLine=Watch Keys (xpub keys)
-account.menu.walletInfo.walletSelector={0} {1} wallet
+account.menu.walletInfo.walletSelector={0} {1} Wallet
-account.menu.walletInfo.path.headLine=HD keychain paths
+account.menu.walletInfo.path.headLine=HD Keychain Pfade
-account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.
+account.menu.walletInfo.path.info=Wenn Sie Seed Wörter in eine andere Wallet (wie Electrum) importieren, müssen Sie den Pfad definieren. Dies sollte nur in Notfällen geschehen, wenn Sie den Zugriff auf die Bisq-Wallet und das Datenverzeichnis verlieren.\nDenken Sie daran, dass die Ausgabe von Geldern aus einer Nicht-Bisq-Wallet die internen Bisq-Datenstrukturen, die mit den Wallet-Daten verbunden sind, durcheinander bringen kann, was zu fehlgeschlagenen Trades führen kann.\n\nSenden Sie NIEMALS BSQ von einer Nicht-Bisq-Wallet, da dies wahrscheinlich zu einer ungültigen BSQ-Transaktion und dem Verlust Ihrer BSQ führen wird.
 
-account.menu.walletInfo.openDetails=Show raw wallet details and private keys
+account.menu.walletInfo.openDetails=Wallet-Rohdaten und Private Keys anzeigen
 
 ## TODO should we rename the following to a gereric name?
 account.arbitratorRegistration.pubKey=Öffentlicher Schlüssel
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Private Key für die Registrierung eingeben
 
 filterWindow.headline=Filterliste bearbeiten
 filterWindow.offers=Herausgefilterte Angebote (durch Kommas getrennt)
-filterWindow.onions=Herausgefilterte Onion-Adressen (durch Kommas getrennt)
+filterWindow.onions=Vom Trading ausgeschlossene Adressen (Komma getr.)
+filterWindow.bannedFromNetwork=Vom Netzwerk ausgeschlossene Adressen (Komma getr.)
 filterWindow.accounts=Herausgefilterte Handelskonten Daten:\nFormat: Komma getrennte Liste von [Zahlungsmethoden ID | Datenfeld | Wert]
 filterWindow.bannedCurrencies=Herausgefilterte Währungscodes (durch Kommas getrennt)
 filterWindow.bannedPaymentMethods=Herausgefilterte Zahlungsmethoden-IDs (durch Kommas getrennt)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Min. zum Handeln erforderliche Version
 filterWindow.add=Filter hinzufügen
 filterWindow.remove=Filter entfernen
 filterWindow.btcFeeReceiverAddresses=BTC Gebühr Empfänger-Adressen
+filterWindow.disableApi=API deaktivieren
 
 offerDetailsWindow.minBtcAmount=Min. BTC-Betrag
 offerDetailsWindow.min=(min. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Handelsstatus
 tradeDetailsWindow.agentAddresses=Vermittler/Mediator
 tradeDetailsWindow.detailData=Detaillierte Daten
 
+txDetailsWindow.headline=Transaktionsdetails
+txDetailsWindow.btc.note=Sie haben BTC gesendet.
+txDetailsWindow.bsq.note=Sie haben BSQ-Gelder gesendet. BSQ sind "Colored Bitcoin", daher wird die Transaktion nicht in einem BSQ-Explorer angezeigt, bis sie in einem Bitcoin-Block bestätigt wurde.
+txDetailsWindow.sentTo=Gesendet an
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Passwort zum Entsperren eingeben
 
 torNetworkSettingWindow.header=Tor-Netzwerkeinstellungen
@@ -2296,19 +2307,20 @@ popup.info.cashDepositInfo.confirm=Ich bestätige, dass ich die Kaution zahlen k
 popup.info.shutDownWithOpenOffers=Bisq wird heruntergefahren, aber Sie haben offene Angebote verfügbar.\n\nDiese Angebote sind nach dem Herunterfahren nicht mehr verfügbar und werden erneut im P2P-Netzwerk veröffentlicht wenn Sie das nächste Mal Bisq starten.\n\nLassen Sie Bisq weiter laufen und stellen Sie sicher, dass Ihr Computer online bleibt, um Ihre Angebote verfügbar zu halten (z.B.: verhindern Sie den Standby-Modus... der Standby-Modus des Monitors stellt kein Problem dar).
 popup.info.qubesOSSetupInfo=Es scheint so als ob Sie Bisq auf Qubes OS laufen haben.\n\nBitte stellen Sie sicher, dass Bisq qube nach unserem Setup Guide eingerichtet wurde: [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes].
 popup.warn.downGradePrevention=Downgrade von Version {0} auf Version {1} wird nicht unterstützt. Bitte nutzen Sie die aktuelle Bisq Version.
-popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO state. You have to restart the application to fix the issue.
+popup.warn.daoRequiresRestart=Es gab ein Problem mit der Synchronisierung des DAO-Zustands. Sie müssen die Anwendung neu starten, um das Problem zu beheben.
 
 popup.privateNotification.headline=Wichtige private Benachrichtigung!
 
 popup.securityRecommendation.headline=Wichtige Sicherheitsempfehlung
 popup.securityRecommendation.msg=Wir würden Sie gerne daran erinnern, sich zu überlegen, den Passwortschutz Ihrer Wallet zu verwenden, falls Sie diesen noch nicht aktiviert haben.\n\nEs wird außerdem dringend empfohlen, dass Sie die Wallet-Seed-Wörter aufschreiben. Diese Seed-Wörter sind wie ein Master-Passwort zum Wiederherstellen ihrer Bitcoin-Wallet.\nIm \"Wallet-Seed\"-Abschnitt finden Sie weitere Informationen.\n\nZusätzlich sollten Sie ein Backup des ganzen Anwendungsdatenordners im \"Backup\"-Abschnitt erstellen.
 
-popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf)
+popup.bitcoinLocalhostNode.msg=Bisq hat einen Bitcoin Core Node entdeckt, der auf diesem Rechner (auf localhost) läuft.\n\nBitte stellen Sie sicher dass:\n- der Node vollständig synchronisiert ist, bevor Sie Bisq starten\n- Pruning deaktiviert ist ('prune=0' in bitcoin.conf)\n- Bloom-Filter aktiviert sind ('peerbloomfilters=1' in bitcoin.conf)
 
 popup.shutDownInProgress.headline=Anwendung wird heruntergefahren
 popup.shutDownInProgress.msg=Das Herunterfahren der Anwendung kann einige Sekunden dauern.\nBitte unterbrechen Sie diesen Vorgang nicht.
 
 popup.attention.forTradeWithId=Der Handel mit der ID {0} benötigt Ihre Aufmerksamkeit
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 bringt eine gravierende Änderung der Trading Regeln zum Thema \"Zahlungsgrund\" bei Banküberweisungen mit sich. Bitte lassen Sie dieses Feld immer leer -- fügen Sie NICHT MEHR die Trade-ID als \"Zahlungsgrund\" an.
 
 popup.info.multiplePaymentAccounts.headline=Mehrere Zahlungskonten verfügbar
 popup.info.multiplePaymentAccounts.msg=Für dieses Angebot stehen Ihnen mehrere Zahlungskonten zur Verfügung. Bitte stellen Sie sicher, dass Sie das richtige ausgewählt haben.
@@ -2335,7 +2347,7 @@ popup.accountSigning.signedByPeer=Eines Ihrer Zahlungskonten wurde von einem Tra
 popup.accountSigning.peerLimitLifted=Das anfängliche Limit für eines Ihrer Konten wurde aufgehoben.\n\n{0}
 popup.accountSigning.peerSigner=Eines Ihrer Konten ist reif genug, um andere Zahlungskonten zu unterzeichnen, und das anfängliche Limit für eines Ihrer Konten wurde aufgehoben.\n\n{0}
 
-popup.accountSigning.singleAccountSelect.headline=Import unsigned account age witness
+popup.accountSigning.singleAccountSelect.headline=Unsignierte Zeugen für Kontoalter importieren
 popup.accountSigning.confirmSingleAccount.headline=Ausgewählten Zeugen für Konto-Alter bestätigen
 popup.accountSigning.confirmSingleAccount.selectedHash=Ausgewählter Zeugen-Hash
 popup.accountSigning.confirmSingleAccount.button=Zeuge für Konto-Alter unterzeichnen
@@ -2476,8 +2488,8 @@ navigation.dao.wallet.receive=\"DAO/BSQ-Wallet/Erhalten\"
 
 formatter.formatVolumeLabel={0} Betrag{1}
 formatter.makerTaker=Ersteller als {0} {1} / Abnehmer als {2} {3}
-formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
+formatter.youAreAsMaker=Sie sind: {1} {0} (Maker) / Taker ist: {3} {2}
-formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
+formatter.youAreAsTaker=Sie sind: {1} {0} (Taker) / Maker ist: {3} {2}
 formatter.youAre=Sie {0} {1} ({2} {3})
 formatter.youAreCreatingAnOffer.fiat=Sie erstellen ein Angebot um {1} zu {0}
 formatter.youAreCreatingAnOffer.altcoin=Sie erstellen ein Angebot {1} zu {0} ({3} zu {2})
@@ -2590,7 +2602,7 @@ payment.venmo.venmoUserName=Venmo Nutzername
 payment.popmoney.accountId=E-Mail oder Telefonnummer
 payment.promptPay.promptPayId=Personalausweis/Steuernummer oder Telefonnr.
 payment.supportedCurrencies=Unterstützte Währungen
-payment.supportedCurrenciesForReceiver=Currencies for receiving funds
+payment.supportedCurrenciesForReceiver=Währungen für den Geldeingang
 payment.limitations=Einschränkungen
 payment.salt=Salt für Überprüfung des Kontoalters
 payment.error.noHexSalt=Der Salt muss im HEX-Format sein.\nEs wird empfohlen das Salt-Feld zu bearbeiten, wenn Sie den Salt von einem alten Konto übertragen, um das Alter Ihres Kontos zu erhalten. Das Alter des Kontos wird durch den Konto-Salt und die Kontodaten (z.B. IBAN) verifiziert.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Revolut Account 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.
+
+payment.cashByMail.contact=Kontaktinformationen
+payment.cashByMail.contact.prompt=Name oder Pseudonym Umschlag sollten adressiert werden an
 payment.f2f.contact=Kontaktinformationen
 payment.f2f.contact.prompt=Wie möchten Sie vom Trading-Peer kontaktiert werden? (E-Mail Adresse, Telefonnummer,...)
 payment.f2f.city=Stadt für ein "Angesicht zu Angesicht" Treffen
 payment.f2f.city.prompt=Die Stadt wird mit dem Angebot angezeigt
-payment.f2f.optionalExtra=Freiwillige zusätzliche Informationen
+payment.shared.optionalExtra=Freiwillige zusätzliche Informationen
-payment.f2f.extra=Zusätzliche Informationen
+payment.shared.extraInfo=Zusätzliche Informationen
-
+payment.shared.extraInfo.prompt=Gib spezielle Bedingungen, Abmachungen oder Details die bei ihren Angeboten unter diesem Zahlungskonto angezeigt werden sollen an. Nutzer werden diese Informationen vor der Annahme des Angebots sehen.
-payment.f2f.extra.prompt=Der Ersteller kann "Geschäftsbedingungen" festlegen oder öffentliche Kontaktinformationen hinterlegen. Diese werden mit dem Angebot angezeigt.
 payment.f2f.info=Persönliche 'Face to Face' Trades haben unterschiedliche Regeln und sind mit anderen Risiken verbunden als gewöhnliche Online-Trades.\n\nDie Hauptunterschiede sind:\n● Die Trading Partner müssen die Kontaktdaten und Informationen über den Ort und die Uhrzeit des Treffens austauschen.\n● Die Trading Partner müssen ihre Laptops mitbringen und die Bestätigung der "gesendeten Zahlung" und der "erhaltenen Zahlung" am Treffpunkt vornehmen.\n● Wenn ein Ersteller eines Angebots spezielle "Allgemeine Geschäftsbedingungen" hat, muss er diese im Textfeld "Zusatzinformationen" des Kontos angeben.\n● Mit der Annahme eines Angebots erklärt sich der Käufer mit den vom Anbieter angegebenen "Allgemeinen Geschäftsbedingungen" einverstanden.\n● Im Konfliktfall kann der Mediator oder Arbitrator nicht viel tun, da es in der Regel schwierig ist zu bestimmen, was beim Treffen passiert ist. In solchen Fällen können die Bitcoin auf unbestimmte Zeit oder bis zu einer Einigung der Trading Peers gesperrt werden.\n\nUm sicherzustellen, dass Sie die Besonderheiten der persönlichen 'Face to Face' Trades vollständig verstehen, lesen Sie bitte die Anweisungen und Empfehlungen unter: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Webseite öffnen
 payment.f2f.offerbook.tooltip.countryAndCity=Land und Stadt: {0} / {1}
@@ -2665,7 +2680,7 @@ payment.japan.recipient=Name
 payment.australia.payid=PayID
 payment.payid=PayIDs wie E-Mail Adressen oder Telefonnummern die mit Finanzinstitutionen verbunden sind.
 payment.payid.info=Eine PayID wie eine Telefonnummer, E-Mail Adresse oder Australische Business Number (ABN) mit der Sie sicher Ihre Bank, Kreditgenossenschaft oder Bausparkassenkonto verlinken können. Sie müssen bereits eine PayID mit Ihrer Australischen Finanzinstitution erstellt haben. Beide Institutionen, die die sendet und die die empfängt, müssen PayID unterstützen. Weitere informationen finden Sie unter [HYPERLINK:https://payid.com.au/faqs/]
-payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.amazonGiftCard.info=Um mit einer Amazon eGift Card zu bezahlen, müssen Sie eine Amazon eGift Card über Ihr Amazon-Konto an den BTC-Verkäufer senden. \n\nBisq zeigt die E-Mail-Adresse oder Telefonnummer des BTC-Verkäufers an, an die die Gift Card gesendet werden soll, und Sie müssen die Trade-ID in das Nachrichtenfeld der Gift Card eintragen. Bitte lesen Sie das Wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] für weitere Details und empfehlenswerte Vorgehensweisen. \n\nDrei wichtige Hinweise:\n- Versuchen Sie, Gift Cards mit Beträgen von 100 USD oder weniger zu versenden, da Amazon bekannt dafür ist, größere Gift Cards als betrügerisch zu kennzeichnen\n- Versuchen Sie, einen kreativen, glaubwürdigen Text für die Nachricht der Gift Card zu verwenden (z.B. "Alles Gute zum Geburtstag Susi!"), zusammen mit der Trade-ID (und verwenden Sie den Trader-Chat, um Ihrem Trading-Partner den von Ihnen gewählten Referenztext mitzuteilen, damit er Ihre Zahlung überprüfen kann)\n- Amazon eGift Cards können nur auf der Amazon-Website eingelöst werden, auf der sie gekauft wurden (z. B. kann eine auf amazon.it gekaufte Gift Card nur auf amazon.it eingelöst werden)
 
 
 # We use constants from the code so we do not use our normal naming convention
@@ -2677,6 +2692,7 @@ SAME_BANK=Überweisung mit derselben Bank
 SPECIFIC_BANKS=Überweisungen mit bestimmten Banken
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Cash Deposit
+CASH_BY_MAIL=Bargeld per Post
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Angesicht zu Angesicht (persönlich)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Cash Deposit
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=BargeldPerPost
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -34,7 +34,7 @@ shared.yes=Sí
 shared.no=No
 shared.iUnderstand=Entendido
 shared.na=No disponible
-shared.shutDown=Cerrar
+shared.shutDown=Apagar
 shared.reportBug=Reportar error de software en Github
 shared.buyBitcoin=Comprar bitcoin
 shared.sellBitcoin=Vender bitcoin
@@ -114,7 +114,6 @@ shared.waitingForFunds=Esperando fondos...
 shared.depositTransactionId=ID de transacción del depósito
 shared.TheBTCBuyer=El comprador de BTC
 shared.You=Usted
-shared.reasonForPayment=Concepto de pago
 shared.sendingConfirmation=Enviando confirmación...
 shared.sendingConfirmationAgain=Por favor envíe confirmación de nuevo
 shared.exportCSV=Exportar a csv
@@ -291,7 +290,8 @@ mainView.version.update=(Actualización disponible)
 ####################################################################
 
 market.tabs.offerBook=Libro de ofertas
-market.tabs.spread=Detalles
+market.tabs.spreadCurrency=Ofertas según moneda
+market.tabs.spreadPayment=Ofertas según método de pago
 market.tabs.trades=Intercambios
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Comprar BTC ({0})
 market.spread.numberOfSellOffersColumn=Vender BTC ({0})
 market.spread.totalAmountColumn=Total BTC ({0})
 market.spread.spreadColumn=Diferencial
+market.spread.expanded=Vista expandida
 
 # TradesChartsView
 market.trades.nrOfTrades=Intercambios: {0}
-market.trades.tooltip.volumeBar=Volumen: {0}\nNúmero de intercambios: {1}\nFecha: {2}
+market.trades.tooltip.volumeBar=Volumen: {0} / {1}\nNúmero de intercambios: {2}\nFecha: {3}
 market.trades.tooltip.candle.open=Apertura:
 market.trades.tooltip.candle.close=Cierre:
 market.trades.tooltip.candle.high=Máximo:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Mínimo:
 market.trades.tooltip.candle.average=Media:
 market.trades.tooltip.candle.median=Mediana:
 market.trades.tooltip.candle.date=Fecha:
+market.trades.showVolumeInUSD=Mostrar volumen en USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Países de sede de banco aceptados (tomador)
 offerbook.availableOffers=Ofertas disponibles
 offerbook.filterByCurrency=Filtrar por moneda
 offerbook.filterByPaymentMethod=Filtrar por método de pago
+offerbook.matchingOffers=Ofertas que concuerden con mis cuentas
 offerbook.timeSinceSigning=Información de la cuenta
 offerbook.timeSinceSigning.info=Esta cuenta fue verificada y {0}
 offerbook.timeSinceSigning.info.arbitrator=firmada por un árbitro y puede firmar cuentas de pares
@@ -442,11 +445,11 @@ createOffer.warning.buyAboveMarketPrice=Siempre pagará {0}% más que el precio
 createOffer.tradeFee.descriptionBTCOnly=Comisión de transacción
 createOffer.tradeFee.descriptionBSQEnabled=Seleccionar moneda de comisión de intercambio
 
-createOffer.triggerPrice.prompt=Set optional trigger price
+createOffer.triggerPrice.prompt=Establecer precio de ejecución opcional
-createOffer.triggerPrice.label=Deactivate offer if market price is {0}
+createOffer.triggerPrice.label=Desactivar oferta si el precio de mercado es {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=Como protección contra movimientos drásticos de precio puede establecer un precio de ejecución que desactive la oferta si el precio de mercado alcanza ese valor.
-createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
+createOffer.triggerPrice.invalid.tooLow=El valor debe ser superior a {0}
-createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
+createOffer.triggerPrice.invalid.tooHigh=El valor debe ser inferior a {0}
 
 # new entries
 createOffer.placeOfferButton=Revisar: Poner oferta para {0} bitcoin
@@ -533,9 +536,9 @@ takeOffer.tac=Al tomar esta oferta, afirmo estar de acuerdo con las condiciones
 # Offerbook / Edit offer
 ####################################################################
 
-openOffer.header.triggerPrice=Precio de activación
+openOffer.header.triggerPrice=Precio de ejecución
-openOffer.triggerPrice=Trigger price {0}
+openOffer.triggerPrice=Precio de ejecución {0}
-openOffer.triggered=The offer has been deactivated because the market price reached your trigger price.\nPlease edit the offer to define a new trigger price
+openOffer.triggered=La oferta ha sido desactivada porque el precio de mercado alcanzó su precio de disparo.\nPor favor edite la oferta para definir un nuevo precio de disparo.
 
 editOffer.setPrice=Establecer precio
 editOffer.confirmEdit=Confirmar: Editar oferta
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=La transacción del depósito aún no se ha confirm
 portfolio.pending.step1.openForDispute=La transacción de depósito aún no ha sido confirmada. Puede esperar más o contactar con el mediador para obtener asistencia.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Su intercambio ha logrado al menos una confirmación en la cadena de bloques.\n(Puede esperar más confirmaciones si lo desea - 6 confirmaciones son consideradas muy seguras.)\n
+portfolio.pending.step2.confReached=Su intercambio tiene al menos una confirmación en la cadena de bloques.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Puede copiar y pegar los valores desde la pantalla principal después de cerrar el popup).
+portfolio.pending.step2_buyer.refTextWarn=Importante: al hacer un pago, deje el campo \"motivo de pago\" vacío. NO PONGA la ID de intercambio o algún otro texto como 'bitcoin', 'BTC', o 'Bisq'. Los comerciantes pueden convenir en el chat de intercambio un \"motivo de pago\" alternativo.
-portfolio.pending.step2_buyer.refTextWarn=NO USE ninguna referencia adicional, como por ejemplo Bitcoin, BTC o Bisq, en el texto de \"concepto de pago\".
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Estos son los detalles de la cuenta del vendedor de BTC:\n
+portfolio.pending.step2_buyer.fees=Si su banco carga alguna tasa por hacer la transferencia, es responsable de pagar esas tasas.
-portfolio.pending.step2_buyer.tradeId=Por favor no olvide añadir la ID de intercambio
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=como \"concepto de pago\" de manera que el receptor pueda atribuir el pago realizado por usted en este intercambio .\n\n
-portfolio.pending.step2_buyer.fees=Si su banco cobra tasas, corren a su cuenta.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Por favor transfiera fondos desde su cartera externa {0}\n{1} al vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Por favor compre una Tarjeta Amazon
 # 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
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Por favor vaya a la página web de su banco y pague {0} al vendedor de BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Por favor envíe {0} usando \"Efectivo por Correo\" al vendedor. Las instrucciones específicas están en el contrato de intercambio, y si no queda claro, pregunte a través del chat de intercambio.\nVea más detalles acerca de Efectivo por Correo en la wiki de Bisq [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Por favor pague {0} a través del método de pago especificado al vendedor BTC. Encontrará los detalles de la cuenta del vendedor en la siguiente pantalla.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Por favor contacte al vendedor de BTC con el contacto proporcionado y acuerden un encuentro para pagar {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Comenzar pago utilizando {0}
@@ -645,7 +645,7 @@ portfolio.pending.step2_buyer.moneyGramMTCNInfo.msg=Debe enviar el número de au
 portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Enviar MTCN y recibo
 portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Necesita enviar 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, el país y la cantidad. El email del vendedor es: {0}\n\n¿Envió el MTCN y el contrato al vendedor?
 portfolio.pending.step2_buyer.halCashInfo.headline=Enviar código HalCash
-portfolio.pending.step2_buyer.halCashInfo.msg=Necesita enviar un mensaje de texto con el código HalCash así como el ID de la transacción ({0}) al vendedor de BTC.\nEl móvil del vendedor es {1}.\n\n¿Envió el código al vendedor?
+portfolio.pending.step2_buyer.halCashInfo.msg=Necesita enviar un mensaje de texto con el código HalCash\nEl móvil del vendedor es {1}.\n\n¿Envió el código al vendedor?
 portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Algunos bancos pueden verificar el nombre del receptor. Las cuentas Faster Payments creadas en antiguos clientes de Bisq no proporcionan el nombre completo del receptor, así que por favor, utilice el chat del intercambio para obtenerlo (si es necesario).
 portfolio.pending.step2_buyer.confirmStart.headline=Confirme que ha comenzado el pago.
 portfolio.pending.step2_buyer.confirmStart.msg=¿Ha iniciado el pago de {0} a su par de intercambio?
@@ -659,7 +659,7 @@ portfolio.pending.step2_seller.f2fInfo.headline=Información de contacto del com
 portfolio.pending.step2_seller.waitPayment.msg=La transacción del depósito tiene al menos una confirmación en la cadena de bloques.\nTiene que esperar hasta que el comprador de BTC comience el pago de {0}.
 portfolio.pending.step2_seller.warn=El comprador de BTC aún no ha realizado el pago de {0}.\nNecesita esperar hasta que el pago comience.\nSi el intercambio aún no se ha completado el {1} el árbitro procederá a investigar.
 portfolio.pending.step2_seller.openForDispute=El comprador de BTC no ha comenzado su pago!\nEl periodo máximo permitido ha finalizado.\nPuede esperar más y dar más tiempo a la otra parte o contactar con el mediador para abrir una disputa.
-tradeChat.chatWindowTitle=Ventana de chat para transacción con ID "{0}"
+tradeChat.chatWindowTitle=Ventana de chat para intercambio con ID "{0}"
 tradeChat.openChat=Abrir ventana de chat
 tradeChat.rules=Puede comunicarse con su par de intercambio para resolver posibles problemas con este intercambio.\nNo es obligatorio responder en el chat.\nSi un comerciante viola alguna de las reglas de abajo, abra una disputa y repórtelo al mediador o árbitro.\n\nReglas del chat:\n\t● No enviar ningún enlace (riesgo de malware). Puedes enviar el ID de la transacción y el nombre de un explorador de bloques.\n\t● ¡No enviar las palabras semilla, llaves privadas, contraseñas u otra información sensible!\n\t● No alentar a intercambiar fuera de Bisq (sin seguridad).\n\t● No se enfrente a ningún intento de estafa de ingeniería social.\n\t● Si un par no responde y prefiere no comunicarse, respete su decisión.\n\t● Limite el tema de conversación al intercambio. Este chat no es un sustituto del messenger o troll-box.\n\t● Mantenga la conversación amigable y respetuosa.
 
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=La otra parte del intercambio confirma haber
 portfolio.pending.step3_seller.altcoin.explorer=en su explorador de cadena de bloques {0} favorito
 portfolio.pending.step3_seller.altcoin.wallet=en su cartera {0}
 portfolio.pending.step3_seller.altcoin={0}Por favor compruebe {1} si la transacción a su dirección de recepción\n{2}\ntiene suficientes confirmaciones en la cadena de bloques.\nLa cantidad a pagar tiene que ser {3}\n\nPuede copiar y pegar su dirección {4} desde la pantalla principal después de cerrar este popup.
-portfolio.pending.step3_seller.postal={0}Por favor, compruebe si ha recibido {1} con \"US Postal Money Order\"desde el comprador de BTC.\n\nLa ID de intercambio (el texto \"reason for payment\") de la transacción es: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Por favor compruebe si ha recibido {1} con \"US Postal Money Order\" enviados por el comprador BTC.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Su par de intercambio ha confirmado haber iniciado el pago de {0}.\n\nPor favor, vaya a la web de su banco y compruebe si ha recibido {1} desde la cuenta del comprador de BTC.\nLa ID de intercambio (texto \"razón de pago\") de la transacción es: \"{2}\"
+portfolio.pending.step3_seller.cashByMail={0}Por favor compruebe si ha recibido {1} con \"Efectivo por Correo\" enviados por el comprador BTC.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Su par de intercambio confirma que ha iniciado el pago de {0}.\n\nPor favor vaya a la página web de su banco y compruebe si ha recibido {1} del comprador de BTC.
 portfolio.pending.step3_seller.cash=Debido a que el pago se hecho vía depósito en efectivo el comprador de BTC tiene que escribir \"SIN REEMBOLSO\" en el recibo de papel, dividirlo en 2 partes y enviarte una foto por e-mail.\n\nPara impedir el riesgo de reembolso, solo confirme si ha recibido el e-mail y si está seguro de que el recibo es válido.\nSi no está seguro, {0}
 portfolio.pending.step3_seller.moneyGram=El comprador tiene que enviarle el número de autorización y una foto del recibo por correo electrónico.\n\nEl recibo debe mostrar claramente el monto, asi como su nombre completo, país y demarcación (departamento,estado, etc.). Por favor revise su correo electrónico si recibió el número de autorización.\n\nDespués de cerrar esa ventana emergente (popup), verá el nombre y la dirección del comprador de BTC para retirar el dinero de MoneyGram.\n\n¡Solo confirme el recibo de transacción después de haber obtenido el dinero con éxito!
 portfolio.pending.step3_seller.westernUnion=El comprador tiene que enviarle el MTCN (número de seguimiento) y una foto de el recibo por email.\nEl recibo debe mostrar claramente su nombre completo, ciudad, país y la cantidad. Por favor compruebe su email si ha recibido el MTCN.\n\nDespués de cerrar ese popup verá el nombre del comprador de BTC y la dirección para recoger el dinero de Western Union.\n\nSolo confirme el recibo después de haber recogido satisfactoriamente el dinero!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=No ha confirmado la recepción del
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=¿Ha recibido el pago de {0} de su par de intercambio?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=La ID de intercambio/transacción (texto \"concepto de pago\") de la transacción es: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Por favor verifique también que el nombre del emisor especificado en el contrato de intercambio concuerda con el nombre que aparece en su declaración bancaria:\nNombre del emisor, para el contrato de intercambio: {0}\n\nSi los nombres no son exactamente los mismos, no confirme el recibo de pago. En su lugar, abra una disputa pulsando \"alt + o\" o \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Por favor tenga en cuenta, que tan pronto como haya confirmado el recibo, la cantidad de intercambio bloqueada será librerada al comprador de BTC y el depósito de seguridad será devuelto.
@@ -957,7 +957,7 @@ support.error=El receptor no pudo procesar el mensaje. Error: {0}
 support.buyerAddress=Dirección del comprador de BTC
 support.sellerAddress=Dirección del vendedor de BTC
 support.role=Rol
-support.agent=Support agent
+support.agent=Agente de soporte
 support.state=Estado
 support.closed=Cerrado
 support.open=Abierto
@@ -977,7 +977,7 @@ support.peerOpenedDispute=Su pareja de intercambio ha solicitado una disputa.\n\
 support.peerOpenedDisputeForMediation=Su par de intercambio ha solicitado mediación.\n\n{0}\n\nVersión Bisq: {1}
 support.mediatorsDisputeSummary=Mensaje de sistema: Resumen de la disputa del mediador: {0}
 support.mediatorsAddress=Dirección del nodo del mediador: {0}
-support.warning.disputesWithInvalidDonationAddress=La transacción del pago demorado utilizó una dirección de receptor inválido. No coincide con ninguno de los valores de parámetro de la DAO para las direcciones de donación válidas.\n\nEsto podría ser un intento de estafa. Informe a los desarrolladores sobre ese incidente y no cierre ese caso antes de que se resuelva la situación.\n\nDirección utilizada en la disputa: {0}\n\nTodas las direcciones de donación en los parámetros de la DAO: {1}\n\nIdentificación comercial: {2} {3}
+support.warning.disputesWithInvalidDonationAddress=La transacción de pago demorado utilizó una dirección de receptor inválida. No coincide con ninguno de los valores de parámetro de la DAO para las direcciones de donación válidas.\n\nEsto podría ser un intento de estafa. Informe a los desarrolladores sobre ese incidente y no cierre ese caso antes de que se resuelva la situación.\n\nDirección utilizada en la disputa: {0}\n\nTodas las direcciones de donación en los parámetros de la DAO: {1}\n\nIdentificación comercial: {2} {3}
 support.warning.disputesWithInvalidDonationAddress.mediator=\n\n¿Aún quiere cerrar la disputa?
 support.warning.disputesWithInvalidDonationAddress.refundAgent=\n\nUsted no debería realizar el pago.
 
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Mostrar mis propias ofertas en el libro de ofe
 setting.preferences.useAnimations=Usar animaciones
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Pares: {1}
 settings.net.ips=[Dirección IP:puerto | host:puerto | dirección onion:puerto] (separado por coma). El puerto puede ser omitido si se utiliza el predeterminado (8333).
 settings.net.seedNode=Nodo semilla
 settings.net.directPeer=Par (directo)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Par
 settings.net.inbound=entrante
 settings.net.outbound=saliente
@@ -1316,14 +1319,14 @@ account.notifications.marketAlert.addButton=Añadir alerta de oferta
 account.notifications.marketAlert.manageAlertsButton=Gestionar alertas de oferta
 account.notifications.marketAlert.manageAlerts.title=Gestionar alertas de oferta
 account.notifications.marketAlert.manageAlerts.header.paymentAccount=Cuenta de pago
-account.notifications.marketAlert.manageAlerts.header.trigger=Precio de activación
+account.notifications.marketAlert.manageAlerts.header.trigger=Precio de ejecución
 account.notifications.marketAlert.manageAlerts.header.offerType=Tipo de oferta
 account.notifications.marketAlert.message.title=Alerta de oferta
 account.notifications.marketAlert.message.msg.below=por debajo
 account.notifications.marketAlert.message.msg.above=por encima
 account.notifications.marketAlert.message.msg=Una nueva oferta "{0} {1}" con el precio {2} ({3} {4} precio de mercado) y método de pago "{5}" se publicó en el libro de ofertas de Bisq.\nID de la oferta: {6}.
 account.notifications.priceAlert.message.title=Alerta de precio para {0}
-account.notifications.priceAlert.message.msg=Su alerta de precio se activó. El precio actual de {0} es {1} {2}
+account.notifications.priceAlert.message.msg=Su alerta de precio se ejecutó. El precio actual de {0} es {1} {2}
 account.notifications.noWebCamFound.warning=No se ha encontrado una webcam.\n\nPor favor use la opción de email para enviar el token y clave de encriptación desde su teléfono móvil a la aplicación Bisq.
 account.notifications.priceAlert.warning.highPriceTooLow=El precio superior debe ser mayor que el precio inferior.
 account.notifications.priceAlert.warning.lowerPriceTooHigh=El precio inferior debe ser más bajo que el precio superior.
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Introduzca la clave privada para registrarse
 
 filterWindow.headline=Editar lista de filtro
 filterWindow.offers=Ofertas filtradas (separadas por coma)
-filterWindow.onions=Direcciones onion filtradas (separadas por coma)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Cuentas de intercambio filtradas:\nFormato: lista de [ID método de pago | campo de datos | valor] separada por coma.
 filterWindow.bannedCurrencies=Códigos de moneda filtrados (separados por coma)
 filterWindow.bannedPaymentMethods=ID's de métodos de pago filtrados (separados por coma)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Versión mínima requerida para intercambi
 filterWindow.add=Añadir filtro
 filterWindow.remove=Eliminar filtro
 filterWindow.btcFeeReceiverAddresses=Direcciones de recepción de la tasa BTC
+filterWindow.disableApi=Deshabilitar API
 
 offerDetailsWindow.minBtcAmount=Cantidad mínima BTC
 offerDetailsWindow.min=(mínimo {0})
@@ -2181,7 +2186,13 @@ tradeDetailsWindow.tradingPeersOnion=Dirección onion de par de intercambio
 tradeDetailsWindow.tradingPeersPubKeyHash=Hash de las llaves públicas de pares de intercambio
 tradeDetailsWindow.tradeState=Estado del intercambio
 tradeDetailsWindow.agentAddresses=Árbitro/Mediador
-tradeDetailsWindow.detailData=Detallar datos
+tradeDetailsWindow.detailData=Detalle de datos
+
+txDetailsWindow.headline=Detalles de transacción
+txDetailsWindow.btc.note=Ha enviado BTC
+txDetailsWindow.bsq.note=Ha enviado fondos BSQ. BSQ son bitcoin coloreados, con lo que la transacción no se mostrará en el explorador BSQ hasta que sea confirmada en un bloque BTC.
+txDetailsWindow.sentTo=Enviado a
+txDetailsWindow.txId=TxId
 
 walletPasswordWindow.headline=Introducir contraseña para desbloquear
 
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Cerrando aplicación...
 popup.shutDownInProgress.msg=Cerrar la aplicación puede llevar unos segundos.\nPor favor no interrumpa el proceso.
 
 popup.attention.forTradeWithId=Se requiere atención para el intercambio con ID {0}
+popup.attention.reasonForPaymentRuleChange=La versión 1.5.5 introduce un cambio crítico en las reglas de intercambio acerca del campo \"motivo de pago\" de las transferencias bancarias. Por favor deje este campo vacío -- NO USE NUNCA Más la ID de intercambio como \"motivo de pago\".
 
 popup.info.multiplePaymentAccounts.headline=Múltiples cuentas de pago disponibles
 popup.info.multiplePaymentAccounts.msg=Tiene múltiples cuentes de pago disponibles para esta oferta. Por favor, asegúrese de que ha elegido la correcta.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Actualizar cuenta Revolut
 
 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.
+
+payment.cashByMail.contact=Información de contacto
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Información de contacto
 payment.f2f.contact.prompt=Cómo le gustaría ser contactado por el par de intercambio? (dirección email, número de teléfono...)
 payment.f2f.city=Ciudad para la reunión 'cara a cara'
 payment.f2f.city.prompt=La ciudad se mostrará con la oferta
-payment.f2f.optionalExtra=Información adicional opcional
+payment.shared.optionalExtra=Información adicional opcional
-payment.f2f.extra=Información adicional
+payment.shared.extraInfo=Información adicional
-
+payment.shared.extraInfo.prompt=Defina cualquier término especial, condiciones o detalles que quiera mostrar junto a sus ofertas para esta cuenta de pago (otros usuarios podrán ver esta información antes de aceptar las ofertas).
-payment.f2f.extra.prompt=El creador puede definir los 'términos y condiciones' o añadir información de contacto pública. Será mostrada junto con la oferta.
 payment.f2f.info=Los intercambios 'Cara a Cara' tienen diferentes reglas y riesgos que las transacciones en línea.\n\nLas principales diferencias son:\n● Los pares de intercambio necesitan intercambiar información acerca del punto de reunión y la hora usando los detalles de contacto proporcionados.\n● Los pares de intercambio tienen que traer sus portátiles y hacer la confirmación de 'pago enviado' y 'pago recibido' en el lugar de reunión.\n● Si un creador tiene 'términos y condiciones' especiales necesita declararlos en el campo de texto 'información adicional' en la cuenta.\n● Tomando una oferta el tomador está de acuerdo con los 'términos y condiciones' declarados por el creador.\n● En caso de disputa el árbitro no puede ayudar mucho ya que normalmente es complicado obtener evidencias no manipulables de lo que ha pasado en una reunión. En estos casos los fondos BTC pueden bloquearse indefinidamente o hasta que los pares lleguen a un acuerdo.\n\nPara asegurarse de que comprende las diferencias con los intercambios 'Cara a Cara' por favor lea las instrucciones y recomendaciones en: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Abrir paǵina web
 payment.f2f.offerbook.tooltip.countryAndCity=País y ciudad: {0} / {1}
@@ -2665,7 +2680,7 @@ payment.japan.recipient=Nombre
 payment.australia.payid=PayID
 payment.payid=PayID conectado a una institución financiera. Como la dirección email o el número de móvil.
 payment.payid.info=Un PayID como un número de teléfono, dirección email o Australian Business Number (ABN), que puede conectar con seguridad a su banco, unión de crédito o cuenta de construcción de sociedad. Necesita haber creado una PayID con su institución financiera australiana. Tanto para enviar y recibir las instituciones financieras deben soportar PayID. Para más información por favor compruebe [HYPERLINK:https://payid.com.au/faqs/]
-payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.amazonGiftCard.info=Para pagar con Tarjeta eGift Amazon. necesitará enviar una Tarjeta eGift Amazon al vendedor BTC a través de su cuenta Amazon.\n\nBisq mostrará la dirección e-mail del vendedor de BTC o el número de teléfono donde la tarjeta de regalo deberá enviarse. Por favor vea la wiki  [HYPERLINK:https://bisq.wiki/Amazon_eGift_card]  para más detalles y mejores prácticas.\n\nNotas importantes:\n- Pruebe a enviar las tarjetas regalo en cantidades de 100USD o menores, ya que Amazon está señalando tarjetas regalo mayores como fraudulentas.\n- Intente usar textos para el mensaje de la tarjeta regalo creíbles y creativos ("Feliz cumpleaños!").\n- Las tarjetas Amazon eGift pueden ser redimidas únicamente en la web de Amazon en la que se compraron (por ejemplo, una tarjeta comprada en amazon.it solo puede ser redimida en amazon.it)
 
 
 # We use constants from the code so we do not use our normal naming convention
@@ -2677,6 +2692,7 @@ SAME_BANK=Transferir con el mismo banco
 SPECIFIC_BANKS=Transferencias con bancos específicos
 US_POSTAL_MONEY_ORDER=Giro postal US Postal
 CASH_DEPOSIT=Depósito en efectivo
+CASH_BY_MAIL=Efectivo por Correo
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Cara a cara (en persona)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=Giro postal US
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito en efectivo
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=EfectivoPorCorreo
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=در انتظار دریافت وجه...
 shared.depositTransactionId=شناسه تراکنش وجه دریافتی
 shared.TheBTCBuyer=خریدار بیتکوین
 shared.You=شما
-shared.reasonForPayment=دلیل پرداخت
 shared.sendingConfirmation=در حال ارسال تاییدیه...
 shared.sendingConfirmationAgain=لطفاً تاییدیه را دوباره ارسال نمایید
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(به روز رسانی موجود است)
 ####################################################################
 
 market.tabs.offerBook=دفتر پیشنهادها
-market.tabs.spread=جزئیات
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=معاملات
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=خرید بیتکوین ({0})
 market.spread.numberOfSellOffersColumn=فروش بیتکوین ({0})
 market.spread.totalAmountColumn=مجموع بیتکوین ({0})
 market.spread.spreadColumn=تفاوت نرخ
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=معاملات: {0}
-market.trades.tooltip.volumeBar=حجم: {0}\nتعداد معاملات: {1} \nتاریخ: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=باز:
 market.trades.tooltip.candle.close=بسته:
 market.trades.tooltip.candle.high=بالا:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=پایین:
 market.trades.tooltip.candle.average=میانگین:
 market.trades.tooltip.candle.median=Median:
 market.trades.tooltip.candle.date=تاریخ:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=بانک‌های کشورهای پذیرف
 offerbook.availableOffers=پیشنهادهای موجود
 offerbook.filterByCurrency=فیلتر بر اساس ارز
 offerbook.filterByPaymentMethod=فیلتر بر اساس روش پرداخت
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=انتخاب ارز برای کارم
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=The deposit transaction is still not confirmed. Thi
 portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. You can wait longer or contact the mediator for assistance.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=معامله شما، حداقل یک تأییدیه بلاکچین دریافت کرده است.\n(اگر بخواهید، می توانید برای تأییدیه‌های بیشتر صبر کنید - حداقل 6 تأییدیه، عدد بسیار امنی به شمار می‌آید.)\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(شما می توانید مقادیر را پس از بستن پنجره، از صفحه اصلی کپی پیست کنید.)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=از هرگونه پیام اضافی مانند بیتکوین، BTC یا Bisq در متن \"دلیل پرداخت\" هرگز استفاده نکنید.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=در اینجا، جزئیات حساب معامله ی فروشنده‌ی بیتکوین ارائه شده است:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=لطفاً فراموش نکنید که شناسه معامله را اضافه نمایید
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=بنابراین با \"دلیل پرداخت\"، گیرنده می‌تواند پرداخت شما را به این معامله اختصاص دهد.\n\n
-portfolio.pending.step2_buyer.fees=اگر بانک شما هزینه هایی را متحمل می‌کند، باید آن هزینه‌ها را پوشش دهید.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=لطفاً از کیف پول {0} خارجی شما انتقال دهید.\n{1} به فروشنده بیتکوین\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=لطفاً {0} را توسط \"US Postal Money Order\" به فروشنده‌ی بیتکوین پرداخت کنید.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=لطفاً به صفحه‌ی وبسایت بانکداری آنلاین خود رفته و {0} را فروشنده‌ی بیتکوین پرداخت کنید.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=لطفا با استفاده از راه‌های ارتباطی ارائه شده توسط فروشنده با وی تماس بگیرید و قرار ملاقاتی را برای پرداخت {0} تنظیم کنید.\n
 portfolio.pending.step2_buyer.startPaymentUsing=آغاز پرداخت با استفاده از {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=شریک معاملاتی شما تأیید
 portfolio.pending.step3_seller.altcoin.explorer=در کاوشگر بلاکچین محبوبتان {0}
 portfolio.pending.step3_seller.altcoin.wallet=در کیف‌پول {0} شما
 portfolio.pending.step3_seller.altcoin={0} لطفا بررسی کنید {1} که آیا تراکنش مربوط به آدرس شما\n{2}\n تعداد تاییدیه‌های کافی بر روی بلاکچین دریافت کرده است یا خیر.\nمبلغ پرداخت باید {3} باشد\nشما می‌توانید آدرس {4} خود را پس از بستن پنجره از صفحه اصلی کپی کنید.
-portfolio.pending.step3_seller.postal={0}لطفاً بررسی کنید که آیا {1} را با \"US Postal Money Order\" از خریدار بیتکوین دریافت کرده‌اید یا خیر.\n\nشناسه معامله (متن \"دلیل پرداخت\") تراکنش: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=شریک معاملاتی شما تأیید کرده که پرداخت {0} را آغاز نموده است.\n\nلطفاً به صفحه وبسایت بانکداری آنلاین خود رفته و بررسی کنید که آیا {1} را از خریدار BTC دریافته کرده‌اید یا خیر.\n\nشناسه معامله (متن \"دلیل پرداخت\") تراکنش: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=چون پرداخت از طریق سپرده‌ی نقدی انجام شده است، خریدار BTC باید عبارت \"غیر قابل استرداد\" را روی رسید کاغذی بنویسد، آن را به 2 قسمت پاره کند و از طریق ایمیل به شما یک عکس ارسال کند.\n\nبه منظور اجتناب از استرداد وجه، تنها در صورتی تایید کنید که ایمیل را دریافت کرده باشید و از صحت رسید کاغذی مطمئن باشید.\nاگر مطمئن نیستید، {0}
 portfolio.pending.step3_seller.moneyGram=خریدار باید شماره مجوز و عکسی از رسید را به ایمیل شما ارسال کند.\nرسید باید به طور واضح نام کامل شما ، کشور، ایالت فروشنده و مقدار را نشان دهد. لطفاً ایمیل خود را بررسی کنید که آیا شماره مجوز را دریافت کرده‌اید یا خیر.\n\nپس از بستن پنجره، نام و آدرس خریدار بیتکوین را برای برداشت پول از مانی‌گرام خواهید دید.\n\nتنها پس از برداشت موفقیت آمیز پول، رسید را تأیید کنید!
 portfolio.pending.step3_seller.westernUnion=خریدار باید MTCN (شماره پیگیری) و عکسی از رسید را به ایمیل شما ارسال کند.\nرسید باید به طور واضح نام کامل شما، کشور، ایالت فروشنده و مقدار را نشان دهد. لطفاً ایمیل خود را بررسی کنید که آیا MTCN را دریافت کرده اید یا خیر.\nپس از بستن پنجره، نام و آدرس خریدار بیتکوین را برای برداشت پول از Western Union خواهید دید.\nتنها پس از برداشت موفقیت آمیز پول، رسید را تأیید کنید!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=آیا وجه {0} را از شریک معاملاتی خود دریافت کرده‌اید؟\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=شناسه معامله (متن \"دلیل پرداخت\") تراکنش: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the name of the sender specified on the trade contract matches the name that appears on your bank statement:\nSender''s name, per trade contract: {0}\n\nIf the names are not exactly the same, don''t confirm payment receipt. Instead, open a dispute by pressing \"alt + o\" or \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Please note, that as soon you have confirmed the receipt, the locked trade amount will be released to the BTC buyer and the security deposit will be refunded.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=نمایش پیشنهادهای من در دف
 setting.preferences.useAnimations=استفاده از انیمیشن‌ها
 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.resetAllFlags=تنظیم مجدد تمام پرچم‌های \"دوباره نشان نده\"
 settings.preferences.languageChange=اعمال تغییر زبان به تمام صفحات مستلزم یک راه‌اندازی مجدد است.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[آدرس آی پی: پورت | نام میزبان: پورت | آدرس Onion : پورت] (جدا شده با ویرگول). اگر از پیش فرض (8333) استفاده می شود، پورت می تواند حذف شود.
 settings.net.seedNode=گره ی اصلی
 settings.net.directPeer=همتا (مستقیم)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=همتا
 settings.net.inbound=وارد شونده
 settings.net.outbound=خارج شونده
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Enter private key for registration
 
 filterWindow.headline=ویرایش لیست فیلتر
 filterWindow.offers=پیشنهادهای فیلتر شده (جدا شده با ویرگول)
-filterWindow.onions=آدرس های Onion فیلتر شده (جدا شده با ویرگول)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=داده های حساب معاملاتی فیلترشده:\nفرمت: لیست جدا شده با ویرگول [شناسه روش پرداخت، زمینه داده، ارزش]
 filterWindow.bannedCurrencies=کدهای ارز فیلترشده (جدا شده با ویرگول)
 filterWindow.bannedPaymentMethods=شناسه‌های روش پرداخت فیلتر شده (جدا شده با ویرگول)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Min. version required for trading
 filterWindow.add=افزودن فیلتر
 filterWindow.remove=حذف فیلتر
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=حداقل مقدار BTC
 offerDetailsWindow.min=(حداقل {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=وضعیت معامله
 tradeDetailsWindow.agentAddresses=Arbitrator/Mediator
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=وارد کردن رمز عبور به منظور باز کردن
 
 torNetworkSettingWindow.header=تنظیمات شبکه Tor 
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=خاموش شدن در حال انجام اس
 popup.shutDownInProgress.msg=خاتمه دادن به برنامه می تواند چند ثانیه طول بکشد.\n لطفا این روند را قطع نکنید.
 
 popup.attention.forTradeWithId=توجه الزامی برای معامله با شناسه {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available
 popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=اطلاعات تماس
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=اطلاعات تماس
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=شهر جهت ملاقات 'رو در رو'
 payment.f2f.city.prompt=نام شهر به همراه پیشنهاد نمایش داده خواهد شد
-payment.f2f.optionalExtra=اطلاعات اضافی اختیاری
+payment.shared.optionalExtra=اطلاعات اضافی اختیاری
-payment.f2f.extra=اطلاعات اضافی
+payment.shared.extraInfo=اطلاعات اضافی
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=سفارش‌گذار می‌تواند متن 'شرایط و الزامات' را تعیین کند و یا اطلاعات تماس عمومی را تنظیم کند. این اطلاعات به همراه پیشنهاد نمایش داده خواهد شد.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=باز کردن صفحه وب
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=انتقال با همان بانک
 SPECIFIC_BANKS=نقل و انتقالات با بانک های مشخص
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=سپرده ی نقدی
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=مانی گرام
 WESTERN_UNION=Western Union
 F2F=رو در رو (به طور فیزیکی)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=سپرده ی نقدی
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=مانی گرام
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=En attente des fonds...
 shared.depositTransactionId=ID de la transaction de dépôt
 shared.TheBTCBuyer=L'acheteur de BTC
 shared.You=Vous
-shared.reasonForPayment=Motif du paiement
 shared.sendingConfirmation=Envoi de la confirmation...
 shared.sendingConfirmationAgain=Veuillez envoyer de nouveau la confirmation
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Mise à jour disponible)
 ####################################################################
 
 market.tabs.offerBook=Livre des ordres
-market.tabs.spread=Détails
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Échanges
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Achat BTC ({0})
 market.spread.numberOfSellOffersColumn=Vente BTC ({0})
 market.spread.totalAmountColumn=Total BTC ({0})
 market.spread.spreadColumn=Écart
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Échanges: {0}
-market.trades.tooltip.volumeBar=Volume: {0}\nNombre d''échanges: {1}\nDate: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Ouvrir:
 market.trades.tooltip.candle.close=Fermer:
 market.trades.tooltip.candle.high=Haut:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Bas:
 market.trades.tooltip.candle.average=Moyenne:
 market.trades.tooltip.candle.median=Médiane:
 market.trades.tooltip.candle.date=Date:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Pays acceptés où se situe le siège de la
 offerbook.availableOffers=Ordres disponibles
 offerbook.filterByCurrency=Filtrer par devise
 offerbook.filterByPaymentMethod=Filtrer par mode de paiement
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Ce compte a été vérifié et {0}
 offerbook.timeSinceSigning.info.arbitrator=signé par un arbitre et pouvant signer des comptes pairs
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Choisir la devise des frais de transa
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=La transaction de dépôt n'est toujours pas confir
 portfolio.pending.step1.openForDispute=La transaction de dépôt n'est toujours pas confirmée. Vous pouvez attendre plus longtemps ou contacter le médiateur pour obtenir de l'aide.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Votre échange a été confirmé au moins une fois par la blockchain.\n(Vous pouvez attendre davantage pour obtenir plus de confirmations - 6 confirmations sont considérés comme très sures.)\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Vous pouvez copier-coller les valeurs à partir de l'écran principal après la fermeture de ce popup.)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=NE PAS utiliser de commentaire supplémentaire dans le texte \"motif du paiement\" comme bitcoin, BTC ou Bisq.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Voici les détails du compte du vendeur de BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=N'oubliez pas d'ajouter le trade ID
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=Comme \"motif de paiement\" afin que le destinataire puisse attribuer votre paiement à cette transaction.\n\n
-portfolio.pending.step2_buyer.fees=Si votre banque vous facture des frais, vous devez les couvrir.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Veuillez transférer à partir de votre portefeuille externe {0}.\n{1} au vendeur de BTC.\n\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Merci d''envoyer {0} par \"US Postal Money Order\" au vendeur de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Merci de vous rendre sur le site de votre banque en ligne et payer {0} au vendeur de BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Veuillez s''il vous plaît contacter le vendeur de BTC via le contact fourni, et planifiez un rendez-vous pour effectuer le paiement {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Initier le paiement en utilisant {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Votre partenaire de trading a confirmé qu''
 portfolio.pending.step3_seller.altcoin.explorer=Sur votre explorateur blockchain {0} favori
 portfolio.pending.step3_seller.altcoin.wallet=Dans votre portefeuille {0}
 portfolio.pending.step3_seller.altcoin={0}Veuillez s''il vous plaît vérifier {1} que la transaction vers votre adresse de réception\n{2}\ndispose de suffisamment de confirmations sur la blockchain.\nLe montant du paiement doit être {3}\n\nVous pouvez copier & coller votre adresse {4} à partir de l''écran principal après avoir fermé ce popup.
-portfolio.pending.step3_seller.postal={0}Veuillez s''il vous plaît vérifier si vous avez reçu {1} avec \"US Postal Money Order\" de la part de l''acheteur de BTC.\n\nL''ID de la transaction (\"reason for payment\" text) de la transaction est: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Votre partenaire de trading a confirmé qu''il a initié le paiement {0}.\n\nVeuillez vous rendre sur le site internet de votre banque afin de vérifier si vous avez bien reçu les documents suivants {1} de la part de votre acheteur de BTC.\n\nLe trade ID (\"reason for payment\" text) de la transaction est: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Du fait que le paiement est réalisé via Cash Deposit l''acheteur de BTC doit inscrire \"NO REFUND\" sur le reçu papier, le déchirer en 2 et vous envoyer une photo par email.\n\nPour éviter un risque de rétrofacturation, ne confirmez que si vous recevez le mail et que vous êtes sûr que le reçu papier est valide.\nSi vous n''êtes pas sûr, {0}
 portfolio.pending.step3_seller.moneyGram=L'acheteur doit vous envoyer le numéro d'autorisation et une photo du reçu par e-mail .\nLe reçu doit faire clairement figurer votre nom complet, votre pays, l'état et le montant. Veuillez s'il vous plaît vérifier que vous avez bien reçu par e-mail le numéro d'autorisation.\n\nAprès avoir fermé ce popup vous verrez le nom de l'acheteur de BTC et l'adresse où retirer l'argent depuis MoneyGram.\n\nN'accusez réception qu'après avoir retiré l'argent avec succès!
 portfolio.pending.step3_seller.westernUnion=L'acheteur doit vous envoyer le MTCN (numéro de suivi) et une photo du reçu par e-mail .\nLe reçu doit faire clairement figurer votre nom complet, votre pays, l'état et le montant. Veuillez s'il vous plaît vérifier si vous avez reçu par e-mail le MTCN.\n\nAprès avoir fermé ce popup vous verrez le nom de l'acheteur de BTC et l'adresse où retirer l'argent depuis Western Union.\n\nN'accusez réception qu'après avoir retiré l'argent avec succès!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=Vous n'avez pas confirmé la réce
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Avez-vous reçu le paiement {0} de votre partenaire de trading?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=Le trade ID (\"reason for payment\" text) de la transaction est: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Veuillez également vérifier que le nom de l''expéditeur indiqué sur le contrat de l''échange correspond au nom qui apparaît sur votre relevé bancaire:\nNom de l''expéditeur, avec le contrat de l''échange: {0}\n\nSi les noms ne sont pas exactement identiques, ne confirmez pas la réception du paiement. Au lieu de cela, ouvrez un litige en appuyant sur \"alt + o\" ou \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Veuillez noter que dès que vous aurez confirmé la réception, le montant verrouillé pour l'échange sera remis à l'acheteur de BTC et le dépôt de garantie vous sera remboursé.\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Montrer mes ordres dans le livre des ordres
 setting.preferences.useAnimations=Utiliser des animations
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[IP address:port | host name:port | onion address:port] (séparés par des virgules). Le port peut être ignoré si utilisé par défaut (8333).
 settings.net.seedNode=Seed node
 settings.net.directPeer=Pair (direct)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Pair
 settings.net.inbound=inbound
 settings.net.outbound=outbound
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Entrer la clé privée pour l'enregistrement
 
 filterWindow.headline=Modifier la liste de filtres
 filterWindow.offers=Ordres filtrés (séparer avec une virgule)
-filterWindow.onions=Adresses onion filtrées (virgule de sep.)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Données filtrées du compte de trading:\nFormat: séparer par une virgule liste des [ID du mode de paiement | champ de données | valeur].
 filterWindow.bannedCurrencies=Codes des devises filtrées (séparer avec une virgule.)
 filterWindow.bannedPaymentMethods=IDs des modes de paiements filtrés (séparer avec une virgule.)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Version min. nécessaire pour pouvoir éch
 filterWindow.add=Ajouter le filtre
 filterWindow.remove=Retirer le filtre
 filterWindow.btcFeeReceiverAddresses=Adresse de réception des frais Bitcoin
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Montant BTC min.
 offerDetailsWindow.min=(min. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=État du trade
 tradeDetailsWindow.agentAddresses=Arbitre/Médiateur
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Entrer le mot de passe pour déverouiller
 
 torNetworkSettingWindow.header=Paramètres du réseau Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Fermeture en cours
 popup.shutDownInProgress.msg=La fermeture de l'application nécessite quelques secondes.\nVeuillez ne pas interrompre ce processus.
 
 popup.attention.forTradeWithId=Attention requise la transaction avec l''ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Comptes de paiement multiples disponibles
 popup.info.multiplePaymentAccounts.msg=Vous disposez de plusieurs comptes de paiement disponibles pour cet ordre. Assurez-vous de choisir le bon.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=information de contact
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=information de contact
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Ville pour la rencontre en face à face
 payment.f2f.city.prompt=La ville sera affichée en même temps que l'ordre
-payment.f2f.optionalExtra=Informations complémentaires facultatives
+payment.shared.optionalExtra=Informations complémentaires facultatives
-payment.f2f.extra=Informations complémentaires
+payment.shared.extraInfo=Informations complémentaires
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=Le maker peut définir des " conditions générales " ou ajouter des informations publiques de contact.  Elles seront affichées avec l'ordre.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Ouvrir la page web
 payment.f2f.offerbook.tooltip.countryAndCity=Pays et ville: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Transfert avec la même banque
 SPECIFIC_BANKS=Transferts avec des banques spécifiques
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Dépôt en espèces
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face à face (en personne)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Dépôt en espèces
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=In attesa dei fondi...
 shared.depositTransactionId=ID transazione di deposito
 shared.TheBTCBuyer=L'acquirente di BTC
 shared.You=Tu
-shared.reasonForPayment=Causale del pagamento
 shared.sendingConfirmation=Invio della conferma in corso...
 shared.sendingConfirmationAgain=Invia nuovamente la conferma
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Aggiornamento disponibile)
 ####################################################################
 
 market.tabs.offerBook=Registro offerte
-market.tabs.spread=Dettagli
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Scambi
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Acquista BTC ({0})
 market.spread.numberOfSellOffersColumn=Vendi BTC ({0})
 market.spread.totalAmountColumn=Totale BTC ({0})
 market.spread.spreadColumn=Spread
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Scambi: {0}
-market.trades.tooltip.volumeBar=Volume: {0}\nN. di scambi: {1}\nData: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Aperti:
 market.trades.tooltip.candle.close=Chiusi:
 market.trades.tooltip.candle.high=Alto:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Basso:
 market.trades.tooltip.candle.average=Media:
 market.trades.tooltip.candle.median=Mediana:
 market.trades.tooltip.candle.date=Data:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Sede accettata dei paesi bancari (acquirente
 offerbook.availableOffers=Offerte disponibili
 offerbook.filterByCurrency=Filtra per valuta
 offerbook.filterByPaymentMethod=Filtra per metodo di pagamento
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Questo account è stato verificato e {0}
 offerbook.timeSinceSigning.info.arbitrator=firmato da un arbitro e può firmare account peer
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Seleziona la valuta della commissione
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=La transazione di deposito non è ancora confermata
 portfolio.pending.step1.openForDispute=La transazione di deposito non è ancora confermata. Puoi attendere più a lungo o contattare il mediatore per ricevere assistenza.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Il tuo scambio ha raggiunto almeno una conferma sulla blockchain.\n(Se lo desideri, puoi attendere altre conferme - 6 conferme sono considerate molto sicure.) \n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Puoi copiare & incollare i valori dalla schermata principale dopo aver chiuso quel popup.)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=NON utilizzare alcun avviso aggiuntivo nel testo \"motivo del pagamento\" come ad esempio bitcoin, BTC o Bisq.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Ecco i dettagli dell'account commerciale del venditore BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=Non dimenticare di aggiungere l'ID dello scambio
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=come \"motivo per il pagamento\" in modo che il destinatario possa assegnare il pagamento a questo scambio.\n\n
-portfolio.pending.step2_buyer.fees=Se la tua banca applica commissioni bancarie, è necessario che tu copra tali commissioni.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Trasferisci dal tuo portafoglio esterno {0}\n{1} al venditore BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Invia {0} tramite \"Vaglia Postale Statunitense\" al venditore BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Accedi al tuo online banking e paga {0} al venditore BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Contatta il venditore BTC tramite il contatto fornito e organizza un incontro per pagare {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Inizia il pagamento utilizzando {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Il tuo partner commerciale ha confermato di
 portfolio.pending.step3_seller.altcoin.explorer=sul tuo {0} blockchain explorer preferito
 portfolio.pending.step3_seller.altcoin.wallet=sul tuo portafoglio {0}
 portfolio.pending.step3_seller.altcoin={0}Controlla {1} se la transazione è indirizzata correttamente al tuo indirizzo di ricezione\n{2}\nha già sufficienti conferme sulla blockchain.\nL'importo del pagamento deve essere {3}\n\nPuoi copiare e incollare il tuo indirizzo {4} dalla schermata principale dopo aver chiuso questo popup.
-portfolio.pending.step3_seller.postal={0}Verifica di aver ricevuto {1} con \"Vaglia Postale Statunitense\" dall'acquirente BTC.\n\nL'ID di scambio (\"motivo per il pagamento\" testo) della transazione è: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Il tuo partner di scambio ha confermato di aver avviato il pagamento {0}.\n\nVai al sito web del tuo online banking e controlla di aver ricevuto {1} dall'acquirente BTC.\n\nL'ID di scambio (\"motivo per il pagamento\" testo) della transazione è: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Poiché il pagamento viene effettuato tramite deposito in contanti, l'acquirente BTC deve scrivere \"NESSUN RIMBORSO\" sulla ricevuta cartacea, strapparlo in 2 parti e inviarti una foto via e-mail.\n\nPer evitare il rischio di storno, conferma solamente se hai ricevuto l'e-mail e se sei sicuro che la ricevuta cartacea sia valida.\nSe non sei sicuro, {0}
 portfolio.pending.step3_seller.moneyGram=L'acquirente deve inviarti il numero di autorizzazione e una foto della ricevuta via e-mail.\nLa ricevuta deve mostrare chiaramente il tuo nome completo, il paese, lo stato e l'importo. Controlla nella tua e-mail se hai ricevuto il numero di autorizzazione.\n\nDopo aver chiuso il popup, vedrai il nome e l'indirizzo dell'acquirente BTC per effettuare il ritiro dell'importo da MoneyGram.\n\nConferma la ricevuta solo dopo aver ricevuto con successo i soldi!
 portfolio.pending.step3_seller.westernUnion=L'acquirente deve inviarti l'MTCN (numero di tracciamento) e una foto della ricevuta via e-mail.\nLa ricevuta deve mostrare chiaramente il tuo nome completo, la città, il paese e l'importo. Controlla nella tua e-mail se hai ricevuto l'MTCN.\n\nDopo aver chiuso il popup, vedrai il nome e l'indirizzo dell'acquirente BTC per effettuare il ritiro dell'importo da Western Union.\n\nConferma la ricevuta solo dopo aver ricevuto con successo i soldi!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=Non hai confermato la ricevuta del
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Hai ricevuto il pagamento {0} dal tuo partner commerciale?\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=L'ID di scambio (\"motivo per il pagamento\" testo) della transazione è: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Verifica inoltre che il nome del mittente specificato nel contratto di scambio corrisponda al nome che appare sul tuo estratto conto bancario:\nNome del mittente, per contratto di scambio: {0}\n\nSe i nomi non sono uguali, non confermare la ricevuta del pagamento. Apri invece una disputa premendo \"alt + o\" oppure \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Tieni presente che non appena avrai confermato la ricevuta, l'importo commerciale bloccato verrà rilasciato all'acquirente BTC e il deposito cauzionale verrà rimborsato.
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Mostra le mie offerte nel libro delle offerte
 setting.preferences.useAnimations=Usa animazioni
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[Indirizzo IP:porta | hostname:porta | indirizzo onion:porta] (separato da una virgola). La porta può essere omessa se è usata quella predefinita (8333).
 settings.net.seedNode=Nodo seme
 settings.net.directPeer=Peer (diretto)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Peer
 settings.net.inbound=in entrata
 settings.net.outbound=in uscita
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Immettere la chiave privata per la registrazione
 
 filterWindow.headline=Modifica elenco filtri
 filterWindow.offers=Offerte filtrate (separate con una virgola)
-filterWindow.onions=Indirizzi di onion filtrati (separati con una virgola)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Dati dell'account di trading filtrati:\nFormato: virgola sep. elenco di [ID metodo di pagamento | campo dati | valore]
 filterWindow.bannedCurrencies=Codici valuta filtrati (separati con una virgola)
 filterWindow.bannedPaymentMethods=ID dei metodi di pagamento filtrati (separati con una virgola)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Versione minima richiesta per il trading
 filterWindow.add=Aggiungi filtro
 filterWindow.remove=Rimuovi filtro
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Importo BTC minimo
 offerDetailsWindow.min=(min. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Stato di scambio
 tradeDetailsWindow.agentAddresses=Arbitro/Mediatore
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Inserisci la password per sbloccare
 
 torNetworkSettingWindow.header=Impostazioni rete Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Arresto in corso
 popup.shutDownInProgress.msg=La chiusura dell'applicazione può richiedere un paio di secondi.\nNon interrompere il processo.
 
 popup.attention.forTradeWithId=Attenzione richiesta per gli scambi con ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Disponibili più conti di pagamento
 popup.info.multiplePaymentAccounts.msg=Hai più account di pagamento disponibili per questa offerta. Assicurati di aver scelto quello giusto.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=Informazioni di contatto
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informazioni di contatto
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Città per l'incontro 'Faccia a faccia'
 payment.f2f.city.prompt=La città verrà visualizzata con l'offerta
-payment.f2f.optionalExtra=Ulteriori informazioni opzionali
+payment.shared.optionalExtra=Ulteriori informazioni opzionali
-payment.f2f.extra=Informazioni aggiuntive
+payment.shared.extraInfo=Informazioni aggiuntive
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=Il maker può definire "termini e condizioni" o aggiungere informazioni di contatto pubbliche. Verrà visualizzato con l'offerta.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Apri sito web
 payment.f2f.offerbook.tooltip.countryAndCity=Paese e città: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Trasferimento con la stessa banca
 SPECIFIC_BANKS=Trasferimenti con banche specifiche
 US_POSTAL_MONEY_ORDER=Vaglia Postale USA
 CASH_DEPOSIT=Deposito contanti
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Faccia a faccia (di persona)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Deposito contanti
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -71,7 +71,7 @@ shared.amountWithCur={0}の金額
 shared.volumeWithCur={0}取引高
 shared.currency=通貨
 shared.market=相場
-shared.deviation=Deviation
+shared.deviation=偏差
 shared.paymentMethod=支払い方法
 shared.tradeCurrency=取引通貨
 shared.offerType=オファーの種類
@@ -114,7 +114,6 @@ shared.waitingForFunds=資金を待っています
 shared.depositTransactionId=入金トランザクションID
 shared.TheBTCBuyer=BTC買い手
 shared.You=あなた
-shared.reasonForPayment=支払いの理由
 shared.sendingConfirmation=承認を送信中
 shared.sendingConfirmationAgain=もう一度承認を送信してください
 shared.exportCSV=CSVにエクスポート
@@ -218,8 +217,8 @@ shared.refundAgentForSupportStaff=仲裁者
 shared.delayedPayoutTxId=遅延支払いトランザクションID
 shared.delayedPayoutTxReceiverAddress=遅延支払いトランザクション送り先
 shared.unconfirmedTransactionsLimitReached=現在、非確認されたトランザクションが多すぎます。しばらく待ってからもう一度試して下さい。
-shared.numItemsLabel=Number of entries: {0}
+shared.numItemsLabel=記載事項の数: {0}
-shared.filter=Filter
+shared.filter=フィルター
 shared.enabled=有効されました
 
 
@@ -251,14 +250,14 @@ mainView.balance.locked=トレードにロック中
 mainView.balance.reserved.short=予約済
 mainView.balance.locked.short=ロック中
 
-mainView.footer.usingTor=(via Tor)
+mainView.footer.usingTor=(Tor経由で)
 mainView.footer.localhostBitcoinNode=（ローカルホスト）
 mainView.footer.btcInfo={0} {1}
-mainView.footer.btcFeeRate=/ Fee rate: {0} sat/vB
+mainView.footer.btcFeeRate=/ 手数料率: {0} サトシ/vB
 mainView.footer.btcInfo.initializing=ビットコインネットワークに接続中
 mainView.footer.bsqInfo.synchronizing=/ DAOと同期中
-mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / {2}
+mainView.footer.btcInfo.synchronizingWith={0}と同期中、ブロック: {1} / {2}
-mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1}
+mainView.footer.btcInfo.synchronizedWith={0}と同期されています、ブロック{1}に
 mainView.footer.btcInfo.connectingTo=接続中:
 mainView.footer.btcInfo.connectionFailed=接続失敗
 mainView.footer.p2pInfo=ビットコインネットワークピア: {0} / Bisqネットワークピア: {1}
@@ -291,7 +290,8 @@ mainView.version.update=(更新が利用可能)
 ####################################################################
 
 market.tabs.offerBook=オファーブック
-market.tabs.spread=詳細
+market.tabs.spreadCurrency=通貨別のオファー
+market.tabs.spreadPayment=支払い方法別のオファー
 market.tabs.trades=取引
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=BTCを買う ({0})
 market.spread.numberOfSellOffersColumn=BTCを売る ({0})
 market.spread.totalAmountColumn=BTC合計 ({0})
 market.spread.spreadColumn=スプレッド
+market.spread.expanded=拡張された表示
 
 # TradesChartsView
 market.trades.nrOfTrades=取引: {0}
-market.trades.tooltip.volumeBar=取引量: {0}\n取引数: {1}\n日付: {2}
+market.trades.tooltip.volumeBar=取引量: {0} / {1}\n取引数: {2}\n日付: {3}
 market.trades.tooltip.candle.open=オープン:
 market.trades.tooltip.candle.close=クローズ:
 market.trades.tooltip.candle.high=最高:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=最低:
 market.trades.tooltip.candle.average=平均:
 market.trades.tooltip.candle.median=中央値:
 market.trades.tooltip.candle.date=日付:
+market.trades.showVolumeInUSD=米ドル建ての貿易量を表示
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=利用可能な銀行の国名（テイカ
 offerbook.availableOffers=利用可能なオファー
 offerbook.filterByCurrency=通貨でフィルター
 offerbook.filterByPaymentMethod=支払い方法でフィルター
+offerbook.matchingOffers=アカウントと一致するオファー
 offerbook.timeSinceSigning=アカウント情報
 offerbook.timeSinceSigning.info=このアカウントは認証されまして、{0}
 offerbook.timeSinceSigning.info.arbitrator=調停人に署名されました。ピアアカウントも署名できます
@@ -442,11 +445,11 @@ createOffer.warning.buyAboveMarketPrice=オファーの価格は継続的に更
 createOffer.tradeFee.descriptionBTCOnly=取引手数料
 createOffer.tradeFee.descriptionBSQEnabled=トレード手数料通貨を選択
 
-createOffer.triggerPrice.prompt=Set optional trigger price
+createOffer.triggerPrice.prompt=任意選択価格トリガーを設定する
-createOffer.triggerPrice.label=Deactivate offer if market price is {0}
+createOffer.triggerPrice.label=市場価格が{0}になる場合、オファーを無効にする
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=価格の著しい変化から保護するため、市場価格が特定の価値に達する時にオファーは無効される価格トリガーを設定できます。
-createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
+createOffer.triggerPrice.invalid.tooLow=価値は{0}より高くなければなりません
-createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
+createOffer.triggerPrice.invalid.tooHigh=価値は{0}より低くなければなりません
 
 # new entries
 createOffer.placeOfferButton=再確認: ビットコインを{0}オファーを出す
@@ -534,8 +537,8 @@ takeOffer.tac=このオファーを受けることで、この画面で定義さ
 ####################################################################
 
 openOffer.header.triggerPrice=価格トリガー
-openOffer.triggerPrice=Trigger price {0}
+openOffer.triggerPrice=価格トリガー{0}
-openOffer.triggered=The offer has been deactivated because the market price reached your trigger price.\nPlease edit the offer to define a new trigger price
+openOffer.triggered=市場価格は価格トリガーに達しましたため、オファーが無効にされました。\nオファーには新しい価格トリガーを設定して下さい。
 
 editOffer.setPrice=価格設定
 editOffer.confirmEdit=承認: オファーを編集
@@ -554,7 +557,7 @@ portfolio.tab.history=履歴
 portfolio.tab.failed=失敗
 portfolio.tab.editOpenOffer=オファーを編集
 
-portfolio.closedTrades.deviation.help=Percentage price deviation from market
+portfolio.closedTrades.deviation.help=市場からの割合価格偏差
 
 portfolio.pending.invalidDelayedPayoutTx=欠測あるいは無効なトランザクションに関する問題があります。\n\nこの法定通貨・アルトコイン支払いの送信しないで下さい！サポートを受けるのに、Keybase [HYPERLINK:https://keybase.io/team/bisq] あるいは掲示板 [HYPERLINK:https://bisq.community] でBisqの開発者と連絡して下さい。\n\nエラーメッセージ： {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=デポジットトランザクションがまだ承
 portfolio.pending.step1.openForDispute=デポジットトランザクションがまだ承認されていません。もう少し待つか、助けを求めて調停人に連絡できます。
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=あなたの取引は少なくとも1つのブロックチェーン承認に達しました。\n（必要に応じてさらに承認を待つことができます - 6回の承認が非常に安全であると考えられます。）\n\n
+portfolio.pending.step2.confReached=トレードは少なくとも1つのブロックチェーン承認に達しました。\n\n
 
-portfolio.pending.step2_buyer.copyPaste=（ポップアップを閉じた後にメイン画面から値をコピーして貼り付けることができます。）
+portfolio.pending.step2_buyer.refTextWarn=注意点：支払う時に、\"支払理由\"のフィールドを空白にしておいて下さい。いかなる場合でも、トレードIDそれとも「ビットコイン」、「BTC」、「Bisq」などを入力しないで下さい。両者にとって許容できる別の\"支払理由\"があれば、自由に取引者チャットで話し合いをして下さい。
-portfolio.pending.step2_buyer.refTextWarn=「支払理由」の追加の通知では、bitcoin、BTC、Bisqのようなテキストを使用しないでください。
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=こちらがBTCの売り手のトレードアカウント詳細です:\n
+portfolio.pending.step2_buyer.fees=銀行口座振替を行うには手数料がある場合、その手数料を払う責任があります。
-portfolio.pending.step2_buyer.tradeId=トレードIDの追加を忘れないで下さい
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=「支払理由」で、受取人はあなたの支払いをこのトレードに割り当てることができます。\n\n
-portfolio.pending.step2_buyer.fees=銀行が手数料を請求する場合は、それらの手数料を支払う必要があります。
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=外部{0}ウォレットから転送してください\nBTCの売り手へ{1}。\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard={0}のためのeGiftカードをア
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal={0}を「米国の郵便為替」でBTCの売り手に送付してください。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=オンラインバンキングのWebページにアクセスして、BTCの売り手へ{0}をお支払いください。\n\n
+portfolio.pending.step2_buyer.cashByMail=\"郵送で現金\"で、{0}をBTC売り手に送って下さい。詳細な指示はトレード契約書に書いてあります、そして分からない点があれば取引者チャットで質問できます。「郵送で現金」について詳しくはBisqのWikiを参照：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=特定された支払い方法で{0}をBTCの売り手に支払ってお願いします。売り手のアカウント詳細は次の画面に表示されます。\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=提供された連絡先でBTCの売り手に連絡し、{0}を支払うためのミーティングを準備してください。\n\n
 portfolio.pending.step2_buyer.startPaymentUsing={0}を使用して支払いを開始
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=あなたのトレード相手は、彼ら
 portfolio.pending.step3_seller.altcoin.explorer=あなたの好きな{0}ブロックチェーンエクスプローラで
 portfolio.pending.step3_seller.altcoin.wallet=あなたの{0}ウォレットで
 portfolio.pending.step3_seller.altcoin={0}あなたの受け取りアドレスへのトランザクションが{1}かどうかを確認してください\n{2}\nはすでに十分なブロックチェーンの承認があります。\n支払い額は{3}です\n\nポップアップを閉じた後、メイン画面から{4}アドレスをコピーして貼り付けることができます。
-portfolio.pending.step3_seller.postal={0} BTCの買い手から「米国の郵便為替」で{1}を受け取ったかどうかを確認してください。\n\nこのトランザクションのトレードID（「支払い理由」のテキスト）は: \ "{2} \"
+portfolio.pending.step3_seller.postal={0}\"米国の郵便為替\"でBTCの買い手から{1}を受け取ったか確認して下さい。
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=あなたの取引相手は、彼らが{0}の支払いを開始したことを確認しました。\n\nオンラインバンキングのWebページにアクセスして、BTCの買い手から{1}を受け取ったかどうかを確認してください。\n\nこのトランザクションのトレードID（「支払い理由」のテキスト）は: \ "{2} \"\n\n
+portfolio.pending.step3_seller.cashByMail={0}\"郵送で現金\"でBTCの買い手から{1}を受け取ったか確認して下さい。
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=トレード相手は{0}の支払いを開始した確認をしました。\n\nオンラインバンキングのWebページにアクセスして、BTCの買い手から{1}を受け取ったか確認してください。
 portfolio.pending.step3_seller.cash=支払いは現金入金で行われるので、BTCの買い手は領収書に「返金無し(NO REFUND)」と記入し、2部に分けて写真を電子メールで送ってください。\n\nチャージバックのリスクを回避するために、Eメールを受信したかどうか、および領収書が有効であることが確実であるかどうかを確認してください。\nよくわからない場合は、{0}
 portfolio.pending.step3_seller.moneyGram=買い手は承認番号と領収書の写真を電子メールで送信する必要があります。\n領収書には、氏名、国、州、および金額を明確に記載する必要があります。 認証番号を受け取った場合は、メールを確認してください。\n\nそのポップアップを閉じた後、あなたはMoneyGramからお金を得るためのBTC買い手の名前と住所を見られるでしょう。\n\nあなたが正常にお金を得た後にのみ領収書を承認してください！
 portfolio.pending.step3_seller.westernUnion=買い手はMTCN（追跡番号）と領収書の写真をEメールで送信する必要があります。\n領収書には、氏名、市区町村、国、金額が明確に記載されている必要があります。 MTCNを受け取った場合は、メールを確認してください。\n\nそのポップアップを閉じた後、あなたはWestern Unionからお金を得るためのBTC買い手の名前と住所を見られるでしょう。\n\nあなたが正常にお金を得た後にのみ領収書を承認してください！
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=支払いの受領を承認して
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=あなたの取引相手から{0}の支払いを受けましたか？\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=このトランザクションのトレードID（「支払理由」のテキスト）は \"{0} \"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=また、銀行取引明細書に記載されている送付者の名前が、トレード契約書のものと一致していることも確認してください:\nトレード契約書とおり、送信者の名前: {0}\n\n送付者の名前がここに表示されているものと異なる場合は、支払いの受領を承認しないで下さい。「alt + o」または「option + o」を入力して係争を開始して下さい。\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=領収書の確認が済むとすぐに、ロックされたトレード金額がBTCの買い手に解放され、保証金が返金されます。\n\n
@@ -957,7 +957,7 @@ support.error=受信者がメッセージを処理できませんでした。エ
 support.buyerAddress=BTC買い手のアドレス
 support.sellerAddress=BTC売り手のアドレス
 support.role=役割
-support.agent=Support agent
+support.agent=サポート代理人
 support.state=状態
 support.closed=クローズ
 support.open=オープン
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=オファーブックに自分のオファー
 setting.preferences.useAnimations=アニメーションを使用
 setting.preferences.useDarkMode=ダークモードを利用
 setting.preferences.sortWithNumOffers=市場リストをオファー/トレードの数で並び替える
+setting.preferences.onlyShowPaymentMethodsFromAccount=サポートされていない支払い方法を非表示にする
+setting.preferences.denyApiTaker=APIを使用するテイカーを拒否する
 setting.preferences.resetAllFlags=「次回から表示しない」フラグを全てリセット
 settings.preferences.languageChange=言語の変更をすべての画面に適用するには再起動が必要です。
 settings.preferences.supportLanguageWarning=係争が発生した場合、調停は{0}で、仲裁は{1}で処理されることに注意して下さい。
@@ -1086,12 +1088,13 @@ settings.net.chainHeight=Bisq: {0} | ピア: {1}
 settings.net.ips=[IPアドレス:ポート | ホスト名:ポート | onionアドレス:ポート]（コンマ区切り）。デフォルト(8333)が使用される場合、ポートは省略できます。
 settings.net.seedNode=シードノード
 settings.net.directPeer=ピア (ダイレクト)
+settings.net.initialDataExchange={0} [ ブートストラップ 中]
 settings.net.peer=ピア
 settings.net.inbound=インバウンド
 settings.net.outbound=アウトバウンド
 settings.net.reSyncSPVChainLabel=SPVチェーンを再同期
 settings.net.reSyncSPVChainButton=SPVファイルを削除してを再同期
-settings.net.reSyncSPVSuccess=Are you sure you want to do an SPV resync?  If you proceed, the SPV chain file will be deleted on the next startup.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nDepending on the number of transactions and the age of your wallet the resync can take up to a few hours and consumes 100% of CPU. Do not interrupt the process otherwise you have to repeat it.
+settings.net.reSyncSPVSuccess=SPVの再同期を実行してもよろしいですか？実行すると、SPVチェーンファイルは次回の起動時に削除されます。\n\n再起動後、ネットワークとの再同期に時間がかかることがあり、再同期が完了するとすべてのトランザクションのみが表示されます。\n\nトランザクションの数そしてウォレットの時代によって、再同期は数時間かかり、CPUのリソースを100%消費します。再同期プロセスを割り込みしないで下さい。さもなければやり直す必要があります。
 settings.net.reSyncSPVAfterRestart=SPVチェーンファイルが削除されました。しばらくお待ちください。ネットワークとの再同期には時間がかかる場合があります。
 settings.net.reSyncSPVAfterRestartCompleted=再同期が完了しました。アプリケーションを再起動してください。
 settings.net.reSyncSPVFailed=SPVチェーンファイルを削除できませんでした。\nエラー: {0}
@@ -1178,18 +1181,18 @@ account.menu.paymentAccount=各国通貨口座
 account.menu.altCoinsAccountView=アルトコインアカウント
 account.menu.password=ウォレットのパスワード
 account.menu.seedWords=ウォレットシード
-account.menu.walletInfo=Wallet info
+account.menu.walletInfo=ウォレット情報
 account.menu.backup=バックアップ
 account.menu.notifications=通知
 
-account.menu.walletInfo.balance.headLine=Wallet balances
+account.menu.walletInfo.balance.headLine=ウォレット残高
-account.menu.walletInfo.balance.info=This shows the internal wallet balance including unconfirmed transactions.\nFor BTC, the internal wallet balance shown below should match the sum of the 'Available' and 'Reserved' balances shown in the top right of this window.
+account.menu.walletInfo.balance.info=非確認されたトランザクションも含めて、内部ウォレット残高を表示します。\nBTCの場合、下に表示される「内部ウォレット残高」はこのウィンドウの右上に表示される「利用可能」と「予約済」の和に等しいはずです。
-account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys)
+account.menu.walletInfo.xpub.headLine=ウォッチキー（xpubキー）
-account.menu.walletInfo.walletSelector={0} {1} wallet
+account.menu.walletInfo.walletSelector={0} {1} ウォレット
-account.menu.walletInfo.path.headLine=HD keychain paths
+account.menu.walletInfo.path.headLine=HDキーチェーンのパス
-account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.
+account.menu.walletInfo.path.info=他のウォレット（例えばElectrum）にシードワードをインポートすると、パスを設定しなければなりません。 Bisqウォレットとデータディレクトリーをアクセスできないような緊急事態の場合のみにして下さい。\nBisqでないウォレットからその資金を遣うと、ウォレットデータと繋がっているBisq内部データ構造は破損される可能性があり、失敗トレードにつながる可能性があります。\n\n絶対にBisqでないウォレットからBSQを遣わないで下さい。無効なトランザクションになる可能性が高い、そしてBSQを失うことになるでしょう。
 
-account.menu.walletInfo.openDetails=Show raw wallet details and private keys
+account.menu.walletInfo.openDetails=生ウォレット詳細、秘密鍵を表示する
 
 ## TODO should we rename the following to a gereric name?
 account.arbitratorRegistration.pubKey=パブリックキー
@@ -1823,7 +1826,7 @@ dao.wallet.send.setDestinationAddress=あなたの出金先アドレスを記入
 dao.wallet.send.send=BSQ残高の送信
 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?
+dao.wallet.send.sendFunds.details=送金中: {0}\n入金先アドレス: {1}\n必要なマイニング手数料: {2} ({3} サトシ/vbyte)\nトランザクションvサイズ: {4} vKb\n\n入金先の受け取る金額: {5}\n\n本当にこの金額を出金しますか？
 dao.wallet.chainHeightSynced=最新検証済みブロック: {0}
 dao.wallet.chainHeightSyncing=ブロック待機中... {1}のうち{0}ブロックを検証済み
 dao.wallet.tx.type=タイプ
@@ -2027,7 +2030,7 @@ disputeSummaryWindow.openDate=チケットオープン日
 disputeSummaryWindow.role=取引者の役割
 disputeSummaryWindow.payout=トレード金額の支払い
 disputeSummaryWindow.payout.getsTradeAmount=BTC {0}はトレード金額の支払いを受け取ります
-disputeSummaryWindow.payout.getsAll=Max. payout to BTC {0}
+disputeSummaryWindow.payout.getsAll=BTCへの最高額支払い {0}
 disputeSummaryWindow.payout.custom=任意の支払い
 disputeSummaryWindow.payoutAmount.buyer=買い手の支払額
 disputeSummaryWindow.payoutAmount.seller=売り手の支払額
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=登録のためにプライベートキーを入力
 
 filterWindow.headline=フィルターリストを編集
 filterWindow.offers=フィルター済オファー（コンマ区切り）
-filterWindow.onions=フィルター済onionアドレス（コンマ区切り）
+filterWindow.onions=トレードアドレスから追放された（コンマ区切り）
+filterWindow.bannedFromNetwork=ネットワークアドレスから追放された（コンマ区切り）
 filterWindow.accounts=フィルター済トレードアカウントデータ:\n形式: コンマ区切りのリスト [支払方法id | データフィールド | 値]
 filterWindow.bannedCurrencies=フィルター済通貨コード（コンマ区切り）
 filterWindow.bannedPaymentMethods=フィルター済支払方法ID（コンマ区切り）
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=トレードに必要な最低バージョ
 filterWindow.add=フィルターを追加
 filterWindow.remove=フィルターを削除
 filterWindow.btcFeeReceiverAddresses=BTC手数料受信アドレス
+filterWindow.disableApi=APIを無効化
 
 offerDetailsWindow.minBtcAmount=最小のBTC金額
 offerDetailsWindow.min=（最小 {0}）
@@ -2181,7 +2186,13 @@ tradeDetailsWindow.tradingPeersOnion=トレード相手のonionアドレス
 tradeDetailsWindow.tradingPeersPubKeyHash=トレードピアのパブリックキーハッシュ
 tradeDetailsWindow.tradeState=トレード状態
 tradeDetailsWindow.agentAddresses=仲裁者 / 調停人
-tradeDetailsWindow.detailData=Detail data
+tradeDetailsWindow.detailData=詳細データ
+
+txDetailsWindow.headline=トランザクション詳細
+txDetailsWindow.btc.note=BTCを送金しました。
+txDetailsWindow.bsq.note=BSQ残高を送信しました。 BSQはカラードビットコインなので、ビットコインのブロックで承認されるまでトランザクションはBSQエクスプローラに表示されません。
+txDetailsWindow.sentTo=送信先
+txDetailsWindow.txId=TxId
 
 walletPasswordWindow.headline=アンロックするためにパスワードを入力してください
 
@@ -2256,7 +2267,7 @@ popup.warning.noMediatorsAvailable=利用可能な調停人がいません。
 popup.warning.notFullyConnected=ネットワークへ完全に接続するまで待つ必要があります。\n起動までに約2分かかります。
 popup.warning.notSufficientConnectionsToBtcNetwork=少なくとも{0}のビットコインネットワークへの接続が確立されるまでお待ちください。
 popup.warning.downloadNotComplete=欠落しているビットコインブロックのダウンロードが完了するまで待つ必要があります。
-popup.warning.chainNotSynced=The Bisq wallet blockchain height is not synced correctly.  If you recently started the application, please wait until one Bitcoin block has been published.\n\nYou can check the blockchain height in Settings/Network Info.  If more than one block passes and this problem persists it may be stalled, in which case you should do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]
+popup.warning.chainNotSynced=Bisqウォレットのブロックチェーン高さは正しく同期されていません。アプリを最近起動した場合、1つのビットコインブロックが発行されるまで待って下さい。\n\nブロックチェーン高さは\"設定/ネットワーク情報\"に表示されます。 2つ以上のブロックが発行されても問題が解決されない場合、フリーズしている可能性があります。その場合には、SPV再同期を行って下さい [HYPERLINK: https://bisq.wiki/Resyncing_SPV_file ]。
 popup.warning.removeOffer=本当にオファーを削除しますか？\nオファーを削除する場合、{0}のメイカー手数料が失われます。
 popup.warning.tooLargePercentageValue=100%以上のパーセントを設定できません
 popup.warning.examplePercentageValue=パーセントの数字を入力してください。5.4%は「5.4」のように入力します。
@@ -2285,7 +2296,7 @@ popup.warning.openOffer.makerFeeTxRejected=ID{0}で識別されるオファー
 
 popup.warning.trade.txRejected.tradeFee=トレード手数料
 popup.warning.trade.txRejected.deposit=デポジット
-popup.warning.trade.txRejected=The {0} transaction for trade with ID {1} was rejected by the Bitcoin network.\nTransaction ID={2}\nThe trade has been moved to failed trades.\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.
+popup.warning.trade.txRejected=ID{1}で識別されるトレードのための{0}トランザクションがビットコインネットワークに拒否されました。\nトランザクションID= {2} \nトレードは「失敗トレード」へ送られました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。
 
 popup.warning.openOfferWithInvalidMakerFeeTx=ID{0}で識別されるオファーのためのメイカー手数料トランザクションが無効とされました。\nトランザクションID= {1} 。\n更なる問題を避けるため、そのオファーは削除されました。\n\"設定/ネットワーク情報\"を開いてSPV再同期を行って下さい。\nさらにサポートを受けるため、Bisq Keybaseチームのサポートチャンネルに連絡して下さい。
 
@@ -2295,20 +2306,21 @@ popup.info.cashDepositInfo=あなたの地域の銀行支店が現金デポジ
 popup.info.cashDepositInfo.confirm=デポジットを作成できるか確認します
 popup.info.shutDownWithOpenOffers=Bisqはシャットダウン中ですが、オファーはあります。\n\nこれらのオファーは、Bisqがシャットダウンされている間はP2Pネットワークでは利用できませんが、次回Bisqを起動したときにP2Pネットワークに再公開されます。\n\nオファーをオンラインに保つには、Bisqを実行したままにして、このコンピュータもオンラインにしたままにします（つまり、スタンバイモードにならないようにしてください。モニタースタンバイは問題ありません）。
 popup.info.qubesOSSetupInfo=Qubes OS内でBisqを実行しているようです。\n\nBisqのqubeはセットアップガイドに従って設定されていることを確かめて下さい: [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]
-popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version.
+popup.warn.downGradePrevention=バージョン{0}からバージョン{1}に戻すことはサポートされていません。最新のBisqバージョンを利用して下さい。
-popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO state. You have to restart the application to fix the issue.
+popup.warn.daoRequiresRestart=DAO状態の同期中に問題が発生しました。解決するにはアプリを再起動する必要があります。
 
 popup.privateNotification.headline=重要なプライベート通知！
 
 popup.securityRecommendation.headline=重要なセキュリティ勧告
 popup.securityRecommendation.msg=ウォレットのパスワード保護をまだ有効にしてない場合は、使用することを検討してください。\n\nウォレットシードワードを書き留めることも強くお勧めします。 これらのシードワードは、あなたのビットコインウォレットを復元するためのマスターパスワードのようなものです。\n「ウォレットシード」セクションにてより詳細な情報を確認できます。\n\nまた、「バックアップ」セクションのアプリケーションデータフォルダ全体をバックアップするべきでしょう。
 
-popup.bitcoinLocalhostNode.msg=Bisq detected a Bitcoin Core node running on this machine (at localhost).\n\nPlease ensure:\n- the node is fully synced before starting Bisq\n- pruning is disabled ('prune=0' in bitcoin.conf)\n- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf)
+popup.bitcoinLocalhostNode.msg=Bisqはローカルで動作するビットコインコアノード（ローカルホストに）を検出しました。\n\n以下の点を確認して下さい：\n- Bisqを起動する前にノードは完全に同期されていること\n- プルーニングモードは無効にされること（bitcoin.confに'prune=0'）\n- ブルームフィルターは有効にされること（bitcoin.confに'peerbloomfilters=1'）
 
 popup.shutDownInProgress.headline=シャットダウン中
 popup.shutDownInProgress.msg=アプリケーションのシャットダウンには数秒かかることがあります。\nこのプロセスを中断しないでください。
 
 popup.attention.forTradeWithId=ID {0}とのトレードには注意が必要です
+popup.attention.reasonForPaymentRuleChange=バージョン1.5.5から、銀行振込の\"支払理由\"フィールドに関するトレードルールに非常に重要な変更があります。このフィールドを必ず空白にしておいて下さい -- いかなる場合でも、トレードIDを\"支払理由\"に入力しないで下さい。
 
 popup.info.multiplePaymentAccounts.headline=複数の支払いアカウントが使用可能です
 popup.info.multiplePaymentAccounts.msg=このオファーに使用できる支払いアカウントが複数あります。あなたが正しいものを選んだことを確認してください。
@@ -2335,7 +2347,7 @@ popup.accountSigning.signedByPeer=支払いアカウントの1つはトレード
 popup.accountSigning.peerLimitLifted=支払いアカウントの1つにおいて初期の制限は解除されました。\n\n{0}
 popup.accountSigning.peerSigner=支払いアカウントの1つは十分に熟成されて、初期の制限は解除されました。\n\n{0}
 
-popup.accountSigning.singleAccountSelect.headline=Import unsigned account age witness
+popup.accountSigning.singleAccountSelect.headline=署名されないアカウント年齢witnessをインポート
 popup.accountSigning.confirmSingleAccount.headline=選択されたアカウント年齢witnessを確認
 popup.accountSigning.confirmSingleAccount.selectedHash=選択されたwitnessのハッシュ
 popup.accountSigning.confirmSingleAccount.button=アカウント年齢witnessを署名
@@ -2476,8 +2488,8 @@ navigation.dao.wallet.receive=「DAO/BSQウォレット/受取」
 
 formatter.formatVolumeLabel={0} 額{1}
 formatter.makerTaker=メイカーは{0} {1} / テイカーは{2} {3}
-formatter.youAreAsMaker=You are: {1} {0} (maker) / Taker is: {3} {2}
+formatter.youAreAsMaker=あなたは:{1} {0}(メイカー) / テイカーは:{3} {2}
-formatter.youAreAsTaker=You are: {1} {0} (taker) / Maker is: {3} {2}
+formatter.youAreAsTaker=あなたは:{1} {0}(テイカー) / メイカーは{3} {2}
 formatter.youAre=あなたは{0} {1} ({2} {3})
 formatter.youAreCreatingAnOffer.fiat=あなたはオファーを{0} {1}に作成中です
 formatter.youAreCreatingAnOffer.altcoin=あなたはオファーを{0} {1} ({2} {3})に作成中です
@@ -2590,7 +2602,7 @@ payment.venmo.venmoUserName=Venmo ユーザー名
 payment.popmoney.accountId=メールか電話番号
 payment.promptPay.promptPayId=市民ID/納税者番号または電話番号
 payment.supportedCurrencies=サポートされている通貨
-payment.supportedCurrenciesForReceiver=Currencies for receiving funds
+payment.supportedCurrenciesForReceiver=資金を受け取るための通貨
 payment.limitations=制限事項
 payment.salt=アカウント年齢を検証するためのソルト
 payment.error.noHexSalt=ソルトはHEXフォーマットである必要があります。\nアカウントの年齢を維持するために古いアカウントからソルトを送金したい場合は、ソルトフィールドを編集することをお勧めします。 アカウントの年齢は、アカウントソルトおよび識別口座データ（例えば、IBAN）を使用することによって検証されます。
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Revolutアカウントをアップデ
 
 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を利用してトレードしないで下さい。
+
+payment.cashByMail.contact=連絡情報
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=連絡情報
 payment.f2f.contact.prompt=トレードピアからどのように連絡を受け取りたいのでしょうか？（メールアドレス、電話番号…）
 payment.f2f.city=「対面」で会うための市区町村
 payment.f2f.city.prompt=オファーとともに市区町村が表示されます
-payment.f2f.optionalExtra=オプションの追加情報
+payment.shared.optionalExtra=オプションの追加情報
-payment.f2f.extra=追加情報
+payment.shared.extraInfo=追加情報
-
+payment.shared.extraInfo.prompt=この支払いアカウントのオファーと一緒に表示したい特別な契約条件または詳細を定義して下さい（オファーを受ける前に、ユーザはこの情報を見れます）。
-payment.f2f.extra.prompt=メイカーは「取引条件」を定めたり、公開連絡先情報を追加したりできます。 これはオファーと一緒に表示されます。
 payment.f2f.info=「対面」トレードには違うルールがあり、オンライントレードとは異なるリスクを伴います。\n\n主な違いは以下の通りです。\n●取引者は、提供される連絡先の詳細を使用して、出会う場所と時間に関する情報を交換する必要があります。\n●取引者は自分のノートパソコンを持ってきて、集合場所で「送金」と「入金」の確認をする必要があります。\n●メイカーに特別な「取引条件」がある場合は、アカウントの「追加情報」テキストフィールドにその旨を記載する必要があります。\n●オファーを受けると、テイカーはメイカーの「トレード条件」に同意したものとします。\n●係争が発生した場合、集合場所で何が起きたのかについての改ざん防止証明を入手することは通常困難であるため、調停者や調停人はあまりサポートをできません。このような場合、BTCの資金は無期限に、または取引者が合意に達するまでロックされる可能性があります。\n\n「対面」トレードでの違いを完全に理解しているか確認するためには、次のURLにある手順と推奨事項をお読みください：[HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Webページを開く
 payment.f2f.offerbook.tooltip.countryAndCity=国と都市: {0} / {1}
@@ -2665,7 +2680,7 @@ payment.japan.recipient=名義
 payment.australia.payid=PayID
 payment.payid=金融機関と繋がっているPayID。例えばEメールアドレスそれとも携帯電話番号。
 payment.payid.info=銀行、信用金庫、あるいは住宅金融組合アカウントと安全に繋がれるPayIDとして使われる電話番号、Eメールアドレス、それともオーストラリア企業番号（ABN）。すでにオーストラリアの金融機関とPayIDを作った必要があります。送金と受取の金融機関は両方PayIDをサポートする必要があります。詳しくは以下を訪れて下さい [HYPERLINK:https://payid.com.au/faqs/]
-payment.amazonGiftCard.info=To pay with Amazon eGift Card, you will need to send an Amazon eGift Card to the BTC seller via your Amazon account. \n\nBisq will show the BTC seller''s email address or phone number where the gift card should be sent, and you must include the trade ID in the gift card''s message field. Please see the wiki [HYPERLINK:https://bisq.wiki/Amazon_eGift_card] for further details and best practices. \n\nThree important notes:\n- try to send gift cards with amounts of 100 USD or smaller, as Amazon is known to flag larger gift cards as fraudulent\n- try to use creative, believable text for the gift card''s message (e.g., "Happy birthday Susan!") along with the trade ID (and use trader chat to tell your trading peer the reference text you picked so they can verify your payment)\n- Amazon eGift Cards can only be redeemed on the Amazon website they were purchased on (e.g., a gift card purchased on amazon.it can only be redeemed on amazon.it)
+payment.amazonGiftCard.info=アマゾンeGiftカードで支払うには、アマゾンアカウントを使ってeGiftカードをBTC売り手に送る必要があります。\n\nBisqはeGiftカードの送り先になるBTC売り手のメールアドレスそれとも電話番号を表示します。そしてeGiftカードのメッセージフィールドに、必ずトレードIDを入力して下さい。最良の慣行について詳しくはWikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Amazon_eGift_card]\n\n3つの注意点：\n- 可能であれば、100米ドル価格以下のeGiftカードを送って下さい。それ以上の価格はアマゾンに不正な取引というフラグが立てられることがあります。\n- eGiftカードのメッセージフィールドに、トレードIDと一緒に信ぴょう性のあるメッセージを入力して下さい。（例えば隆さん、「お誕生日おめでとう！」）。（そして確認のため、取引者チャットでトレードピアにメッセージの内容を伝えて下さい）。\n- アマゾンeGiftカードは買われたサイトのみに交換できます（例えば、amazon.jpから買われたカードはamazon.jpのみに交換できます）。
 
 
 # We use constants from the code so we do not use our normal naming convention
@@ -2677,6 +2692,7 @@ SAME_BANK=同じ銀行での送金
 SPECIFIC_BANKS=特定銀行での送金
 US_POSTAL_MONEY_ORDER=米国郵便為替
 CASH_DEPOSIT=現金入金
+CASH_BY_MAIL=郵送で現金
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=対面（直接）
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=米国為替
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=現金入金
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=郵送で現金
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Aguardando pagamento...
 shared.depositTransactionId=ID da Transação de depósito
 shared.TheBTCBuyer=O comprador de BTC
 shared.You=Você
-shared.reasonForPayment=Motivo do pagamento
 shared.sendingConfirmation=Enviando confirmação...
 shared.sendingConfirmationAgain=Por favor, envie a confirmação novamente
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Atualização disponível)
 ####################################################################
 
 market.tabs.offerBook=Livro de ofertas
-market.tabs.spread=Detalhes
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Negociações
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Comprar BTC ({0})
 market.spread.numberOfSellOffersColumn=Vender BTC ({0})
 market.spread.totalAmountColumn=Total de BTC ({0})
 market.spread.spreadColumn=Spread
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Negociações: {0}
-market.trades.tooltip.volumeBar=Volume: {0}\nNúmero de transações: {1}\nData: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Abrir:
 market.trades.tooltip.candle.close=Fechar:
 market.trades.tooltip.candle.high=Alta:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Baixa:
 market.trades.tooltip.candle.average=Média:
 market.trades.tooltip.candle.median=Mediana:
 market.trades.tooltip.candle.date=Data:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Países aceitos como sede bancária (tomador
 offerbook.availableOffers=Ofertas disponíveis
 offerbook.filterByCurrency=Filtrar por moeda
 offerbook.filterByPaymentMethod=Filtrar por método de pagamento
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Esta conta foi verificada e {0}
 offerbook.timeSinceSigning.info.arbitrator=assinada por um árbitro e pode assinar contas de pares
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Escolha a moeda da taxa de transaçã
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=A transação do depósito ainda não foi confirmad
 portfolio.pending.step1.openForDispute=A transação de depósito ainda não foi confirmada. Você pode aguardar um pouco mais ou entrar em contato com o mediador para pedir assistência.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Sua negociação já tem ao menos uma confirmação na blockchain.\n(Você pode aguardar mais confirmações se quiser - 6 confirmações são consideradas como muito seguro.)\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Você pode copiar e colar os valores da janela principal após fechar esse popup)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=NÃO escreva nenhum texto ou aviso adicional no campo \"razão do pagamento\" (não escreva nada como bitcoin, BTC ou Bisq).
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Aqui estão os detalhes da conta do vendedor de BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=Não se esqueça de adicionar o ID da negociação
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=como \"razão do pagamento\" para que o recebedor possa associar seu pagamento à esta negociação.\n\n
-portfolio.pending.step2_buyer.fees=Caso seu banco cobre taxas você terá que cobrir estas taxas.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Transfira com a sua carteira {0} externa\n{1} para o vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Envie {0} através de \"US Postal Money Order\" para o vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Por favor, acesse sua conta bancária online e pague {0} ao vendedor de BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Por favor, entre em contato com o vendedor de BTC através do contato fornecido e combine um encontro para pagá-lo {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Iniciar pagamento usando {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Seu parceiro de negociação confirmou que i
 portfolio.pending.step3_seller.altcoin.explorer=no seu explorador da blockchain {0} preferido
 portfolio.pending.step3_seller.altcoin.wallet=em sua carteira {0}
 portfolio.pending.step3_seller.altcoin={0}Verifique em {1} se a transação para o seu endereço de recebimento\n{2}\njá tem confirmações suficientes na blockchain.\nA quantia do pagamento deve ser {3}\n\nVocê pode copiar e colar seu endereço {4} na janela principal, após fechar esse popup.
-portfolio.pending.step3_seller.postal={0}Por gentileza verifique se recebeu {1} como \"US Postal Money Order\" do comprador de BTC.\n\nO ID de negociação (texto \"razão do pagamento\") da transação é: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Seu parceiro de negociação confirmou que iniciou o pagamento de {0}.\n\nAcesse sua conta bancária online e verifique se você recebeu {1} do comprador de BTC.\n\nO ID de negociação (texto \"motivo do pagamento\") da transação é: \"{2}\"
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Como o pagamento é realizado através de depósito de dinheiro em espécie, o comprador de BTC obrigatoriamente deve escrever \"SEM REEMBOLSO\" no comprovante de depósito, rasgá-lo em duas partes e enviar uma foto do comprovante para você por e-mail.\n\nPara reduzir a chance de um reembolso (restituição do valor depositado para o comprador), confirme apenas se você tiver recebido o e-mail e tiver certeza de que o comprovante de depósito é autêntico.\nSe você não tiver certeza, {0}
 portfolio.pending.step3_seller.moneyGram=O comprador deve enviar o Número de Autorização e uma foto do recibo por e-mail.\nO recibo deve mostrar claramente o seu nome completo, país, estado e a quantia. Por favor verifique seu e-mail se recebeu o Número de Autorização.\n\nDepois de fechar esse pop-up, verá o nome e o endereço do comprador do BTC para retirar o dinheiro da MoneyGram.\n\nConfirme apenas o recebimento depois de ter conseguido o dinheiro com sucesso!
 portfolio.pending.step3_seller.westernUnion=O comprador deve enviar-lhe o MTCN (número de rastreamento) e uma foto do recibo por e-mail.\nO recibo deve mostrar claramente seu nome completo, cidade, país e a quantia Por favor verifique no seu e-mail se você recebeu o MTCN.\n\nDepois de fechar esse pop-up, você verá o nome e endereço do comprador de BTC para receber o dinheiro da Western Union.\n\nConfirme apenas o recebimento depois de ter conseguido o dinheiro com sucesso!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=Você ainda não confirmou o receb
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Você recebeu o pagamento de {0} do seu parceiro de negociação?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=O ID de negociação (texto \"razão do pagamento\") da transação é: \"{0}\"\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Verifique também se o nome de quem envia o pagamento no contrato de negociação é o mesmo que aparece em seu extrato bancário:\nNome do pagante, pelo contrato de negociação: {0}\n\nSe os nomes não forem exatamente iguais, não confirme o recebimento do pagamento. Em vez disso, abra uma disputa pressionando \"alt + o\" or \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Assim que você confirmar o recebimento do pagamento, o valor da transação será liberado para o comprador de BTC e o depósito de segurança será devolvido.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Exibir minhas ofertas no livro de ofertas
 setting.preferences.useAnimations=Usar animações
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[Endeço IP:porta | nome do host:porta | endereço onion:porta] (seperados por vírgulas). A porta pode ser omitida quando a porta padrão (8333) for usada.
 settings.net.seedNode=Nó semente
 settings.net.directPeer=Par (direto)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Par
 settings.net.inbound=entrada
 settings.net.outbound=saída
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Insira a chave privada para o registro
 
 filterWindow.headline=Editar lista de filtragem
 filterWindow.offers=Ofertas filtradas (sep. por vírgula):
-filterWindow.onions=Endereços onion filtrados (sep. por vírgula)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Dados de conta de negociação filtrados:\nFormato: lista separada por vírgulas de [id do método de pagamento | dados | valor]
 filterWindow.bannedCurrencies=Códigos de moedas filtrados (sep. por vírgula)
 filterWindow.bannedPaymentMethods=IDs de método de pagamento filtrados (sep. por vírgula)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Versão mínima necessária para negociaç
 filterWindow.add=Adicionar filtro
 filterWindow.remove=Remover filtro
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Quantia mín. em BTC
 offerDetailsWindow.min=(mín. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Estado da negociação
 tradeDetailsWindow.agentAddresses=Árbitro/Mediador
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Digite senha para abrir:
 
 torNetworkSettingWindow.header=Configurações de rede do Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Desligando
 popup.shutDownInProgress.msg=O desligamento do programa pode levar alguns segundos.\nPor favor, não interrompa este processo.
 
 popup.attention.forTradeWithId=Atenção para a negociação com ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Múltiplas contas de pagamento disponíveis
 popup.info.multiplePaymentAccounts.msg=Você tem várias contas de pagamento disponíveis para esta oferta. Por favor, verifique se você escolheu a correta.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=Informações para contato
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informações para contato
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Cidade para se encontrar 'Cara-a-cara'
 payment.f2f.city.prompt=A cidade será exibida na oferta
-payment.f2f.optionalExtra=Informações adicionais opcionais
+payment.shared.optionalExtra=Informações adicionais opcionais
-payment.f2f.extra=Informações adicionais
+payment.shared.extraInfo=Informações adicionais
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=O ofertante pode definir 'termos e condições' ou adicionar informação de um contato público. Este será exibido junto da oferta.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Abrir site
 payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Transferência para mesmo banco
 SPECIFIC_BANKS=Transferência com bancos específicos
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Depósito em dinheiro (cash deposit)
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face a face (pessoalmente)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito em dinheiro (cash deposit)
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Esperando pelos fundos...
 shared.depositTransactionId=ID da transação de depósito
 shared.TheBTCBuyer=O comprador de BTC
 shared.You=Você
-shared.reasonForPayment=Motivo do pagamento
 shared.sendingConfirmation=Enviando confirmação...
 shared.sendingConfirmationAgain=Por favor envia a confirmação de novo
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Atualização disponível)
 ####################################################################
 
 market.tabs.offerBook=Livro de ofertas
-market.tabs.spread=Detalhes
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Negócios
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Comprar BTC ({0})
 market.spread.numberOfSellOffersColumn=Vender BTC ({0})
 market.spread.totalAmountColumn=Total de BTC ({0})
 market.spread.spreadColumn=Spread
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Negócios: {0}
-market.trades.tooltip.volumeBar=Volume: {0}\nNº de negócios: {1}\nData: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Abrir:
 market.trades.tooltip.candle.close=Fechar:
 market.trades.tooltip.candle.high=Alta:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Baixa:
 market.trades.tooltip.candle.average=Média:
 market.trades.tooltip.candle.median=Mediano:
 market.trades.tooltip.candle.date=Data:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Sede do banco aceite (aceitador):\n {0}
 offerbook.availableOffers=Ofertas disponíveis
 offerbook.filterByCurrency=Filtrar por moeda
 offerbook.filterByPaymentMethod=Filtrar por método de pagamento
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=Esta conta foi verificada e {0}
 offerbook.timeSinceSigning.info.arbitrator=assinada pelo árbitro e pode assinar contas de pares
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Selecione a moeda da taxa de negócio
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=A transação de depósito ainda não foi confirmad
 portfolio.pending.step1.openForDispute=A transação de depósito ainda não foi confirmada. Você pode esperar mais tempo ou entrar em contato com o mediador para obter assistência.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Seu negócio atingiu pelo menos uma confirmação da blockchain.\n(Você pode esperar por mais confirmações se quiser - 6 confirmações são consideradas muito seguras.)\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Você pode copiar e colar os valores do ecrã principal após fechar aquele popup)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=NÃO utilize avisos adicionais como bitcoin, BTC ou Bisq no texto da \"razão para pagamento\".
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Aqui estão os detalhes da conta de negócio do vendedor de BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=Favor não esquecer de adicionar o ID de negócio
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=como \ "razão para pagamento \" para que o recipiente possa atribuir o seu pagamento à este negócio.\n\n
-portfolio.pending.step2_buyer.fees=Caso o seu banco cobra taxas você terá que pagar estas taxas.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Por favor transfira da sua carteira externa {0}\n{1} para o vendedor de.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Por favor envie {0} por \"US Postal Money Order\" para o vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Por favor vá à sua página web de serviços bancários online e pague {0} ao vendedor de BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Por favor contacte o vendedor de BTC pelo contacto fornecido e marque um encontro para pagar {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Iniciar pagamento usando {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=O seu parceiro de negociação confirmou que
 portfolio.pending.step3_seller.altcoin.explorer=no seu explorador de blockchain de {0} favorito
 portfolio.pending.step3_seller.altcoin.wallet=na sua carteira de {0}
 portfolio.pending.step3_seller.altcoin={0} Por favor verifique {1} se a transação para o seu endereço recipiente\n{2}\njá possui confirmações suficientes da blockchain.\nA quantia de pagamento deve ser {3}\n\nVocê pode copiar e colar o seu endereço {4} do ecrã principal depois de fechar o pop-up.
-portfolio.pending.step3_seller.postal={0} Por favor, verifique se você recebeu {1} com \ "US Postal Money Order \" do comprador de BTC.\n\nO ID do negócio (\ "razão para pagamento \" texto) da transação é: \ "{2} \"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Seu parceiro de negociação confirmou que iniciou o pagamento de {0}.\n\nPor favor vá para a página web do seu banco online e verifique se você recebeu {1} do comprador de BTC.\n\nO ID do negócio (\"razão para pagamento\" texto) da transação é: \"{2}\"\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Como o pagamento é feito via Depósito em Dinheiro, o comprador do BTC deve escrever "SEM REEMBOLSO" no recibo de papel, rasgá-lo em 2 partes e enviar uma foto por e-mail.\n\nPara evitar o risco de estorno, confirme apenas se você recebeu o e-mail e se tiver certeza de que o recibo de papel é válido.\nSe você não tiver certeza, {0}
 portfolio.pending.step3_seller.moneyGram=O comprador deve enviar o Número de Autorização e uma foto do recibo por e-mail.\nO recibo deve mostrar claramente o seu nome completo, país, estado e a quantia. Por favor verifique seu e-mail se recebeu o Número de Autorização.\n\nDepois de fechar esse pop-up, verá o nome e o endereço do comprador do BTC para levantar o dinheiro da MoneyGram.\n\nConfirme apenas o recebimento depois de ter conseguido o dinheiro com sucesso!
 portfolio.pending.step3_seller.westernUnion=O comprador deve enviar-lhe o MTCN (número de rastreamento) e uma foto do recibo por e-mail.\nO recibo deve mostrar claramente seu nome completo, cidade, país e a quantia Por favor verifique no seu e-mail se você recebeu o MTCN.\n\nDepois de fechar esse pop-up, você verá o nome e endereço do comprador de BTC para levantar o dinheiro da Western Union.\n\nConfirme apenas o recebimento depois de ter conseguido o dinheiro com sucesso!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=Você não confirmou a receção d
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Você recebeu o pagamento de {0} do seu parceiro de negociação?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=O ID do negócio (\ "razão para pagamento \"texto) da transação é: \ "{0} \"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Verifique também se o nome do remetente especificado no contrato de negócio corresponde ao nome que aparece no seu extrato bancário:\nNome do remetente, por contrato de negócio: {0}\n\nSe os nomes não forem exatamente iguais, não confirme a recepção do pagamento. Em vez disso, abra uma disputa pressionando \"alt + o\" ou \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Observe que, assim que você confirmar a recepção, o valor da transação bloqueada será liberado para o comprador de BTC e o depósito de segurança será reembolsado.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Mostrar as minhas próprias ofertas no livro d
 setting.preferences.useAnimations=Usar animações
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[endereço IP:porta | nome de host:porta | endereço onion:porta] (separado por vírgula). A porta pode ser omitida se a padrão for usada (8333).
 settings.net.seedNode=Nó semente
 settings.net.directPeer=Par (direto)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Par
 settings.net.inbound=entrante
 settings.net.outbound=sainte
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Inserir chave privada para registro
 
 filterWindow.headline=Editar lista de filtragem
 filterWindow.offers=Ofertas filtradas (sep. por vírgula):
-filterWindow.onions=Endereços onion filtrados (sep. por vírgula)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Dados da conta de negociação filtrados:\nFormato: lista de [id de método de pagamento | campo de dados | valor] sep. por vírgula
 filterWindow.bannedCurrencies=Códigos de moedas filtrados (sep. por vírgula)
 filterWindow.bannedPaymentMethods=IDs de método de pagamento filtrados (sep. por vírgula)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Mín. versão necessária para negociaçã
 filterWindow.add=Adicionar filtro
 filterWindow.remove=Remover filtro
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Quantia mín. de BTC
 offerDetailsWindow.min=(mín. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Estado de negócio
 tradeDetailsWindow.agentAddresses=Árbitro/Mediador
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Digite senha para abrir:
 
 torNetworkSettingWindow.header=Definições de redes Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Desligando
 popup.shutDownInProgress.msg=Desligar o programa pode demorar alguns segundos.\nPor favor não interrompa este processo.
 
 popup.attention.forTradeWithId=Atenção necessária para o negócio com ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Múltiplas contas de pagamento disponíveis
 popup.info.multiplePaymentAccounts.msg=Você tem várias contas de pagamento disponíveis para esta oferta. Por favor, verifique se você escolheu a correta.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=Informação de contacto
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informação de contacto
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Cidade para o encontro 'Face à face'
 payment.f2f.city.prompt=A cidade será exibida com a oferta
-payment.f2f.optionalExtra=Informação adicional opcional
+payment.shared.optionalExtra=Informação adicional opcional
-payment.f2f.extra=Informação adicional
+payment.shared.extraInfo=Informação adicional
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=O ofertante pode definir 'termos e condições' ou adicionar informação de um contacto público. Este será exibido com a oferta.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Abrir página web
 payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Transferência para mesmo banco
 SPECIFIC_BANKS=Transferência com banco escpecífico
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Depósito em dinheiro
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face à face (em pessoa)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito em dinheiro
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Ожидание средств...
 shared.depositTransactionId=Идентификатор зачисления на счёт
 shared.TheBTCBuyer=Покупатель ВТС
 shared.You=Вы
-shared.reasonForPayment=Назначение платежа
 shared.sendingConfirmation=Отправка подтверждения...
 shared.sendingConfirmationAgain=Отправьте подтверждение повторно
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Имеется обновление)
 ####################################################################
 
 market.tabs.offerBook=Предложения
-market.tabs.spread=Подробности
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Сделки
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Купить BTC ({0})
 market.spread.numberOfSellOffersColumn=Продать BTC ({0})
 market.spread.totalAmountColumn=Итого BTC ({0})
 market.spread.spreadColumn=Спред
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Сделки: {0}
-market.trades.tooltip.volumeBar=Объём: {0}\nКоличество сделок: {1}\nДата: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Открыт:
 market.trades.tooltip.candle.close=Закрыт:
 market.trades.tooltip.candle.high=Высший:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Низший:
 market.trades.tooltip.candle.average=Средний:
 market.trades.tooltip.candle.median=Median:
 market.trades.tooltip.candle.date=Дата:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Допустимые страны банка
 offerbook.availableOffers=Доступные предложения
 offerbook.filterByCurrency=Фильтровать по валюте
 offerbook.filterByPaymentMethod=Фильтровать по способу оплаты
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Выбрать валюту коми
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=The deposit transaction is still not confirmed. Thi
 portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. You can wait longer or contact the mediator for assistance.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=Ваша сделка подтверждена в блокчейне не менее одного раза.\nВы можете дождаться дополнительных подтверждений (в целях безопасности рекомендуется дождаться 6 подтверждений).\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Можно скопировать и вставить данные с главной страницы после закрытия этого окна.)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=НЕ УКАЗЫВАЙТЕ дополнительных сведений в поле \«Назначение платежа\» (например, биткойн, BTC или Bisq).
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Вот данные торгового счёта продавца ВТС:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=Не забудьте указать идентификатор сделки
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=в поле \«Назначение платежа\», чтобы получатель мог идентифицировать его.\n\n
-portfolio.pending.step2_buyer.fees=Если ваш взимает комиссии, вы должны оплатить их.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Переведите {1} с внешнего кошелька {0}\nпродавцу ВТС.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Отправьте {0} \«Почтовым денежным переводом США\» продавцу BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Заплатите {0} продавцу BTC через интернет-сервис вашего банка.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Свяжитесь с продавцом BTC с помощью указанных контактных данных и договоритесь о встрече для оплаты {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Начать оплату, используя {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Ваш контрагент подтверд
 portfolio.pending.step3_seller.altcoin.explorer=в вашем любимом обозревателе блоков {0}
 portfolio.pending.step3_seller.altcoin.wallet=в вашем кошельке {0}
 portfolio.pending.step3_seller.altcoin={0}Проверьте {1}, была ли транзакция в ваш адрес\n{2}\nподтверждена достаточное количество раз.\nСумма платежа должна составлять {3}.\n\n Вы можете скопировать и вставить свой адрес {4} из главного окна после закрытия этого окна.
-portfolio.pending.step3_seller.postal={0}Проверьте, получили ли вы {1} \«Почтовым денежным переводом США\» от покупателя BTC.\n\nИдентификатор сделки (поле \«Назначение платежа\»): \«{2}\»
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Ваш контрагент подтвердил начало платежа в {0}.\n\nЗайдите в свой интернет-банк и проверьте получение {1} от покупателя BTC.\n\nИдентификатор сделки (поле \«Назначение платежа\»): \«{2}\»\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Так как оплата осуществляется наличными на счёт, покупатель BTC должен написать \«НЕ ПОДЛЕЖИТ ВОЗВРАТУ\» на квитанции, разорвать её на 2 части и отправить вам её фото по электронной почте.\n\nЧтобы избежать возврата платёжа, подтверждайте его получение только после получения этого фото, если вы не сомневаетесь в подлинности квитанции.\nЕсли вы не уверены, {0}
 portfolio.pending.step3_seller.moneyGram=Покупатель обязан отправить вам по электронной почте код подтверждения и фото квитанции.\nВ квитанции должно быть четко указано ваше полное имя, страна (штат) и сумма. Убедитесь, что вы получили код подтверждения по электронной почте.\n\nПосле закрытия этого окна вы увидите имя и адрес покупателя BTC, которые необходимо указать для получения денег от MoneyGram.\n\nПодтвердите получение только после того, как вы успешно заберете деньги!
 portfolio.pending.step3_seller.westernUnion=Покупатель обязан отправить вам по электронной почте контрольный номер MTCN и фото квитанции.\nВ квитанции должно быть четко указано ваше полное имя, город, страна и сумма. Убедитесь, что вы получили номер MTCN по электронной почте.\n\nПосле закрытия этого окна вы увидите имя и адрес покупателя BTC, которые необходимо указать для получения денег от Western Union. \n\nПодтвердите получение только после того, как вы успешно заберете деньги!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Вы получили платеж в {0} от своего контрагента?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=Идентификатор сделки (поле \«Назначение платежа\»): \«{0}\»\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the name of the sender specified on the trade contract matches the name that appears on your bank statement:\nSender''s name, per trade contract: {0}\n\nIf the names are not exactly the same, don''t confirm payment receipt. Instead, open a dispute by pressing \"alt + o\" or \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Please note, that as soon you have confirmed the receipt, the locked trade amount will be released to the BTC buyer and the security deposit will be refunded.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Показать мои предложения
 setting.preferences.useAnimations=Использовать анимацию
 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.resetAllFlags=Сбросить все флажки \«Не показывать снова\»
 settings.preferences.languageChange=Изменение языка во всех разделах вступит в силу после перезагрузки приложения.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[IP-адрес:порт | хост:порт | onion-адрес:порт] (через запятые). Порт можно не указывать, если используется порт по умолчанию (8333).
 settings.net.seedNode=Исходный узел
 settings.net.directPeer=Пир (прямой)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Пир
 settings.net.inbound=входящий
 settings.net.outbound=выходящий
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Enter private key for registration
 
 filterWindow.headline=Изменить список фильтров
 filterWindow.offers=Отфильтрованные предложения (через запят.)
-filterWindow.onions=Отфильтрованные onion-адреса (через запят.)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Отфильтрованные данные торгового счёта:\nФормат: список, через запятые [идентификатор метода платежа | поле данных | значение]
 filterWindow.bannedCurrencies=Отфильтрованные коды валют (через запят.)
 filterWindow.bannedPaymentMethods=Отфильтрованные идент. методов платежа (через запят.)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Мин. версия, необходима
 filterWindow.add=Добавить фильтр
 filterWindow.remove=Удалить фильтр
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Мин. количество BTC
 offerDetailsWindow.min=(мин. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Статус сделки
 tradeDetailsWindow.agentAddresses=Arbitrator/Mediator
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Введите пароль для разблокировки
 
 torNetworkSettingWindow.header=Настройки сети Тоr
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Завершение работы
 popup.shutDownInProgress.msg=Завершение работы приложения может занять несколько секунд.\nПросьба не прерывать этот процесс.
 
 popup.attention.forTradeWithId=Обратите внимание на сделку с идентификатором {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Доступно несколько платёжных счетов
 popup.info.multiplePaymentAccounts.msg=У вас есть несколько платёжных счетов, доступных для этого предложения. Просьба убедиться, что вы выбрали правильный счёт.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=Контактная информация
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Контактная информация
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Город для личной встречи
 payment.f2f.city.prompt=Город будет указан в предложении
-payment.f2f.optionalExtra=Дополнительная необязательная информация
+payment.shared.optionalExtra=Дополнительная необязательная информация
-payment.f2f.extra=Дополнительная информация
+payment.shared.extraInfo=Дополнительная информация
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=Мейкер вправе определить условия сделки или добавить общедоступную контактную информацию. Эти данные будут указаны в предложении.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Открыть веб-страницу
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Перевод в тот же банк
 SPECIFIC_BANKS=Перевод через определённый банк
 US_POSTAL_MONEY_ORDER=Почтовый денежный перевод США
 CASH_DEPOSIT=Внесение наличных
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Личная встреча
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=Денежный перевод США
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Внесение наличных
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=กำลังรอเงิน ...
 shared.depositTransactionId=รหัสธุรกรรมการฝากเงิน (transaction ID)
 shared.TheBTCBuyer=ผู้ซื้อ BTC
 shared.You=คุณ
-shared.reasonForPayment=เหตุผลในการชำระเงิน
 shared.sendingConfirmation=กำลังส่งการยืนยัน ...
 shared.sendingConfirmationAgain=โปรดยืนยันการส่งอีกครั้ง
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(การอัพเดตพร้อมใช้ง
 ####################################################################
 
 market.tabs.offerBook=การจองข้อเสนอ
-market.tabs.spread=รายละเอียด
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=การซื้อขาย
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=ซื้อ BTC ({0})
 market.spread.numberOfSellOffersColumn=ขาย BTC ({0})
 market.spread.totalAmountColumn=ยอด BTC ทั้งหมด ({0})
 market.spread.spreadColumn=กระจาย
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=การซื้อขาย: {0}
-market.trades.tooltip.volumeBar=ปริมาณ: {0}\nหมายเลขการซื้อขาย: {1}\nวันที่: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=เปิด:
 market.trades.tooltip.candle.close=ปิด:
 market.trades.tooltip.candle.high=สูง:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=ต่ำ:
 market.trades.tooltip.candle.average=เฉลี่ย:
 market.trades.tooltip.candle.median=Median:
 market.trades.tooltip.candle.date=วันที่:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=ยอมรับตำแหน่งป
 offerbook.availableOffers=ข้อเสนอที่พร้อมใช้งาน
 offerbook.filterByCurrency=กรองตามสกุลเงิน
 offerbook.filterByPaymentMethod=ตัวกรองตามวิธีการชำระเงิน
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=เลือกสกุลเงิ
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=The deposit transaction is still not confirmed. Thi
 portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. You can wait longer or contact the mediator for assistance.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=การซื้อขายของคุณมีการยืนยันบล็อกเชนอย่างน้อยหนึ่งรายการ\n(คุณสามารถรอการยืนยันเพิ่มเติมได้หากต้องการ - การยืนยันจำนวน 6 ครั้งถือว่าปลอดภัยมาก)\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(คุณสามารถคัดลอกและวางค่าจากหน้าจอหลักหลังจากปิดป๊อปอัปดังกล่าว)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=อย่าใช้คำบอกกล่าวเพิ่มเติมในข้อความ \"เหตุผลในการชำระเงิน \" เช่น bitcoin, BTC หรือ Bisq
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=นี่คือรายละเอียดบัญชีการค้าของผู้ขาย BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=โปรดอย่าลืมใส่ ID การซื้อขาย
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=ตั้งเป็น \"เหตุผลในการชำระเงิน \" เพื่อให้ผู้รับสามารถมอบหมายการชำระเงินของคุณให้กับการซื้อขายครั้งนี้\n
-portfolio.pending.step2_buyer.fees=หากธนาคารของคุณเรียกเก็บค่าธรรมเนียมต่าง ๆ คุณจำเป็นต้องรับผิดชอบค่าธรรมเนียมเหล่านั้นเอง
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=โปรดโอนจาก wallet {0} ภายนอก\n{1} ให้กับผู้ขาย BTC\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=โปรดส่ง {0} โดยธนาณัติ \"US Postal Money Order \" ไปยังผู้ขาย BTC\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=โปรดไปที่หน้าเว็บของธนาคารออนไลน์และชำระเงิน {0} ให้กับผู้ขาย BTC\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=กรุณาติดต่อผู้ขายของ BTC ตามรายชื่อที่ได้รับและนัดประชุมเพื่อจ่ายเงิน {0}\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=เริ่มต้นการชำระเงินโดยใช้ {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=พันธมิตรทางการ
 portfolio.pending.step3_seller.altcoin.explorer=ผู้สำรวจบล็อกเชน {0} ที่ถูกใจของคุณ
 portfolio.pending.step3_seller.altcoin.wallet=ณ กระเป๋าสตางค์ {0} ของคุณ
 portfolio.pending.step3_seller.altcoin={0}โปรดตรวจสอบ {1} หากการทำธุรกรรมส่วนที่อยู่รับของคุณ\n{2}\nมีการยืนยันบล็อกเชนแล้วเรียบร้อย\nยอดการชำระเงินต้องเป็น {3}\n\nคุณสามารถคัดลอกและวาง {4} ข้อมูลที่อยู่ของคุณได้จากหน้าจอหลักหลังจากปิดหน้าต่างป๊อปอัพ
-portfolio.pending.step3_seller.postal={0} โปรดตรวจสอบว่าคุณได้รับ {1} ธนาณัติ \"US Postal Money Order \" จากผู้ซื้อ BTC แล้วหรือไม่ "\n\nID การซื้อขาย (\"เหตุผลในการชำระเงิน \"ข้อความ) ของธุรกรรมคือ: \"{2} \"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=พันธมิตรทางการค้าของคุณได้ยืนยันว่าพวกเขาได้เริ่มต้น {0} การชำระเงิน\n\nโปรดไปที่หน้าธนาคารออนไลน์ของคุณและตรวจสอบว่าคุณได้รับ {1} จากผู้ซื้อ BTC \n\nเลข ID การเทรด (\"เหตุผลในการชำระเงิน\" ข้อความ) ของการทำธุรกรรมคือ: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=เนื่องจากการชำระเงินผ่าน Cash Deposit (ฝากเงินสด) ผู้ซื้อ BTC จะต้องเขียน \"NO REFUND \" ในใบเสร็จรับเงินและให้แบ่งออกเป็น 2 ส่วนและส่งรูปถ่ายทางอีเมล\n\nเพื่อหลีกเลี่ยงความเสี่ยงจากการปฏิเสธการชำระเงิน  ให้ยืนยันเฉพาะถ้าคุณได้รับอีเมลและหากคุณแน่ใจว่าใบเสร็จถูกต้องแล้ว\nถ้าคุณไม่แน่ใจ {0}
 portfolio.pending.step3_seller.moneyGram=ผู้ซื้อต้องส่งหมายเลขอนุมัติและรูปใบเสร็จรับเงินทางอีเมล\nใบเสร็จรับเงินต้องแสดงชื่อเต็มของคุณ ประเทศ รัฐ และจำนวนเงิน โปรดตรวจสอบอีเมลของคุณหากคุณได้รับหมายเลขการให้สิทธิ์\n\nหลังจากปิดป๊อปอัปคุณจะเห็นชื่อและที่อยู่ของผู้ซื้อ BTC เพื่อรับเงินจาก MoneyGram\n\nยืนยันเฉพาะใบเสร็จหลังจากที่คุณได้รับเงินเรียบร้อยแล้ว!
 portfolio.pending.step3_seller.westernUnion=ผู้ซื้อต้องส่ง MTCN (หมายเลขติดตาม) และรูปใบเสร็จรับเงินทางอีเมล\nใบเสร็จรับเงินต้องแสดงชื่อ เมือง ประเทศ และจำนวนเงินทั้งหมดไว้อย่างชัดเจน โปรดตรวจสอบอีเมลของคุณหากคุณได้รับ MTCN\n\nหลังจากปิดป๊อปอัปคุณจะเห็นชื่อและที่อยู่ของผู้ซื้อ BTC สำหรับการขอรับเงินจาก Western Union \n\nยืนยันเฉพาะใบเสร็จหลังจากที่คุณได้รับเงินเรียบร้อยแล้ว!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=คุณได้รับ {0} การชำระเงินจากคู่ค้าของคุณหรือไม่\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=ID การซื้อขาย (\"เหตุผลในการชำระเงิน \") ของธุรกรรมคือ: \"{0} \" \n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the name of the sender specified on the trade contract matches the name that appears on your bank statement:\nSender''s name, per trade contract: {0}\n\nIf the names are not exactly the same, don''t confirm payment receipt. Instead, open a dispute by pressing \"alt + o\" or \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Please note, that as soon you have confirmed the receipt, the locked trade amount will be released to the BTC buyer and the security deposit will be refunded.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=แสดงข้อเสนอของฉ
 setting.preferences.useAnimations=ใช้ภาพเคลื่อนไหว
 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.resetAllFlags=รีเซ็ตทั้งหมด \"ไม่ต้องแสดงอีกครั้ง \" ปักธง
 settings.preferences.languageChange=หากต้องการเปลี่ยนภาษากับทุกหน้าต้องทำการรีสตาร์ท
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that mediation is handled in {0} and arbitration in {1}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[ที่อยู่ IP: พอร์ต | ชื่อโฮสต์: พอร์ต | ที่อยู่ onion: พอร์ต] (คั่นด้วยเครื่องหมายจุลภาค) Port สามารถละเว้นได้ถ้าใช้ค่าเริ่มต้น (8333)
 settings.net.seedNode=แหล่งโหนดข้อมูล
 settings.net.directPeer=Peer (โดยตรง)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=เน็ตเวิร์ก Peer
 settings.net.inbound=ขาเข้า
 settings.net.outbound=ขาออก
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Enter private key for registration
 
 filterWindow.headline=แก้ไขรายการตัวกรอง
 filterWindow.offers=ข้อเสนอที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค)
-filterWindow.onions=ที่อยู่ onion ที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=ข้อมูลบัญชีการซื้อขายที่ถูกกรอง: \nรูปแบบ: เครื่องหมายจุลภาค  รายการของ  [id วิธีการชำระเงิน | ด้านข้อมูล | มูลค่า]
 filterWindow.bannedCurrencies=รหัสโค้ดสกุลเงินที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค)
 filterWindow.bannedPaymentMethods=รหัส ID วิธีการชำระเงินที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Min. version required for trading
 filterWindow.add=เพิ่มตัวกรอง
 filterWindow.remove=ลบตัวกรอง
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=จำนวน BTC ต่ำสุด
 offerDetailsWindow.min=(ต่ำสุด. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=สถานะการค้า
 tradeDetailsWindow.agentAddresses=Arbitrator/Mediator
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=ป้อนรหัสผ่านเพื่อปลดล็อก
 
 torNetworkSettingWindow.header=ตั้งค่าเครือข่าย Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=การปิดระบบอยู่ร
 popup.shutDownInProgress.msg=การปิดแอพพลิเคชั่นอาจใช้เวลาสักครู่\nโปรดอย่าขัดจังหวะกระบวนการนี้
 
 popup.attention.forTradeWithId=ต้องให้ความสำคัญสำหรับการซื้อขายด้วย ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available
 popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=ข้อมูลติดต่อ
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=ข้อมูลติดต่อ
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=เมืองสำหรับการประชุมแบบเห็นหน้ากัน
 payment.f2f.city.prompt=ชื่อเมืองจะแสดงพร้อมกับข้อเสนอ
-payment.f2f.optionalExtra=ข้อมูลตัวเลือกเพิ่มเติม
+payment.shared.optionalExtra=ข้อมูลตัวเลือกเพิ่มเติม
-payment.f2f.extra=ข้อมูลเพิ่มเติม
+payment.shared.extraInfo=ข้อมูลเพิ่มเติม
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=ผู้สร้างสามารถกำหนด 'ข้อกำหนดในการให้บริการ' หรือเพิ่มข้อมูลการติดต่อสาธารณะได้ สิ่งเหล่านี้จะปรากฏพร้อมกับข้อเสนอ
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=เปิดหน้าเว็บ
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=โอนเงินผ่านธนาคารเดียวก
 SPECIFIC_BANKS=การโอนเงินกับธนาคารเฉพาะ
 US_POSTAL_MONEY_ORDER=US Postal Money Order ใบสั่งซื้อทางไปรษณีย์ของสหรัฐฯ
 CASH_DEPOSIT=ฝากเงินสด
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=เห็นหน้ากัน (แบบตัวต่อตัว)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order ใบสั่งทางการ
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=ฝากเงินสด
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=Đợi nộp tiền...
 shared.depositTransactionId=ID giao dịch gửi tiền
 shared.TheBTCBuyer=Người mua BTC
 shared.You=Bạn
-shared.reasonForPayment=Lý do thanh toán
 shared.sendingConfirmation=Gửi xác nhận...
 shared.sendingConfirmationAgain=Hãy gửi lại xác nhận
 shared.exportCSV=Export to CSV
@@ -291,7 +290,8 @@ mainView.version.update=(Có cập nhật)
 ####################################################################
 
 market.tabs.offerBook=Danh mục chào giá
-market.tabs.spread=Thông tin chi tiết
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=Các giao dịch
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=Mua BTC ({0})
 market.spread.numberOfSellOffersColumn=Bán BTC ({0})
 market.spread.totalAmountColumn=Tổng số BTC ({0})
 market.spread.spreadColumn=Chênh lệch giá
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=Các giao dịch: {0}
-market.trades.tooltip.volumeBar=Khối lượng: {0}\nSố giao dịch: {1}\nNgày: {2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=Mở:
 market.trades.tooltip.candle.close=Đóng:
 market.trades.tooltip.candle.high=Cao:
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=Thấp:
 market.trades.tooltip.candle.average=Trung bình:
 market.trades.tooltip.candle.median=Median:
 market.trades.tooltip.candle.date=Ngày:
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=Các quốc gia có ngân hàng được ch
 offerbook.availableOffers=Các chào giá hiện có
 offerbook.filterByCurrency=Lọc theo tiền tệ
 offerbook.filterByPaymentMethod=Lọc theo phương thức thanh toán
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=Account info
 offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=Chọn loại tiền trả phí giao
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=The deposit transaction is still not confirmed. Thi
 portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. You can wait longer or contact the mediator for assistance.
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=giao dịch của bạn đã có ít nhất một xác nhận blockchain.\n(Bạn có thể đợi thêm xác nhận khác nếu bạn muốn - 6 xác nhận được xem là rất an toàn.)\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=(Bạn có thể cóp & dán các giá trị từ màn hình chính sau khi đóng cửa sổ này.)
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=KHÔNG sử dụng thông báo thêm trong phần \"lý do thanh toán\" các chữ như bitcoin, BTC hoặc Bisq.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=Đây là thông tin tài khoản giao dịch của người bán BTC:\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=Vui lòng bổ sung ID giao dịch
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=do \"lý do thanh toán\" nên người nhận có thể ấn định thanh toán của bạn cho giao dịch này.\n\n
-portfolio.pending.step2_buyer.fees=Nếu ngân hàng đánh phí, bạn phải trả các phí này.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=Hãy chuyển từ ví ngoài {0} của bạn\n{1} cho người bán BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=Please purchase an Amazon eGift Car
 # 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
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=Hãy truy cập trang web ngân hàng và thanh toán {0} cho người bán BTC.\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=Vui lòng liên hệ người bán BTC và cung cấp số liên hệ và sắp xếp cuộc hẹn để thanh toán {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Thanh toán bắt đầu sử dụng {0}
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=Đối tác giao dịch của bạn đã xá
 portfolio.pending.step3_seller.altcoin.explorer=Trên trình duyệt blockchain explorer {0} ưa thích của bạn
 portfolio.pending.step3_seller.altcoin.wallet=Trên ví {0} của bạn
 portfolio.pending.step3_seller.altcoin={0}Vui lòng kiểm tra {1} xem giao dịch tới địa chỉ nhận của bạn \n{2}\nđã nhận được đủ xác nhận blockchain hay chưa.\nSố tiền thanh toán phải là {3}\n\nBạn có thể copy & paste địa chỉ {4} của bạn từ màn hình chính sau khi đóng cửa sổ này.
-portfolio.pending.step3_seller.postal={0}Hãy kiểm tra xem bạn đã nhận được {1} \"Thư chuyển tiền US\" từ người mua BTC chưa.\n\nID giao dịch (nội dung \"lý do thanh toán\") của giao dịch là: \"{2}\"
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=Đối tác giao dịch của bạn đã xác nhận rằng họ đã kích hoạt thanh toán {0}.\n\nHãy truy cập trang web ngân hàng online và kiểm tra xem bạn đã nhận được {1} từ người mua BTC chưa.\n\nID giao dịch (\"lý do thanh toán\" text) của giao dịch là: \"{2}\"\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Vì thanh toán được thực hiện qua Tiền gửi tiền mặt nên người mua BTC phải viết rõ \"KHÔNG HOÀN LẠI\" trên giấy biên nhận, xé làm 2 phần và gửi ảnh cho bạn qua email.\n\nĐể tránh bị đòi tiền lại, chỉ xác nhận bạn đã nhận được email và bạn chắc chắn giấy biên nhận là có hiệu lực.\nNếu bạn không chắc chắn, {0}
 portfolio.pending.step3_seller.moneyGram=Người mua phải gửi mã số xác nhận và ảnh chụp của hoá đơn qua email.\nHoá đơn cần ghi rõ họ tên đầy đủ, quốc gia, tiêu bang và số lượng. Vui lòng kiểm tra email nếu bạn nhận được số xác thực.\n\nSau khi popup đóng, bạn sẽ thấy tên người mua BTC và địa chỉ để nhận tiền từ MoneyGram.\n\nChỉ xác nhận hoá đơn sau khi bạn hoàn thành việc nhận tiền.
 portfolio.pending.step3_seller.westernUnion=Người mua phải gửi cho bạn MTCN (số theo dõi) và ảnh giấy biên nhận qua email.\nGiấy biên nhận phải ghi rõ họ tên của bạn, thành phố, quốc gia và số tiền. Hãy kiểm tra email xem bạn đã nhận được MTCN chưa.\n\nSau khi đóng cửa sổ này, bạn sẽ thấy tên và địa chỉ của người mua BTC để nhận tiền từ Western Union.\n\nChỉ xác nhận giấy biên nhận sau khi bạn đã nhận tiền thành công!
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=Bạn đã nhận được thanh toán {0} từ Đối tác giao dịch của bạn?\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=ID giao dịch (nội dung \"lý do thanh toán\") của giao dịch là: \"{0}\"\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the name of the sender specified on the trade contract matches the name that appears on your bank statement:\nSender''s name, per trade contract: {0}\n\nIf the names are not exactly the same, don''t confirm payment receipt. Instead, open a dispute by pressing \"alt + o\" or \"option + o\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=Please note, that as soon you have confirmed the receipt, the locked trade amount will be released to the BTC buyer and the security deposit will be refunded.\n\n
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=Hiển thị Báo giá của tôi trong danh m
 setting.preferences.useAnimations=Sử dụng hoạt ảnh
 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.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}.
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq: {0} | Peers: {1}
 settings.net.ips=[Địa chỉ IP:tên cổng | máy chủ:cổng | Địa chỉ onion:cổng] (tách bằng dấu phẩy). Cổng có thể bỏ qua nếu sử dụng mặc định (8333).
 settings.net.seedNode=nút cung cấp thông tin
 settings.net.directPeer=Đối tác (trực tiếp)
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=Đối tác
 settings.net.inbound=chuyến về
 settings.net.outbound=chuyến đi
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=Enter private key for registration
 
 filterWindow.headline=Chỉnh sửa danh sách lọc
 filterWindow.offers=Chào giá đã lọc (cách nhau bằng dấu phẩy)
-filterWindow.onions=Địa chỉ onion đã lọc (cách nhau bằng dấu phẩy)
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=Dữ liệu tài khoản giao dịch đã lọc:\nĐịnh dạng: cách nhau bằng dấu phẩy danh sách [ID phương thức thanh toán | trường dữ liệu | giá trị]
 filterWindow.bannedCurrencies=Mã tiền tệ đã lọc (cách nhau bằng dấu phẩy)
 filterWindow.bannedPaymentMethods=ID phương thức thanh toán đã lọc (cách nhau bằng dấu phẩy)
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=Phiên bản tối thiể yêu cầu cho g
 filterWindow.add=Thêm bộ lọc
 filterWindow.remove=Gỡ bỏ bộ lọc
 filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=Giá trị BTC tối thiểu
 offerDetailsWindow.min=(min. {0})
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=Trạng thái giao dịch
 tradeDetailsWindow.agentAddresses=Arbitrator/Mediator
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=Nhập mật khẩu để mở khóa
 
 torNetworkSettingWindow.header=Cài đặt mạng Tor
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=Đang tắt ứng dụng
 popup.shutDownInProgress.msg=Tắt ứng dụng sẽ mất vài giây.\nVui lòng không gián đoạn quá trình này.
 
 popup.attention.forTradeWithId=Cần chú ý khi giao dịch có ID {0}
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=Có sẵn nhiều tài khoản thanh toán
 popup.info.multiplePaymentAccounts.msg=Bạn có sẵn nhiều tài khoản thanh toán cho chào giá này. Vui lòng đảm bảo là bạn chọn đúng tài khoản.
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=Update Revolut 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.
+
+payment.cashByMail.contact=thông tin liên hệ
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=thông tin liên hệ
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Thành phố để gặp mặt trực tiếp
 payment.f2f.city.prompt=Thành phố sẽ được hiển thị cùng báo giá
-payment.f2f.optionalExtra=Thông tin thêm tuỳ chọn.
+payment.shared.optionalExtra=Thông tin thêm tuỳ chọn.
-payment.f2f.extra=thông tin thêm
+payment.shared.extraInfo=thông tin thêm
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=Người tạo có thể đặt ‘ các điều khoản’ hoặc thêm thông tin liên hệ mở, để hiểnnthij trong báo giá
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe main differences are:\n● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading]
 payment.f2f.info.openURL=Mở trang web
 payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=Chuyển khoản cùng ngân hàng
 SPECIFIC_BANKS=Chuyển khoản với ngân hàng cụ thể
 US_POSTAL_MONEY_ORDER=Thư chuyển tiền US
 CASH_DEPOSIT=Tiền gửi tiền mặt
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Giao dịch trực tiếp (gặp mặt)
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=Thư chuyển tiền US
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Tiền gửi tiền mặt
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=等待资金充值...
 shared.depositTransactionId=存款交易 ID
 shared.TheBTCBuyer=BTC 买家
 shared.You=您
-shared.reasonForPayment=付款原因
 shared.sendingConfirmation=发送确认...
 shared.sendingConfirmationAgain=请再次发送确认
 shared.exportCSV=导出保存为 .csv
@@ -291,7 +290,8 @@ mainView.version.update=（有更新可用）
 ####################################################################
 
 market.tabs.offerBook=报价列表
-market.tabs.spread=详情
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=行情图
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=买入 BTC（{0}）
 market.spread.numberOfSellOffersColumn=卖出 BTC（{0}）
 market.spread.totalAmountColumn=总共 BTC（{0}）
 market.spread.spreadColumn=差价
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=交易：{0}
-market.trades.tooltip.volumeBar=数量：{0}\n交易序号：{1}\n日期：{2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=打开：
 market.trades.tooltip.candle.close=关闭：
 market.trades.tooltip.candle.high=高：
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=低：
 market.trades.tooltip.candle.average=平均：
 market.trades.tooltip.candle.median=调解员：
 market.trades.tooltip.candle.date=日期：
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=接受的银行所在国家（买家）：\n
 offerbook.availableOffers=可用报价
 offerbook.filterByCurrency=以货币筛选
 offerbook.filterByPaymentMethod=以支付方式筛选
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=账户信息
 offerbook.timeSinceSigning.info=此账户已验证，{0}
 offerbook.timeSinceSigning.info.arbitrator=由仲裁员验证，并可以验证伙伴账户
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=选择手续费币种
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=保证金交易仍未得到确认。这种情况可
 portfolio.pending.step1.openForDispute=保证金交易仍未得到确认。请联系调解员协助。
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=您的交易已经达到至少一个区块链确认。\n（如果需要，您可以等待更多的确认 - 6个确认被认为是非常安全的。）\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=（您可以在关闭该弹出窗口后从主界面复制并粘贴值。）
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=不要在比特币、BTC 或 Bisq 的“付款原因”文本里添加任何提示。
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=以下是 BTC 卖家的交易账户详细信息：\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=请不要忘记添加交易 ID
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=作为“付款原因”，这样接收方可以将您的付款分配给对应的交易。\n
-portfolio.pending.step2_buyer.fees=如果您的银行收取费用，您必须支付这些费用。
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=请从您的外部 {0} 钱包划转\n{1} 到 BTC 卖家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=请使用您的账户购买{0}亚
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=请用“美国邮政汇票”发送 {0} 给 BTC 卖家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=请到您的在线银行网页并支付 {0} 给 BTC 卖家。\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=请通过提供的联系人与 BTC 卖家联系，并安排会议支付 {0}。\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=使用 {0} 开始付款
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=您的交易伙伴已经确认他们已经
 portfolio.pending.step3_seller.altcoin.explorer=在您最喜欢的 {0} 区块链浏览器
 portfolio.pending.step3_seller.altcoin.wallet=在您的 {0} 钱包
 portfolio.pending.step3_seller.altcoin={0} 请检查 {1} 是否交易已经到您的接收地址\n{2}\n已经有足够的区块链确认了\n支付金额必须为 {3}\n\n关闭该弹出窗口后，您可以从主界面复制并粘贴 {4} 地址。
-portfolio.pending.step3_seller.postal={0} 请检查您是否已经从 BTC 买家收到了 {1} “美国邮政汇票”。\n\n交易 ID（“付款原因”文本）是：“{2}”
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=您的交易对象已确认他已启动 {0} 付款\n\n请访问您的网上银行网页，并检查您是否已从 BTC 买家收到 {1}\n\n交易 ID（“付款原因”文本）是：“{2}”\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=因为付款是通过现金存款完成的，BTC 买家必须在纸质收据上写“不退款”，将其撕成2份，并通过电子邮件向您发送照片。\n\n为避免退款风险，请仅确认您是否收到电子邮件，如果您确定收据有效。\n如果您不确定，{0}
 portfolio.pending.step3_seller.moneyGram=买方必须发送授权编码和一张收据的照片。\n收据必须清楚地显示您的全名、城市、国家或地区、数量。如果您收到授权编码，请查收邮件。\n\n关闭弹窗后，您将看到 BTC 买家的姓名和在 MoneyGram 的收款地址。\n\n只有在您成功收到钱之后，再确认收据！
 portfolio.pending.step3_seller.westernUnion=买方必须发送 MTCN（跟踪号码）和一张收据的照片。\n收据必须清楚地显示您的全名、城市、国家或地区、数量。如果您收到 MTCN，请查收邮件。\n\n关闭弹窗后，您将看到 BTC 买家的姓名和在 Western Union 的收款地址。\n\n只有在您成功收到钱之后，再确认收据！
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=您尚未确认付款的收据！\
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=您是否收到了您交易伙伴的 {0} 付款？\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=交易 ID（“付款理由”文本）是“{0}”\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=还请确认您的银行对帐单中的发件人姓名与委托合同中的发件人姓名相符：\n每个交易合约的发送者姓名：{0}\n\n如果名称与此处显示的名称不一致，请不要通过确认付款，而是通过“alt + o”或“option + o”打开纠纷。\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=请注意，一旦您确认收到，冻结交易金额将被发放给 BTC 买家，保证金将被退还。
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=在报价列表中显示我的报价
 setting.preferences.useAnimations=使用动画
 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.resetAllFlags=重置所有“不再提示”的提示
 settings.preferences.languageChange=同意重启请求以更换语言
 settings.preferences.supportLanguageWarning=如有任何争议，请注意调解在 {0} 处理，仲裁在 {1} 处理。
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq ：{0}|节点：{1}
 settings.net.ips=添加逗号分隔的 IP 地址及端口，如使用8333端口可不填写。
 settings.net.seedNode=种子节点
 settings.net.directPeer=节点（直连）
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=节点
 settings.net.inbound=接收数据包
 settings.net.outbound=发送数据包
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=输入密钥进行注册
 
 filterWindow.headline=编辑筛选列表
 filterWindow.offers=筛选报价（用逗号“,”隔开）
-filterWindow.onions=筛选匿名地址（用逗号“,”隔开）
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=筛选交易账户数据：\n格式：逗号分割的 [付款方式ID|数据字段|值]
 filterWindow.bannedCurrencies=筛选货币代码（用逗号“,”隔开）
 filterWindow.bannedPaymentMethods=筛选支付方式 ID（用逗号“,”隔开）
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=交易最低所需要的版本
 filterWindow.add=添加筛选
 filterWindow.remove=移除筛选
 filterWindow.btcFeeReceiverAddresses=比特币手续费接收地址
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=最小 BTC 数量
 offerDetailsWindow.min=（最小 {0}）
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=交易状态
 tradeDetailsWindow.agentAddresses=仲裁员/调解员
 tradeDetailsWindow.detailData=详情数据
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=输入密码解锁
 
 torNetworkSettingWindow.header=Tor 网络设置
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=正在关闭
 popup.shutDownInProgress.msg=关闭应用可能会花一点时间。\n请不要打断关闭过程。
 
 popup.attention.forTradeWithId=交易 ID {0} 需要注意
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=多个支付账户可用
 popup.info.multiplePaymentAccounts.msg=您有多个支付帐户在这个报价中可用。请确你做了正确的选择。
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=更新 Revolut 账户
 
 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.
+
+payment.cashByMail.contact=联系方式
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=联系方式
 payment.f2f.contact.prompt=您希望如何与交易伙伴联系？（电子邮箱、电话号码、…）
 payment.f2f.city=“面对面”会议的城市
 payment.f2f.city.prompt=城市将与报价一同显示
-payment.f2f.optionalExtra=可选的附加信息
+payment.shared.optionalExtra=可选的附加信息
-payment.f2f.extra=附加信息
+payment.shared.extraInfo=附加信息
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=交易方可以定义“条款和条件”或添加公共联系信息。它将与报价一同显示。
 payment.f2f.info=与网上交易相比，“面对面”交易有不同的规则，也有不同的风险。\n\n主要区别是：\n●交易伙伴需要使用他们提供的联系方式交换关于会面地点和时间的信息。\n●交易双方需要携带笔记本电脑，在会面地点确认“已发送付款”和“已收到付款”。\n●如果交易方有特殊的“条款和条件”，他们必须在账户的“附加信息”文本框中声明这些条款和条件。\n●在发生争议时，调解员或仲裁员不能提供太多帮助，因为通常很难获得有关会面上所发生情况的篡改证据。在这种情况下，BTC 资金可能会被无限期锁定，或者直到交易双方达成协议。\n\n为确保您完全理解“面对面”交易的不同之处，请阅读以下说明和建议：“https://docs.bisq.network/trading-rules.html#f2f-trading”
 payment.f2f.info.openURL=打开网页
 payment.f2f.offerbook.tooltip.countryAndCity=国家或地区及城市：{0} /  {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=同银行转账
 SPECIFIC_BANKS=转到指定银行
 US_POSTAL_MONEY_ORDER=美国邮政汇票
 CASH_DEPOSIT=现金/ATM 存款
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=西联汇款
 F2F=面对面（当面交易）
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=美国汇票
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=现金/ATM 存款
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=西联汇款

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

@@ -114,7 +114,6 @@ shared.waitingForFunds=等待資金充值...
 shared.depositTransactionId=存款交易 ID
 shared.TheBTCBuyer=BTC 買家
 shared.You=您
-shared.reasonForPayment=付款原因
 shared.sendingConfirmation=發送確認...
 shared.sendingConfirmationAgain=請再次發送確認
 shared.exportCSV=導出保存為 .csv
@@ -291,7 +290,8 @@ mainView.version.update=（有更新可用）
 ####################################################################
 
 market.tabs.offerBook=報價列表
-market.tabs.spread=詳情
+market.tabs.spreadCurrency=Offers by Currency
+market.tabs.spreadPayment=Offers by Payment Method
 market.tabs.trades=行情圖
 
 # OfferBookChartView
@@ -310,10 +310,11 @@ market.spread.numberOfBuyOffersColumn=買入 BTC（{0}）
 market.spread.numberOfSellOffersColumn=賣出 BTC（{0}）
 market.spread.totalAmountColumn=總共 BTC（{0}）
 market.spread.spreadColumn=差價
+market.spread.expanded=Expanded view
 
 # TradesChartsView
 market.trades.nrOfTrades=交易：{0}
-market.trades.tooltip.volumeBar=數量：{0}\n交易序號：{1}\n日期：{2}
+market.trades.tooltip.volumeBar=Volume: {0} / {1}\nNo. of trades: {2}\nDate: {3}
 market.trades.tooltip.candle.open=打開：
 market.trades.tooltip.candle.close=關閉：
 market.trades.tooltip.candle.high=高：
@@ -321,6 +322,7 @@ market.trades.tooltip.candle.low=低：
 market.trades.tooltip.candle.average=平均：
 market.trades.tooltip.candle.median=調解員：
 market.trades.tooltip.candle.date=日期：
+market.trades.showVolumeInUSD=Show volume in USD
 
 ####################################################################
 # OfferView
@@ -339,6 +341,7 @@ offerbook.offerersAcceptedBankSeats=接受的銀行所在國家（買家）：\n
 offerbook.availableOffers=可用報價
 offerbook.filterByCurrency=以貨幣篩選
 offerbook.filterByPaymentMethod=以支付方式篩選
+offerbook.matchingOffers=Offers matching my accounts
 offerbook.timeSinceSigning=賬户信息
 offerbook.timeSinceSigning.info=此賬户已驗證，{0}
 offerbook.timeSinceSigning.info.arbitrator=由仲裁員驗證，並可以驗證夥伴賬户
@@ -444,7 +447,7 @@ createOffer.tradeFee.descriptionBSQEnabled=選擇手續費幣種
 
 createOffer.triggerPrice.prompt=Set optional trigger price
 createOffer.triggerPrice.label=Deactivate offer if market price is {0}
-createOffer.triggerPrice.tooltip=As protecting against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
+createOffer.triggerPrice.tooltip=As protection against drastic price movements you can set a trigger price which deactivates the offer if the market price reaches that value.
 createOffer.triggerPrice.invalid.tooLow=Value must be higher than {0}
 createOffer.triggerPrice.invalid.tooHigh=Value must be lower than {0}
 
@@ -600,16 +603,11 @@ portfolio.pending.step1.warn=保證金交易仍未得到確認。這種情況可
 portfolio.pending.step1.openForDispute=保證金交易仍未得到確認。請聯繫調解員協助。
 
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2.confReached=您的交易已經達到至少一個區塊鏈確認。\n（如果需要，您可以等待更多的確認 - 6個確認被認為是非常安全的。）\n\n
+portfolio.pending.step2.confReached=Your trade has reached at least one blockchain confirmation.\n\n
 
-portfolio.pending.step2_buyer.copyPaste=（您可以在關閉該彈出窗口後從主界面複製並粘貼值。）
+portfolio.pending.step2_buyer.refTextWarn=Important: when making the payment, leave the \"reason for payment\" field empty. DO NOT put the trade ID or any other text like 'bitcoin', 'BTC', or 'Bisq'. You are free to discuss via trader chat if an alternate \"reason for payment\" would be suitable to you both.
-portfolio.pending.step2_buyer.refTextWarn=不要在比特幣、BTC 或 Bisq 的“付款原因”文本里添加任何提示。
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.accountDetails=以下是 BTC 賣家的交易賬户詳細信息：\n
+portfolio.pending.step2_buyer.fees=If your bank charges you any fees to make the transfer, you are responsible for paying those fees.
-portfolio.pending.step2_buyer.tradeId=請不要忘記添加交易 ID
-# suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.assign=作為“付款原因”，這樣接收方可以將您的付款分配給對應的交易。\n
-portfolio.pending.step2_buyer.fees=如果您的銀行收取費用，您必須支付這些費用。
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.altcoin=請從您的外部 {0} 錢包劃轉\n{1} 到 BTC 賣家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -627,7 +625,9 @@ portfolio.pending.step2_buyer.amazonGiftCard=請使用您的賬户購買{0}亞
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=請用“美國郵政匯票”發送 {0} 給 BTC 賣家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.bank=請到您的在線銀行網頁並支付 {0} 給 BTC 賣家。\n\n
+portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Bisq wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.f2f=請通過提供的聯繫人與 BTC 賣家聯繫，並安排會議支付 {0}。\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=使用 {0} 開始付款
@@ -688,9 +688,11 @@ portfolio.pending.step3_seller.part=您的交易夥伴已經確認他們已經
 portfolio.pending.step3_seller.altcoin.explorer=在您最喜歡的 {0} 區塊鏈瀏覽器
 portfolio.pending.step3_seller.altcoin.wallet=在您的 {0} 錢包
 portfolio.pending.step3_seller.altcoin={0} 請檢查 {1} 是否交易已經到您的接收地址\n{2}\n已經有足夠的區塊鏈確認了\n支付金額必須為 {3}\n\n關閉該彈出窗口後，您可以從主界面複製並粘貼 {4} 地址。
-portfolio.pending.step3_seller.postal={0} 請檢查您是否已經從 BTC 買家收到了 {1} “美國郵政匯票”。\n\n交易 ID（“付款原因”文本）是：“{2}”
+portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.bank=您的交易對象已確認他已啟動 {0} 付款\n\n請訪問您的網上銀行網頁，並檢查您是否已從 BTC 買家收到 {1}\n\n交易 ID（“付款原因”文本）是：“{2}”\n\n
+portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+# suppress inspection "TrailingSpacesInProperty"
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=因為付款是通過現金存款完成的，BTC 買家必須在紙質收據上寫“不退款”，將其撕成2份，並通過電子郵件向您發送照片。\n\n為避免退款風險，請僅確認您是否收到電子郵件，如果您確定收據有效。\n如果您不確定，{0}
 portfolio.pending.step3_seller.moneyGram=買方必須發送授權編碼和一張收據的照片。\n收據必須清楚地顯示您的全名、城市、國家或地區、數量。如果您收到授權編碼，請查收郵件。\n\n關閉彈窗後，您將看到 BTC 買家的姓名和在 MoneyGram 的收款地址。\n\n只有在您成功收到錢之後，再確認收據！
 portfolio.pending.step3_seller.westernUnion=買方必須發送 MTCN（跟蹤號碼）和一張收據的照片。\n收據必須清楚地顯示您的全名、城市、國家或地區、數量。如果您收到 MTCN，請查收郵件。\n\n關閉彈窗後，您將看到 BTC 買家的姓名和在 Western Union 的收款地址。\n\n只有在您成功收到錢之後，再確認收據！
@@ -719,8 +721,6 @@ portfolio.pending.step3_seller.openForDispute=您尚未確認付款的收據！\
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.part1=您是否收到了您交易夥伴的 {0} 付款？\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.onPaymentReceived.fiat=交易 ID（“付款理由”文本）是“{0}”\n\n
-# suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.name=還請確認您的銀行對帳單中的發件人姓名與委託合同中的發件人姓名相符：\n每個交易合約的發送者姓名：{0}\n\n如果名稱與此處顯示的名稱不一致，請不要通過確認付款，而是通過“alt + o”或“option + o”打開糾紛。\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.onPaymentReceived.note=請注意，一旦您確認收到，凍結交易金額將被髮放給 BTC 買家，保證金將被退還。
@@ -1021,6 +1021,8 @@ setting.preferences.showOwnOffers=在報價列表中顯示我的報價
 setting.preferences.useAnimations=使用動畫
 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.resetAllFlags=重置所有“不再提示”的提示
 settings.preferences.languageChange=同意重啟請求以更換語言
 settings.preferences.supportLanguageWarning=如有任何爭議，請注意調解在 {0} 處理，仲裁在 {1} 處理。
@@ -1086,6 +1088,7 @@ settings.net.chainHeight=Bisq ：{0}|節點：{1}
 settings.net.ips=添加逗號分隔的 IP 地址及端口，如使用8333端口可不填寫。
 settings.net.seedNode=種子節點
 settings.net.directPeer=節點（直連）
+settings.net.initialDataExchange={0} [Bootstrapping]
 settings.net.peer=節點
 settings.net.inbound=接收數據包
 settings.net.outbound=發送數據包
@@ -2099,7 +2102,8 @@ enterPrivKeyWindow.headline=輸入密鑰進行註冊
 
 filterWindow.headline=編輯篩選列表
 filterWindow.offers=篩選報價（用逗號“,”隔開）
-filterWindow.onions=篩選匿名地址（用逗號“,”隔開）
+filterWindow.onions=Banned from trading addresses (comma sep.)
+filterWindow.bannedFromNetwork=Banned from network addresses (comma sep.)
 filterWindow.accounts=篩選交易賬户數據：\n格式：逗號分割的 [付款方式ID|數據字段|值]
 filterWindow.bannedCurrencies=篩選貨幣代碼（用逗號“,”隔開）
 filterWindow.bannedPaymentMethods=篩選支付方式 ID（用逗號“,”隔開）
@@ -2120,6 +2124,7 @@ filterWindow.disableTradeBelowVersion=交易最低所需要的版本
 filterWindow.add=添加篩選
 filterWindow.remove=移除篩選
 filterWindow.btcFeeReceiverAddresses=比特幣手續費接收地址
+filterWindow.disableApi=Disable API
 
 offerDetailsWindow.minBtcAmount=最小 BTC 數量
 offerDetailsWindow.min=（最小 {0}）
@@ -2183,6 +2188,12 @@ tradeDetailsWindow.tradeState=交易狀態
 tradeDetailsWindow.agentAddresses=仲裁員/調解員
 tradeDetailsWindow.detailData=Detail data
 
+txDetailsWindow.headline=Transaction Details
+txDetailsWindow.btc.note=You have sent BTC.
+txDetailsWindow.bsq.note=You have sent BSQ funds.  BSQ is colored bitcoin, so the transaction will not show in a BSQ explorer until it has been confirmed in a bitcoin block.
+txDetailsWindow.sentTo=Sent to
+txDetailsWindow.txId=TxId
+
 walletPasswordWindow.headline=輸入密碼解鎖
 
 torNetworkSettingWindow.header=Tor 網絡設置
@@ -2309,6 +2320,7 @@ popup.shutDownInProgress.headline=正在關閉
 popup.shutDownInProgress.msg=關閉應用可能會花一點時間。\n請不要打斷關閉過程。
 
 popup.attention.forTradeWithId=交易 ID {0} 需要注意
+popup.attention.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding the \"reason for payment\" field in bank transfers. Please leave this field empty -- DO NOT use the trade ID as \"reason for payment\" anymore.
 
 popup.info.multiplePaymentAccounts.headline=多個支付賬户可用
 popup.info.multiplePaymentAccounts.msg=您有多個支付帳户在這個報價中可用。請確你做了正確的選擇。
@@ -2645,14 +2657,17 @@ payment.revolut.addUserNameInfo.headLine=更新 Revolut 賬户
 
 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.
+
+payment.cashByMail.contact=聯繫方式
+payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=聯繫方式
 payment.f2f.contact.prompt=您希望如何與交易夥伴聯繫？（電子郵箱、電話號碼、…）
 payment.f2f.city=“面對面”會議的城市
 payment.f2f.city.prompt=城市將與報價一同顯示
-payment.f2f.optionalExtra=可選的附加信息
+payment.shared.optionalExtra=可選的附加信息
-payment.f2f.extra=附加信息
+payment.shared.extraInfo=附加信息
-
+payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.f2f.extra.prompt=交易方可以定義“條款和條件”或添加公共聯繫信息。它將與報價一同顯示。
 payment.f2f.info=與網上交易相比，“面對面”交易有不同的規則，也有不同的風險。\n\n主要區別是：\n●交易夥伴需要使用他們提供的聯繫方式交換關於會面地點和時間的信息。\n●交易雙方需要攜帶筆記本電腦，在會面地點確認“已發送付款”和“已收到付款”。\n●如果交易方有特殊的“條款和條件”，他們必須在賬户的“附加信息”文本框中聲明這些條款和條件。\n●在發生爭議時，調解員或仲裁員不能提供太多幫助，因為通常很難獲得有關會面上所發生情況的篡改證據。在這種情況下，BTC 資金可能會被無限期鎖定，或者直到交易雙方達成協議。\n\n為確保您完全理解“面對面”交易的不同之處，請閲讀以下説明和建議：“https://docs.bisq.network/trading-rules.html#f2f-trading”
 payment.f2f.info.openURL=打開網頁
 payment.f2f.offerbook.tooltip.countryAndCity=國家或地區及城市：{0} /  {1}
@@ -2677,6 +2692,7 @@ SAME_BANK=同銀行轉賬
 SPECIFIC_BANKS=轉到指定銀行
 US_POSTAL_MONEY_ORDER=美國郵政匯票
 CASH_DEPOSIT=現金/ATM 存款
+CASH_BY_MAIL=Cash By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=西聯匯款
 F2F=面對面（當面交易）
@@ -2694,6 +2710,8 @@ US_POSTAL_MONEY_ORDER_SHORT=美國匯票
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=現金/ATM 存款
 # suppress inspection "UnusedProperty"
+CASH_BY_MAIL_SHORT=CashByMail
+# suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=西聯匯款

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

@@ -1,6 +1,6 @@
 TXT CHECKPOINTS 1
 0
-327
+330
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -328,3 +328,6 @@ FMlwaWsoL8M1y3sGAAn3gAAAICD2It4VF1dZC7XR51SjkuBPy2c1ot7iBQAAAAAAAAAAAOto2NUucHcz
 FVin/nTPxZEaUhFJAAn/YADg/zdLnpRRoj5nb9aeuWAA1TG1ZV/ig3PhBQAAAAAAAAAAAP7jjrVesvd94nsFrp03Zj496k0mgpUa+z2F/FaP1R7omhShXzPEEBcdNBS1
 FdDmSXs4LVrTs1CaAAoHQAAAACDvuQVfiWazEOmUBkUubcV9HD6bQ4YDCQAAAAAAAAAAAIpAWQyuvdv0i6cfyxgL/cqONcYtUdP6eDTQOlOgmOc5h7CyX93+DxdiV5Q4
 Fk7wqQvRa3I8HIU0AAoPIAAAACClMk0cUuhV+1lsN2AW0bLOzyOjOxhvBAAAAAAAAAAAAHvW0itHeUSYGKmni03ZQ4CQz/twR/T8aM+iCLhkzgVuGaXDX1axDheZrIxe
+FtgmMCmxHYDfZVDnAAoXAADg/ydUahAkyDODrqzZ/A9vg1WNyOWPKEjSBgAAAAAAAAAAAIF1YVHIYoFF9C7GrkXnuXeYn2j+2cNXhc5hrQ9iuMiyW5nWX3ITDxcvOs69
+F13fK/nssCNHFGj5AAoe4AAAQCDp4pHELBlNIcdX51i41BvbBjtbfHsECgAAAAAAAAAAAIcgs1NcVR2veWwlmJK7rkICXTqwbukwNfe5scvzGUskkCDpXxciDxc/NQHe
+F+MYpAKDBczv4JWTAAomwAAAACBS1/Bd73vGgmzadPW9r4Vf4TzSyKulDgAAAAAAAAAAALu0Rd+bUPZVV1LffkjQnE9dvY5cjr8wr/G1X47UTZ6Atcr5X6GoDRcUdkaH

desktop/package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.5.4-SNAPSHOT
+ENV version 1.5.5-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.4-SNAPSHOT
+version=1.5.5-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.4-SNAPSHOT
+version=1.5.5-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.4</string>
+        <string>1.5.5</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>1.5.4</string>
+        <string>1.5.5</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>
@@ -26,7 +26,7 @@
         <string>public.app-category.finance</string>
 
         <key>NSHumanReadableCopyright</key>
-        <string>Copyright © 2013-2020 - The Bisq developers</string>
+        <string>Copyright © 2013-2021 - The Bisq developers</string>
 
          <!-- Only supported in older OSX versions.
               See: https://github.com/bitcoin/bitcoin/issues/11896#issuecomment-352148399-->

desktop/package/macosx/copy_dbs.sh

@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version="1.5.2"
+version="1.5.5"
 
 # 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.4-SNAPSHOT"
+version="1.5.5-SNAPSHOT"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar

desktop/package/macosx/finalize.sh

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

desktop/package/macosx/insert_snapshot_version.sh

@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.5.4
+version=1.5.5
 
 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.3
+oldVersion=1.5.4
-newVersion=1.5.4
+newVersion=1.5.5
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

desktop/package/windows/package.bat

@@ -11,7 +11,7 @@
 
 @echo off
 
-set version=1.5.4-SNAPSHOT
+set version=1.5.5-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.4-SNAPSHOT
+set version=1.5.5-SNAPSHOT
 set release_dir=%~dp0..\..\..\releases\%version%
 set package_dir=%~dp0..
 

relay/src/main/resources/version.txt

@@ -1 +1 @@
-1.5.4-SNAPSHOT
+1.5.5-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.4";
+    private static final String VERSION = "1.5.5";
     private SeedNode seedNode;
     private Timer checkConnectionLossTime;