From 1739034b3d88b10ca89860ce920162d584072e31 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Mon, 10 Dec 2018 18:04:27 -0500 Subject: [PATCH 1/2] Refine various ui strings --- .../resources/i18n/displayStrings.properties | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 66831747a51..8def811b7c7 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -556,7 +556,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Yes, I have started the payment 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 he starts the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate. +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. # suppress inspection "UnusedProperty" @@ -807,26 +807,26 @@ support.buyerOfferer=BTC buyer/Maker support.sellerOfferer=BTC seller/Maker support.buyerTaker=BTC buyer/Taker support.sellerTaker=BTC seller/Taker -support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\n\ +support.backgroundInfo=Bisq is not a company and does not guarantee customer support.\n\n\ If there are disputes in the trade process (e.g. one trader does not follow the trade protocol) \ the application will display an \"Open dispute\" button after the trade period is over \ -for contacting the arbitrator.\n\ -If there is an issue with the application, the software will try to detect this and, if possible, display \ +for contacting the arbitrator.\n\n\ +If there is an issue with the application, the software will try to detect it and, if possible, display \ an \"Open support ticket\" button to contact the arbitrator who will forward the issue \ to the developers.\n\n\ If you are having an issue and did not see the \"Open support ticket\" button, \ -you can open a support ticket manually by selecting the trade which causes the problem \ -under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". \ -Please use that only if you are sure that the software is not working as expected. \ -If you have problems or questions, please review the FAQ at the \ -bisq.network web page or post in the Bisq forum at the support section. +you can open a support ticket manually by selecting the trade causing issues \ +under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". \ +Please use this method only if you are sure that the software is not working as expected. \ +If you have problems or questions, please review the FAQ on the \ +bisq.network web page or post in the Bisq forum in the Support section. support.initialInfo=Please note the basic rules for the dispute process:\n\ -1. You need to respond to the arbitrators requests in between 2 days.\n\ -2. The maximum period for the dispute is 14 days.\n\ -3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n\ +1. You need to respond to the arbitrator's requests within 2 days.\n\ +2. The maximum period for a dispute is 14 days.\n\ +3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n\ 4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\n\ -Please read more in detail about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system +Please read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system support.systemMsg=System message: {0} support.youOpenedTicket=You opened a request for support. support.youOpenedDispute=You opened a request for a dispute.\n\n{0} @@ -899,11 +899,11 @@ settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are e settings.net.warn.usePublicNodes.useProvided=No, use provided nodes settings.net.warn.usePublicNodes.usePublic=Yes, use public network settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\n\ - Connecting to nodes which are not following the Bitcoin Core consensus rules could screw up your wallet and cause problems in the trade process.\n\n\ - Users who connect to nodes that violate consensus rules are responsible for any damage created by that. \ - Disputes caused by that would be decided in favor of the other peer. No technical support will be given \ - to users who ignore our warning and protection mechanisms! -settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you get connected exclusively to that.) + Connecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\n\ + Users who connect to nodes that violate consensus rules are responsible for any resulting damage. \ + Any resulting disputes will be decided in favor of the other peer. No technical support will be given \ + to users who ignore this warning and protection mechanisms! +settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.) settings.net.p2PPeersLabel=Connected peers settings.net.onionAddressColumn=Onion address settings.net.creationDateColumn=Established @@ -926,18 +926,18 @@ settings.net.inbound=inbound settings.net.outbound=outbound settings.net.reSyncSPVChainLabel=Resync SPV chain settings.net.reSyncSPVChainButton=Delete SPV file and resync -settings.net.reSyncSPVSuccess=The SPV chain file will be deleted at the next startup. You need to restart your application now.\n\n\ -After the restart it can take a while for resyncing with the network and you will only see all transactions once the resync is completed.\n\nPlease make another restart after the resync has completed because there are sometimes inconsistencies leading to incorrect balance display. -settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please have patience, it can take a while when resyncing with the network. +settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\n\ +After 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\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display. +settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network. settings.net.reSyncSPVAfterRestartCompleted=The resync is now completed. Please restart the application. settings.net.reSyncSPVFailed=Could not delete SPV chain file.\nError: {0} setting.about.aboutBisq=About Bisq -setting.about.about=Bisq is an open source project and a decentralized network of users who want to exchange bitcoin with national currencies or alternative crypto currencies in a privacy protecting way. Learn more about Bisq on our project web page. +setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page. setting.about.web=Bisq web page setting.about.code=Source code setting.about.agpl=AGPL License setting.about.support=Support Bisq -setting.about.def=Bisq is not a company but a community project and open for participation. If you want to participate or support Bisq please follow the links below. +setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below. setting.about.contribute=Contribute setting.about.donate=Donate setting.about.providers=Data providers @@ -959,11 +959,11 @@ setting.about.subsystems.val=Network version: {0}; P2P message version: {1}; Loc account.tab.arbitratorRegistration=Arbitrator registration account.tab.account=Account account.info.headline=Welcome to your Bisq Account -account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\n\ -An empty Bitcoin wallet was created the first time you started Bisq.\n\ -We recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\ -Privacy & Security:\n\ -Bisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer). +account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\n\ +A new Bitcoin wallet was created the first time you started Bisq.\n\n\ +We strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\ +Privacy & security note: \ +because Bisq 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 & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer). account.menu.paymentAccount=National currency accounts account.menu.altCoinsAccountView=Altcoin accounts @@ -976,7 +976,7 @@ account.arbitratorRegistration.pubKey=Public key 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.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.removedFailed=Could not remove arbitrator.{0} @@ -996,8 +996,8 @@ account.arbitratorSelection.minOne=You need to have at least one arbitrator sele account.altcoin.yourAltcoinAccounts=Your altcoin accounts account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as \ -described on the {1} web page.\nUsing wallets from centralized exchanges where you don''t have your keys under \ -your control or using a not compatible wallet software can lead to loss of the traded funds!\nThe arbitrator is \ +described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or \ +(b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe arbitrator is \ not a {2} specialist and cannot help in such cases. account.altcoin.popup.wallet.confirm=I understand and confirm that I know which wallet I need to use. account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure you understand and fulfill \ @@ -1091,16 +1091,16 @@ account.password.removePw.button=Remove password account.password.removePw.headline=Remove password protection for wallet account.password.setPw.button=Set password account.password.setPw.headline=Set password protection for wallet -account.password.info=With password protection you need to enter your password when withdrawing bitcoin \ -out of your wallet or if you want to view or restore a wallet from seed words as well as at application startup. +account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin \ +out of your wallet, and when restoring your wallet from seed words. account.seed.backup.title=Backup your wallets seed words account.seed.info=Please write down both wallet seed words and the date! \ -You can recover your wallet any time with those seed words and the date.\n\ -The seed words are used for both the BTC and the BSQ wallet.\n\n\ +You can recover your wallet any time with seed words and the date.\n\ +The same seed words are used for the BTC and BSQ wallet.\n\n\ You should write down the seed words on a sheet of paper. Do not save them on your computer.\n\n\ Please note that the seed words are NOT a replacement for a backup.\n\ -You need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\n\ +You need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\n\ Importing seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys! account.seed.warn.noPw.msg=You have not setup a wallet password which would protect the display of the seed words.\n\n\ Do you want to display the seed words? @@ -1938,8 +1938,8 @@ popup.headline.error=Error popup.doNotShowAgain=Don't show again popup.reportError.log=Open log file popup.reportError.gitHub=Report to GitHub issue tracker -popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\n\ -The error message will be copied to the clipboard when you click the below buttons.\n\ +popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\n\ +The error message will be copied to the clipboard when you click a button below.\n\ It will make debugging easier if you can attach the bisq.log file as well. popup.error.tryRestart=Please try to restart your application and check your network connection to see if you can resolve the issue. @@ -1995,7 +1995,11 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. Please restart your ap popup.warning.priceRelay=price relay popup.warning.seed=seed -popup.info.securityDepositInfo=To ensure that both traders follow the trade protocol they need to pay a security deposit.\n\nThe deposit will stay in your local trading wallet until the offer gets accepted by another trader.\nIt will be refunded to you after the trade has successfully completed.\n\nPlease note that you need to keep your application running if you have an open offer. When another trader wants to take your offer it requires that your application is online for executing the trade protocol.\nBe sure that you have standby mode deactivated as that would disconnect the network (standby of the monitor is not a problem). +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, Bisq needs to be running for another trader to take \ +it. To keep your offers online, keep Bisq 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}. @@ -2021,7 +2025,7 @@ popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\n popup.attention.forTradeWithId=Attention required for trade with ID {0} popup.roundedFiatValues.headline=New privacy feature: Rounded fiat values -popup.roundedFiatValues.msg=To increase privacy of your trade the {0} amount was rounded.\n\nDepending on the client version you''ll pay or receive either values with decimals or rounded ones.\n\nBoth values do comply from now on with the trade protocol.\n\nAlso be aware that BTC values are changed automatically to match the rounded fiat amount as close as possible. +popup.roundedFiatValues.msg=To increase privacy of your trade the {0} amount was rounded.\n\nDepending on the client version you''ll pay or receive either values with decimals or rounded ones.\n\nBoth values do comply from now on with the trade protocol.\n\nAlso be aware that BTC values are changed automatically to match the rounded fiat amount as close as possible. #################################################################### @@ -2299,7 +2303,7 @@ payment.emailOrMobile=Email or mobile nr payment.useCustomAccountName=Use custom account name payment.maxPeriod=Max. allowed trade period payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2} -payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1} +payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1} payment.currencyWithSymbol=Currency: {0} payment.nameOfAcceptedBank=Name of accepted bank payment.addAcceptedBank=Add accepted bank From c4336638083b5902295ca8ab700b47dd280ed738 Mon Sep 17 00:00:00 2001 From: Steve Jain Date: Mon, 10 Dec 2018 18:36:06 -0500 Subject: [PATCH 2/2] Change customer service text --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 8def811b7c7..dd581cf0b9d 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -807,7 +807,7 @@ support.buyerOfferer=BTC buyer/Maker support.sellerOfferer=BTC seller/Maker support.buyerTaker=BTC buyer/Taker support.sellerTaker=BTC seller/Taker -support.backgroundInfo=Bisq is not a company and does not guarantee customer support.\n\n\ +support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\n\ If there are disputes in the trade process (e.g. one trader does not follow the trade protocol) \ the application will display an \"Open dispute\" button after the trade period is over \ for contacting the arbitrator.\n\n\