Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos and improve grammar #2162

Merged
merged 1 commit into from
Dec 23, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ portfolio.pending.step3_buyer.warn.part1b=at your payment provider (e.g. bank)
portfolio.pending.step3_buyer.warn.part2=The BTC seller still has not confirmed your payment!\nPlease check {0} if the payment sending was successful.\nIf the BTC seller does not confirm the receipt of your payment by {1} the trade will be investigated by the arbitrator.
portfolio.pending.step3_buyer.openForDispute=The BTC seller has not confirmed your payment!\nThe max. 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 "TrailingSpacesInProperty"
portfolio.pending.step3_seller.part=Your trading partner has confirmed that he initiated the {0} payment.\n\n
portfolio.pending.step3_seller.part=Your trading partner has confirmed that they have initiated the {0} payment.\n\n
portfolio.pending.step3_seller.altcoin.explorer=on your favorite {0} blockchain explorer
portfolio.pending.step3_seller.altcoin.wallet=at your {0} wallet
portfolio.pending.step3_seller.altcoin={0}Please check {1} if the transaction to your receiving address\n\
Expand All @@ -589,7 +589,7 @@ has already sufficient blockchain confirmations.\nThe payment amount has to be {
You can copy & paste your {4} address from the main screen after closing that popup.
portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.\n\n\
The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"
portfolio.pending.step3_seller.bank=Your trading partner has confirmed that he initiated the {0} payment.\n\n\
portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\n\
Please go to your online banking web page and check if you have received {1} from the BTC buyer.\n\n\
The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"\n\n
portfolio.pending.step3_seller.cash=Because the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
Expand Down Expand Up @@ -1000,9 +1000,9 @@ described on the {1} web page.\nUsing wallets from centralized exchanges where (
(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 \
account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand and fulfill \
the following requirements:\n\n\
For sending XMR you need to use either the official Monero GUI wallet or Monero CLI wallet with the \
For sending XMR, you need to use either the official Monero GUI wallet or Monero CLI wallet with the \
store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as \
that would be required in case of a dispute.\n\
monero-wallet-cli (use the command get_tx_key)\n\
Expand All @@ -1015,13 +1015,13 @@ 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\
If you cannot provide the above data or if you used an incompatible wallet it would result in losing the \
dispute case. The XMR sender is responsible to be able to verify the XMR transfer to the \
Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \
dispute case. The XMR sender is responsible for providing verification of the XMR 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill \
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\
If you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save \
Expand All @@ -1033,22 +1033,22 @@ lower-right corner of the box containing the transaction. You must save this inf
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 BLUR \
transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\n\
If you cannot provide the required information to the arbitrator, you will lose the dispute. In all cases of dispute, the \
BLUR sender bears 100% of the burden of responsiblity in verifying transactions to an arbitrator. \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.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\n\
account.altcoin.popup.ccx.msg=Trading CCX on Bisq requires that you understand the following requirements:\n\n\
To send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\n\
display the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\n\
address in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\n\
verify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\n\
Because Conceal is a privacy coin, block explorers cannot verify transfers.\n\n\
If you cannot provide the required data to the arbitrator, you will lose the dispute case.\n\
Failure to provide the required data to the arbitrator will result in losing the dispute case.\n\
If you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\n\
If you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network).
account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill \
the following requirements:\n\n\
Because of the privacy Dragonglass provides a transaction is not verifyable on the public blockchain. If required you \
can prove your payment thru use of your TXN-Private-Key.\n\
Because of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you \
can prove your payment through the use of your TXN-Private-Key.\n\
The TXN-Private Key is a one-time key automatically generated for every transaction that can \
only be accessed from within your DRGL wallet.\n\
Either by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\n\
Expand All @@ -1058,8 +1058,8 @@ In case of a dispute, you must provide the arbitrator the following data:\n\
- The transaction hash\n\
- The recipient's public address\n\n\
Verification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\n\
If you cannot provide the above data or if you used an incompatible wallet it would result in losing the \
dispute case. The Dragonglass sender is responsible to be able to verify the DRGL transfer to the \
Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \
dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the \
arbitrator in case of a dispute. Use of PaymentID is not required.\n\n\
If you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help.
account.altcoin.popup.ZEC.msg=When using {0} you can only use the transparent addresses (starting with t) not \
Expand Down Expand Up @@ -1463,7 +1463,7 @@ dao.burnBsq.assets.lookBackPeriod=Verification period
dao.burnBsq.assets.trialFee=Fee for trial period
dao.burnBsq.assets.totalFee=Total fees paid
dao.burnBsq.assets.days={0} days
dao.burnBsq.assets.toFewDays=The asset fee is too low. The min. amount of days for the trial perios is {0}.
dao.burnBsq.assets.toFewDays=The asset fee is too low. The min. amount of days for the trial period is {0}.

# suppress inspection "UnusedProperty"
dao.assetState.UNDEFINED=Undefined
Expand Down Expand Up @@ -2344,15 +2344,15 @@ payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Author
The receipt must clearly show the seller's full name, country, state and the amount. The buyer will get displayed the seller's email in the trade process.
payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. \
The receipt must clearly show the seller's full name, city, country and the amount. The buyer will get displayed the seller's email in the trade process.
payment.halCash.info=When using HalCash the BTC buyer need to send the BTC seller the HalCash code via a text message from the mobile phone.\n\n\
payment.halCash.info=When using HalCash the BTC buyer needs to send the BTC seller the HalCash code via a text message from their mobile phone.\n\n\
Please make sure to not exceed the maximum amount your bank allows you to send with HalCash. \
The min. amount per withdrawal is 10 EUR and the max. amount is 600 EUR. For repeated withdrawals it is \
3000 EUR per receiver per day and 6000 EUR per receiver per month. Please cross check those limits with your \
bank to be sure they use the same limits as stated here.\n\n\
The withdrawal amount must be a multiple of 10 EUR as you cannot withdraw other amounts from an ATM. The \
UI in the create-offer and take-offer screen will adjust the BTC amount so that the EUR amount is correct. You cannot use market \
based price as the EUR amount would be changing with changing prices.\n\n\
In case of a dispute the BTC buyer need to provide the proof that he sent the EUR.
In case of a dispute the BTC buyer needs to provide the proof that they sent the EUR.
payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk.\n\
\n\
To mitigate this risk, Bisq sets per-trade limits based on two factors:\n\
Expand Down Expand Up @@ -2383,7 +2383,7 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ
The 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' he needs to state those in the 'Addition information' text field in the account.\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 arbitrator cannot help much as it is usually hard 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 \
Expand Down