edit some text and remove strings of removed entries

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

@@ -602,7 +602,7 @@ portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} i
   ● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\n\
   Contact Haveno support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists.
 
-portfolio.pending.step1.waitForConf=Wait for blockchain confirmation
+portfolio.pending.step1.waitForConf=Wait for blockchain confirmations
 portfolio.pending.step2_buyer.startPayment=Start payment
 portfolio.pending.step2_seller.waitPaymentStarted=Wait until payment has started
 portfolio.pending.step3_buyer.waitPaymentArrived=Wait until payment arrived
@@ -639,13 +639,13 @@ portfolio.pending.autoConf.state.ERROR=An error at a service request occurred. N
 # suppress inspection "UnusedProperty"
 portfolio.pending.autoConf.state.FAILED=A service returned with a failure. No auto-confirm possible.
 
-portfolio.pending.step1.info=Deposit transaction has been published.\n{0} need to wait for at least one blockchain confirmation before starting the payment.
+portfolio.pending.step1.info=Deposit transaction has been published.\n{0} need to wait for 10 confirmations (about 20 minutes) before the payment can start.
 portfolio.pending.step1.warn=The deposit transaction is still not confirmed. This sometimes happens in rare cases when the funding fee of one trader from an external wallet was too low.
 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=Your trade has reached at least one blockchain confirmation.\n\n
+portfolio.pending.step2.confReached=Your trade has reached 10 confirmations.\n\n
 
 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 'Haveno'. \
@@ -719,7 +719,7 @@ portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32
 portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway
 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 XMR buyer starts the {0} payment.
+portfolio.pending.step2_seller.waitPayment.msg=The deposit transaction is unlocked.\nYou need to wait until the XMR buyer starts the {0} payment.
 portfolio.pending.step2_seller.warn=The XMR 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 XMR 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 mediator for assistance.
 disputeChat.chatWindowTitle=Dispute chat window for trade with ID ''{0}''
@@ -840,12 +840,10 @@ portfolio.pending.step5_buyer.paid=You have paid
 portfolio.pending.step5_seller.sold=You have sold
 portfolio.pending.step5_seller.received=You have received
 
-tradeFeedbackWindow.title=Congratulations on completing your trade
+tradeFeedbackWindow.title=Your trade is succesfully completed!
-tradeFeedbackWindow.msg.part1=We'd love to hear back from you about your experience. It'll help us to improve the software \
+tradeFeedbackWindow.msg.part1=We'd love to hear back from you about your experience.
-  and to smooth out any rough edges. If you'd like to provide feedback, please fill out this short survey \
+tradeFeedbackWindow.msg.part2=If you have any questions, or experienced any problems, please get in touch with other users and contributors in our [Matrix chatroom](https://matrix.to/#/#haveno:haveno.network):
-  (no registration required) at:
+tradeFeedbackWindow.msg.part3=Thanks for testing Haveno with us!
-tradeFeedbackWindow.msg.part2=If you have any questions, or experienced any problems, please get in touch with other users and contributors via the Haveno forum at:
-tradeFeedbackWindow.msg.part3=Thanks for using Haveno!
 
 portfolio.pending.role=My role
 portfolio.pending.tradeInformation=Trade information
@@ -855,11 +853,9 @@ portfolio.pending.tradePeriodInfo=After the first blockchain confirmation, the t
 portfolio.pending.tradePeriodWarning=If the period is exceeded both traders can open a dispute.
 portfolio.pending.tradeNotCompleted=Trade not completed in time (until {0})
 portfolio.pending.tradeProcess=Trade process
