Merging messages from proposal bisq-network#110 messages with HEAD.

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

@@ -62,6 +62,10 @@ shared.priceWithCur=Price in {0}
 shared.priceInCurForCur=Price in {0} for 1 {1}
 shared.fixedPriceInCurForCur=Fixed price in {0} for 1 {1}
 shared.amount=Amount
+shared.txFee=Transaction Fee
+shared.makerFee=Maker Fee
+shared.buyerSecurityDeposit=Buyer Deposit
+shared.sellerSecurityDeposit=Seller Deposit
 shared.amountWithCur=Amount in {0}
 shared.volumeWithCur=Volume in {0}
 shared.currency=Currency
@@ -324,7 +328,7 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with
 mainView.footer.btcInfo.synchronizedWith=Synchronized with
 mainView.footer.btcInfo.connectingTo=Connecting to
 mainView.footer.btcInfo.connectionFailed=connection failed
-mainView.footer.p2pInfo=P2P network peers: {0}
+mainView.footer.p2pInfo=Bisq network peers: {0}
 mainView.footer.daoFullNode=DAO full node
 
 mainView.bootstrapState.connectionToTorNetwork=(1/4) Connecting to Tor network...
@@ -334,10 +338,10 @@ mainView.bootstrapState.initialDataReceived=(4/4) Initial data received
 
 mainView.bootstrapWarning.noSeedNodesAvailable=No seed nodes available
 mainView.bootstrapWarning.noNodesAvailable=No seed nodes and peers available
-mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to P2P network failed
+mainView.bootstrapWarning.bootstrappingToP2PFailed=Bootstrapping to Bisq network failed
 
 mainView.p2pNetworkWarnMsg.noNodesAvailable=There are no seed nodes or persisted peers available for requesting data.\nPlease check your internet connection or try to restart the application.
-mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the P2P network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application.
+mainView.p2pNetworkWarnMsg.connectionToP2PFailed=Connecting to the Bisq network failed (reported error: {0}).\nPlease check your internet connection or try to restart the application.
 
 mainView.walletServiceErrorMsg.timeout=Connecting to the Bitcoin network failed because of a timeout.
 mainView.walletServiceErrorMsg.connectionError=Connection to the Bitcoin network failed because of an error: {0}
@@ -580,7 +584,7 @@ takeOffer.failed.offerTaken=You cannot take that offer because the offer was alr
 takeOffer.failed.offerRemoved=You cannot take that offer because the offer has been removed in the meantime.
 takeOffer.failed.offererNotOnline=Take offer request failed because maker is not online anymore.
 takeOffer.failed.offererOffline=You cannot take that offer because the maker is offline.
-takeOffer.warning.connectionToPeerLost=You lost connection to the maker.\nHe might have gone offline or has closed the connection to you because of too many open connections.\n\nIf you can still see his offer in the offerbook you can try to take the offer again.
+takeOffer.warning.connectionToPeerLost=You lost connection to the maker.\nThey might have gone offline or has closed the connection to you because of too many open connections.\n\nIf you can still see their offer in the offerbook you can try to take the offer again.
 
 takeOffer.error.noFundsLost=\n\nNo funds have left your wallet yet.\nPlease try to restart your application and check your network connection to see if you can resolve the issue.
 takeOffer.error.feePaid=\n\nPlease try to restart your application and check your network connection to see if you can resolve the issue.
@@ -683,7 +687,21 @@ portfolio.pending.step2_seller.waitPayment.headline=Wait for payment
 portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
 portfolio.pending.step2_seller.waitPayment.msg=The deposit transaction has at least one blockchain confirmation.\nYou need to wait until the BTC buyer starts the {0} payment.
 portfolio.pending.step2_seller.warn=The BTC buyer still has not done the {0} payment.\nYou need to wait until they have started the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate.
-portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started his payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute.
+portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute.
+
+tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}''
+tradeChat.openChat=Open chat window
+tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade.\n\
+  It is not mandatory to reply in the chat.\n\
+  If a trader violates the below rules, open a dispute with 'Cmd/Ctrl + o' and report it to the arbitrator.\n\n\
+  Chat rules:\n\
+  \t● Do not send any links (risk of malware). You can send the transaction ID and the name of a block explorer.\n\
+  \t● Do not send your seed words, private keys, passwords or other sensitive information!\n\
+  \t● Do not encourage trading outside of Bisq (no security).\n\
+  \t● Do not engage in any form of social engineering scam attempts.\n\
+  \t● If a peer is not responding and prefers to not communicate via chat, respect their decision.\n\
+  \t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or trollbox.\n\
+  \t● Keep conversation friendly and respectful.
 
 # suppress inspection "UnusedProperty"
 message.state.UNDEFINED=Undefined
@@ -805,7 +823,7 @@ portfolio.pending.disputeOpened=Dispute opened
 portfolio.pending.openSupport=Open support ticket
 portfolio.pending.supportTicketOpened=Support ticket opened
 portfolio.pending.requestSupport=Request support
-portfolio.pending.error.requestSupport=Please report the problem to your arbitrator.\n\nHe will forward the information to the developers to investigate the problem.\nAfter the problem has been analyzed you will get back all locked funds.
+portfolio.pending.error.requestSupport=Please report the problem to your arbitrator.\n\nThey will forward the information to the developers to investigate the problem.\nAfter the problem has been analyzed you will get back all locked funds.
 portfolio.pending.communicateWithArbitrator=Please communicate in the \"Support\" screen with the arbitrator.
 portfolio.pending.supportTicketOpenedMyUser=You opened already a support ticket.\n{0}
 portfolio.pending.disputeOpenedMyUser=You opened already a dispute.\n{0}
@@ -911,7 +929,7 @@ support.filter=Filter list
 support.filter.prompt=Enter trade ID, date, onion address or account data
 support.noTickets=There are no open tickets
 support.sendingMessage=Sending Message...
-support.receiverNotOnline=Receiver is not online. Message is saved to his mailbox.
+support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox.
 support.sendMessageError=Sending message failed. Error: {0}
 support.wrongVersion=The offer in that dispute has been created with an older version of Bisq.\n\
 You cannot close that dispute with your version of the application.\n\n\
@@ -923,7 +941,7 @@ support.attachment=Attachment
 support.tooManyAttachments=You cannot send more than 3 attachments in one message.
 support.save=Save file to disk
 support.messages=Messages
-support.input.prompt=Please enter here your message to the arbitrator
+support.input.prompt=Enter message...
 support.send=Send
 support.addAttachments=Add attachments
 support.closeTicket=Close ticket
@@ -1014,6 +1032,7 @@ setting.preferences.addAltcoin=Add altcoin
 setting.preferences.displayOptions=Display options
 setting.preferences.showOwnOffers=Show my own offers in offer book
 setting.preferences.useAnimations=Use animations
+setting.preferences.useDarkMode=Use dark mode (beta)
 setting.preferences.sortWithNumOffers=Sort market lists with no. of offers/trades
 setting.preferences.resetAllFlags=Reset all \"Don't show again\" flags
 setting.preferences.reset=Reset
@@ -1023,7 +1042,7 @@ settings.preferences.selectCurrencyNetwork=Select network
 setting.preferences.daoOptions=DAO options
 setting.preferences.dao.resync.label=Rebuild DAO state from genesis tx
 setting.preferences.dao.resync.button=Resync
-setting.preferences.dao.resync.popup=After an application restart the P2P network governance data will be reloaded from \
+setting.preferences.dao.resync.popup=After an application restart the Bisq network governance data will be reloaded from \
   the seed nodes and the BSQ consensus state will be rebuilt from the genesis transaction.
 setting.preferences.dao.isDaoFullNode=Run Bisq as DAO full node
 setting.preferences.dao.rpcUser=RPC username
@@ -1036,7 +1055,7 @@ setting.preferences.dao.fullNodeInfo.ok=Open docs page
 setting.preferences.dao.fullNodeInfo.cancel=No, I stick with lite node mode
 
 settings.net.btcHeader=Bitcoin network
-settings.net.p2pHeader=P2P network
+settings.net.p2pHeader=Bisq network
 settings.net.onionAddressLabel=My onion address
 settings.net.btcNodesLabel=Use custom Bitcoin Core nodes
 settings.net.bitcoinPeersLabel=Connected peers