-portfolio.pending.stillNotResolved=If your issue remains unsolved, you can request support in our [Matrix chatroom](https://bisq.chat).\n\n\
+portfolio.pending.stillNotResolved=If your issue remains unsolved, you can request support in our [Matrix chatroom](https://matrix.to/#/#haveno:haveno.network).
-  Also see [trading rules](https://bisq.wiki/Trading_rules) and [dispute resolution](https://bisq.wiki/Dispute_resolution) for reference.
+
-portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the mediator or arbitrator arrived \
+portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the arbitrator arrived (e.g. if you did not get a response after 1 day) feel free to contact the team.
-  (e.g. if you did not get a response after 1 day) feel free to open a dispute again with Cmd/Ctrl+o. You can also ask \
-  for additional help on the Haveno forum at [HYPERLINK:https://bisq.community].
 portfolio.pending.openAgainDispute.button=Open dispute again
 portfolio.pending.openSupportTicket.headline=Open support ticket
 portfolio.pending.openSupportTicket.msg=Please use this function only in emergency cases if you don't see a \
@@ -1370,16 +1366,6 @@ setting.about.shortcuts.sendFilter=Set Filter (privileged activity)
 setting.about.shortcuts.sendPrivateNotification=Send private notification to peer (privileged activity)
 setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0}
 
-setting.info.headline=New XMR auto-confirm Feature
-setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of \
-  XMR was sent to your wallet so that Haveno can automatically mark the trade as complete, making trades quicker for everyone.\n\n\
-  Auto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided \
-  by the XMR sender. By default, Haveno uses explorer nodes run by Haveno contributors, but we recommend running your \
-  own XMR explorer node for maximum privacy and security.\n\n\
-  You can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required \
-  confirmations here in Settings.\n\n\
-  See more details (including how to set up your own explorer node) on the Haveno wiki \
-  [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades]
 ####################################################################
 # Account
 ####################################################################
@@ -1388,16 +1374,6 @@ account.tab.arbitratorRegistration=Arbitrator registration
 account.tab.mediatorRegistration=Mediator registration
 account.tab.refundAgentRegistration=Refund agent registration
 account.tab.signing=Signing
-account.info.headline=Welcome to your Haveno Account
-account.info.msg=Here you can add trading accounts for national currencies & altcoins and create a backup of your wallet & account data.\n\n\
-A new Monero wallet was created the first time you started Haveno.\n\n\
-We strongly recommend that you write down your Monero wallet seed words (see tab on the top) and consider adding a \
-  password before funding. Monero deposits and withdrawals are managed in the \"Funds\" section.\n\n\
-Privacy & security note: \
-because Haveno is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no \
-  access to your personal info, your funds, or even your IP address. Data such as bank account numbers, \
-  altcoin & Monero addresses, etc are only shared with your trading partner to fulfill trades you initiate \
-  (in case of a dispute the mediator or arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=National currency accounts
 account.menu.altCoinsAccountView=Altcoin accounts
@@ -2074,12 +2050,6 @@ error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade wit
   Please restart the application to clean up the closed trades list.
 
 popup.warning.walletNotInitialized=The wallet is not initialized yet
-popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application \
-  (Haveno uses Java) causes a popup warning in macOS ('Haveno would like to receive keystrokes from any application').\n\n\
-  To avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> \
-  'Input Monitoring' and Remove 'Haveno' from the list on the right side.\n\n\
-  Haveno will upgrade to a newer Java version to avoid that issue as soon the technical limitations \
-  (Java packager for the required Java version is not shipped yet) are resolved.
 popup.warning.wrongVersion=You probably have the wrong Haveno version for this computer.\n\
 Your computer''s architecture is: {0}.\n\
 The Haveno binary you installed is: {1}.\n\
@@ -2153,12 +2123,6 @@ popup.warning.openOfferWithInvalidMakerFeeTx=The maker fee transaction for offer
   Please go to \"Settings/Network info\" and do a SPV resync.\n\
   For further help please contact the Haveno support channel at the Haveno Keybase team.
 
-popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security \
-deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's \
-refunded to you.\n\nPlease note: if you're creating a new offer, Haveno needs to be running for another trader to take \
-it. To keep your offers online, keep Haveno running and make sure this computer remains online too (i.e., make sure it \
-doesn't switch to standby mode...monitor standby is fine).
-
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\n\
   The bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
 popup.info.cashDepositInfo.confirm=I confirm that I can make the deposit
@@ -2179,9 +2143,6 @@ popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO sta
 
 popup.privateNotification.headline=Important private notification!
 
-popup.securityRecommendation.headline=Important security recommendation
-popup.securityRecommendation.msg=We would like to remind you to consider using password protection for your wallet if you have not already enabled that.\n\nIt is also highly recommended to write down the wallet seed words. Those seed words are like a master password for recovering your Monero wallet.\nAt the \"Wallet Seed\" section you find more information.\n\nAdditionally you should backup the complete application data folder at the \"Backup\" section.
-
 popup.bitcoinLocalhostNode.msg=Haveno detected a Monero node running on this machine (at localhost).\n\n\
   Please ensure:\n\
   - the node is fully synced before starting Haveno\n\
@@ -2192,9 +2153,9 @@ popup.shutDownInProgress.headline=Shut down in progress
 popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.
 
 popup.attention.forTradeWithId=Attention required for trade with ID {0}
-popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers \
+popup.attention.newFeatureDuplicateOffer=Welcome to the Haveno test instance!\n\n\
-  by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. \
+This platform allows you to test Haveno's protocol. The user interface is still very rough and some parts are not yet implemented or stable. We suggest to test only the basic functions, like opening or taking a trade. Make sure to follow the instructions[HYPERLINK:https://github.com/haveno-dex/haveno/blob/master/docs/installing.md].\n\n\
-  This is useful for traders who frequently make the same offer.
+If you encounter any problem, please let us know by opening an issue[HYPERLINK:https://github.com/haveno-dex/haveno/issues/new].
 
 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.
@@ -2244,7 +2205,7 @@ notification.trade.headline=Notification for trade with ID {0}
 notification.ticket.headline=Support ticket for trade with ID {0}
 notification.trade.completed=The trade is now completed and you can withdraw your funds.
 notification.trade.accepted=Your offer has been accepted by a XMR {0}.
-notification.trade.confirmed=Your trade has at least one blockchain confirmation.\nYou can start the payment now.
+notification.trade.confirmed=Your trade has been confirmed.\nYou can start the payment now.
 notification.trade.paymentStarted=The XMR buyer has started the payment.
 notification.trade.selectTrade=Select trade
 notification.trade.peerOpenedDispute=Your trading peer has opened a {0}.
@@ -2582,18 +2543,6 @@ payment.accountType=Account type
 payment.checking=Checking
 payment.savings=Savings
 payment.personalId=Personal ID
-payment.makeOfferToUnsignedAccount.warning=With the recent rise in XMR price, beware that selling {0} or less incurs higher risk than before.\n\n\
-It is highly recommended to either:\n\
-- make offers >{0} XMR, so you only deal with signed/trusted buyers\n\
-- keep any offers to sell <{0} to around ~100 USD in value, as this value has (historically) discouraged scammers\n\n\
-Haveno developers are working on better ways to secure the payment account model for such smaller trades. \
-  Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339].
-payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling {0} or less incurs higher risk than before.\n\n\
-It is highly recommended to either:\n\
-- take offers from signed buyers only\n\
-- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\n\
-Haveno developers are working on better ways to secure the payment account model for such smaller trades. \
-  Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339].
 payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n\
   1. Check this page to see if (and how) your bank works with Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n\
   2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n\