@@ -1133,9 +1152,9 @@ account.arbitratorRegistration.register=Register arbitrator
 account.arbitratorRegistration.revoke=Revoke registration
 account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=You need to set at least 1 language.\nWe added the default language for you.
-account.arbitratorRegistration.removedSuccess=You have successfully removed your arbitrator from the P2P network.
+account.arbitratorRegistration.removedSuccess=You have successfully removed your arbitrator from the Bisq network.
 account.arbitratorRegistration.removedFailed=Could not remove arbitrator.{0}
-account.arbitratorRegistration.registerSuccess=You have successfully registered your arbitrator to the P2P network.
+account.arbitratorRegistration.registerSuccess=You have successfully registered your arbitrator to the Bisq network.
 account.arbitratorRegistration.registerFailed=Could not register arbitrator.{0}
 
 account.arbitratorSelection.minOneArbitratorRequired=You need to set at least 1 language.\nWe added the default language for you.
@@ -1144,7 +1163,7 @@ account.arbitratorSelection.whichDoYouAccept=Which arbitrators do you accept
 account.arbitratorSelection.autoSelect=Auto select all arbitrators with matching language
 account.arbitratorSelection.regDate=Registration date
 account.arbitratorSelection.languages=Languages
-account.arbitratorSelection.cannotSelectHimself=An arbitrator cannot select himself for trading.
+account.arbitratorSelection.cannotSelectHimself=An arbitrator cannot select themselves for trading.
 account.arbitratorSelection.noMatchingLang=No matching language.
 account.arbitratorSelection.noLang=You can only select arbitrators who are speaking at least 1 common language.
 account.arbitratorSelection.minOne=You need to have at least one arbitrator selected.
@@ -1194,6 +1213,29 @@ arbitrator in case of a dispute.\n\n\
 There is no payment ID required, just the normal public address.\n\
 If you are not sure about that process visit (https://www.getmonero.org/resources/user-guides/prove-payment.html) \
 or the Monero forum (https://forum.getmonero.org) to find more information.
+account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill \
+the following requirements:\n\n\
+For sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the \
+store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as \
+that would be required in case of a dispute.\n\
+masari-wallet-cli (use the command get_tx_key)\n\
+masari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\n\
+Masari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\n
+Verification can be accomplished in-wallet.\n\
+masari-wallet-cli : using command (check_tx_key).\n\
+masari-wallet-gui : on the Advanced > Prove/Check page.\n\
+Verification can be accomplished in the block explorer \n\
+Open block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\n\
+Once transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\n\
+You need to provide the arbitrator the following data in case of a dispute:\n\
+- The tx private key\n\
+- The transaction hash\n\
+- The recipient's public address\n\n\
+Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \
+dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the \
+arbitrator in case of a dispute.\n\n\
+There is no payment ID required, just the normal public address.\n\
+If you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs).
 account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
 To send BLUR you must use the Blur Network CLI or GUI Wallet. \n\n\
@@ -1209,6 +1251,18 @@ transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\n\
 Failure to provide the required information to the arbitrator will result in losing the dispute case. In all cases of dispute, the \
 BLUR sender bears 100% of the burden of responsibility in verifying transactions to an arbitrator. \n\n\
 If you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
+account.altcoin.popup.solo.msg=Trading Solo on Bisq requires that you understand and fulfill \
+the following requirements:\n\n\
+To send Solo you must use the Solo Network CLI Wallet. \n\n\
+If you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save \
+this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the \
+transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\n\
+In the event that arbitration is necessary, you must present the following to an arbitrator: 1.) the transaction ID, \
+2.) the transaction private key, and 3.) the recipient's address.  The arbitrator will then verify the Solo \
+transfer using the Solo Block Explorer by searching for the transaction and then using the "Prove sending" function (https://explorer.minesolo.com/).\n\n\
+failure to provide the required information to the arbitrator will result in losing the dispute case. In all cases of dispute, the \
+Solo sender bears 100% of the burden of responsibility in verifying transactions to an arbitrator. \n\n\
+If you do not understand these requirements, do not trade on Bisq. First, seek help at the Solo Network Discord (https://discord.minesolo.com/).
 account.altcoin.popup.cash2.msg=Trading CASH2 on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
 To send CASH2 you must use the Cash2 Wallet version 3 or higher. \n\n\
@@ -1568,7 +1622,7 @@ dao.results.cycle.value.postFix.isDefaultValue=(default value)
 dao.results.cycle.value.postFix.hasChanged=(has been changed in voting)
 
 dao.results.invalidVotes=We had invalid votes in that voting cycle. That can happen if a vote was \
-  not distributed well in the P2P network.\n{0}
+  not distributed well in the Bisq network.\n{0}
 
 # suppress inspection "UnusedProperty"
 dao.phase.PHASE_UNDEFINED=Undefined
@@ -2057,6 +2111,8 @@ dao.monitor.daoState.utxoConflicts=UTXO conflicts
 dao.monitor.daoState.utxoConflicts.blockHeight=Block height: {0}
 dao.monitor.daoState.utxoConflicts.sumUtxo=Sum of all UTXO: {0} BSQ
 dao.monitor.daoState.utxoConflicts.sumBsq=Sum of all BSQ: {0} BSQ
+dao.monitor.daoState.checkpoint.popup=DAO state is not in sync with the network. \
+  After restart the DAO state will resync.
 
 dao.monitor.proposal.headline=Proposals state
 dao.monitor.proposal.table.headline=Chain of proposal state hashes
@@ -2530,6 +2586,7 @@ list.currency.editList=Edit currency list
 
 table.placeholder.noItems=Currently there are no {0} available
 table.placeholder.noData=Currently there is no data available
+table.placeholder.processingData=Processing data...
 
 
 peerInfoIcon.tooltip.tradePeer=Trading peer's
@@ -2647,8 +2704,6 @@ password.forgotPassword=Forgot password?
 password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\
   It is highly recommended to make a backup of the application directory and write down your seed words before setting a password!
 password.backupWasDone=I have already done a backup
-confirm.tooLong=Password confirmation must be less than 500 characters.
-confirm.noMatch=Password confirmation did not match.
 
 seed.seedWords=Wallet seed words
 seed.enterSeedWords=Enter wallet seed words
@@ -2836,9 +2891,13 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ
   To be sure you fully understand the differences with 'Face to Face' trades please read the instructions and \
   recommendations at: 'https://docs.bisq.network/trading-rules.html#f2f-trading'
 payment.f2f.info.openURL=Open web page
-payment.f2f.offerbook.tooltip.countryAndCity=County and city: {0} / {1}
+payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1}
 payment.f2f.offerbook.tooltip.extra=Additional information: {0}
 
+payment.japan.bank=Bank
+payment.japan.branch=Branch
+payment.japan.account=Account
+payment.japan.recipient=Name
 
 # We use constants from the code so we do not use our normal naming convention
 # dynamic values are not recognized by IntelliJ
@@ -2852,6 +2911,7 @@ CASH_DEPOSIT=Cash Deposit
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face to face (in person)
+JAPAN_BANK=Japan Zengin Furikomi
 
 # suppress inspection "UnusedProperty"
 NATIONAL_BANK_SHORT=National banks
@@ -2869,6 +2929,8 @@ MONEY_GRAM_SHORT=MoneyGram
 WESTERN_UNION_SHORT=Western Union
 # suppress inspection "UnusedProperty"
 F2F_SHORT=F2F
+# suppress inspection "UnusedProperty"
+JAPAN_BANK_SHORT=Japan Furikomi
 
 # Do not translate brand names
 # suppress inspection "UnusedProperty"
@@ -3034,3 +3096,9 @@ validation.mustBeDifferent=Your input must be different from the current value
 validation.cannotBeChanged=Parameter cannot be changed
 validation.numberFormatException=Number format exception {0}
 validation.mustNotBeNegative=Input must not be negative
+validation.phone.missingCountryCode=Need two letter country code to validate phone number
+validation.phone.invalidCharacters=Phone number {0} contains invalid characters
+validation.phone.insufficientDigits=Not enough digits in {0} for a valid phone number
+validation.phone.tooManyDigits=Too many digits in {0} to be a valid phone number
+validation.phone.invalidDialingCode=Country dialing code in number {0} is invalid for country {1}.  \
+  The correct dialing code is {2}.