mirror of
https://github.com/haveno-dex/haveno.git
synced 2024-12-22 19:49:32 +00:00
improve some wording across the app
This commit is contained in:
erciccione
woodser
parent
2a50350cff
commit
56412b749d
2 changed files with 27 additions and 32 deletions
|
|
@ -640,9 +640,9 @@ portfolio.pending.autoConf.state.ERROR=An error at a service request occurred. N
|
|||
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 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.warn=The deposit transaction is not confirmed yet. This usually takes about 20 minutes, but could be more if the network is congested.
|
||||
portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. \
|
||||
You can wait longer or contact the mediator for assistance.
|
||||
If you have been waiting for much longer than 20 minutes, contact an arbitrator for assistance.
|
||||
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
portfolio.pending.step2.confReached=Your trade has reached 10 confirmations.\n\n
|
||||
|
|
@ -686,8 +686,8 @@ portfolio.pending.step2_buyer.sellersAddress=Seller''s {0} address
|
|||
portfolio.pending.step2_buyer.buyerAccount=Your payment account to be used
|
||||
portfolio.pending.step2_buyer.paymentStarted=Payment started
|
||||
portfolio.pending.step2_buyer.warn=You still have not done your {0} payment!\nPlease note that the trade has to be completed by {1}.
|
||||
portfolio.pending.step2_buyer.openForDispute=You have not completed your payment!\nThe max. period for the trade has elapsed.\
|
||||
Please contact the mediator for assistance.
|
||||
portfolio.pending.step2_buyer.openForDispute=You have not completed your payment yet\nThe max. period for the trade has elapsed, but you can still complete the payment.\
|
||||
Contact an arbitrator if you need assistance.
|
||||
portfolio.pending.step2_buyer.paperReceipt.headline=Did you send the paper receipt to the XMR seller?
|
||||
portfolio.pending.step2_buyer.paperReceipt.msg=Remember:\n\
|
||||
You need to write on the paper receipt: NO REFUNDS.\n\
|
||||
|
|
@ -713,7 +713,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Yes, I have started the payment
|
|||
portfolio.pending.step2_buyer.confirmStart.proof.warningTitle=You have not provided proof of payment
|
||||
portfolio.pending.step2_buyer.confirmStart.proof.noneProvided=You have not entered the transaction ID and the transaction key.\n\n\
|
||||
By not providing this data the peer cannot use the auto-confirm feature to release the BTC as soon the XMR has been received.\n\
|
||||
Beside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the mediator or arbitrator in case of a dispute.\n\
|
||||
Beside that, Haveno requires that the sender of the XMR transaction is able to provide this information to the arbitrator in case of a dispute.\n\
|
||||
See more details on the Haveno wiki [HYPERLINK:https://bisq.wiki/Trading_Monero#Auto-confirming_trades].
|
||||
portfolio.pending.step2_buyer.confirmStart.proof.invalidInput=Input is not a 32 byte hexadecimal value
|
||||
portfolio.pending.step2_buyer.confirmStart.warningButton=Ignore and continue anyway
|
||||
|
|
@ -721,13 +721,13 @@ 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 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.
|
||||
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 arbitrator for assistance.
|
||||
disputeChat.chatWindowTitle=Dispute chat window for trade with ID ''{0}''
|
||||
tradeChat.chatWindowTitle=Trader 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 any of the rules below, open a dispute and report it to the mediator or arbitrator.\n\n\
|
||||
If a trader violates any of the rules below, open a dispute 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\
|
||||
|
|
@ -758,7 +758,7 @@ portfolio.pending.step3_buyer.warn.part1b=at your payment provider (e.g. bank)
|
|||
portfolio.pending.step3_buyer.warn.part2=The XMR seller still has not confirmed your payment. Please check {0} if the \
|
||||
payment sending was successful.
|
||||
portfolio.pending.step3_buyer.openForDispute=The XMR seller has not confirmed your payment! The max. period for the \
|
||||
trade has elapsed. You can wait longer and give the trading peer more time or request assistance from the mediator.
|
||||
trade has elapsed. You can wait longer and give the trading peer more time or request assistance from the arbitrator.
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
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
|
||||
|
|
@ -810,8 +810,8 @@ portfolio.pending.step3_seller.warn.part1a=on the {0} blockchain
|
|||
portfolio.pending.step3_seller.warn.part1b=at your payment provider (e.g. bank)
|
||||
portfolio.pending.step3_seller.warn.part2=You still have not confirmed the receipt of the payment. \
|
||||
Please check {0} if you have received the payment.
|
||||
portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt of the payment!\n\
|
||||
The max. period for the trade has elapsed.\nPlease confirm or request assistance from the mediator.
|
||||
portfolio.pending.step3_seller.openForDispute=You have not confirmed the receipt of the payment yet.\n\
|
||||
The max. period for the trade has elapsed.\nPlease confirm or request assistance from the arbitrator.
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
portfolio.pending.step3_seller.onPaymentReceived.part1=Have you received the {0} payment from your trading partner?\n\n
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
|
|
@ -860,7 +860,7 @@ 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 \
|
||||
\"Open support\" or \"Open dispute\" button.\n\nWhen you open a support ticket the trade will be interrupted and \
|
||||
handled by a mediator or arbitrator.
|
||||
handled by an arbitrator.
|
||||
|
||||
portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute.
|
||||
portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute \
|
||||
|
|
@ -1147,11 +1147,8 @@ support.sellerTaker=XMR seller/Taker
|
|||
|
||||
support.backgroundInfo=Haveno is not a company, so it handles disputes differently.\n\n\
|
||||
Traders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. \
|
||||
If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a \
|
||||
payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. \
|
||||
If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.\
|
||||
The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement \
|
||||
for this payment from the Haveno DAO.
|
||||
If that is not sufficient, an arbitrator will evaluate the situation and decide a \
|
||||
payout of trade funds.
|
||||
support.initialInfo=Please enter a description of your problem in the text field below. \
|
||||
Add as much information as possible to speed up dispute resolution time.\n\n\
|
||||
Here is a check list for information you should provide:\n\
|
||||
|
|
@ -1309,11 +1306,11 @@ setting.about.web=Haveno web page
|
|||
setting.about.code=Source code
|
||||
setting.about.agpl=AGPL License
|
||||
setting.about.support=Support Haveno
|
||||
setting.about.def=Haveno is not a company—it is a project open to the community. If you want to participate or support Haveno please follow the links below.
|
||||
setting.about.def=Haveno is not a company—it is a project open to the community. If you want to support Haveno please follow the links below.
|
||||
setting.about.contribute=Contribute
|
||||
setting.about.providers=Data providers
|
||||
setting.about.apisWithFee=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices, and Haveno Mempool Nodes for mining fee estimation.
|
||||
setting.about.apis=Haveno uses Haveno Price Indices for Fiat and Altcoin market prices.
|
||||
setting.about.apisWithFee=Haveno uses price indices for Fiat and Altcoin market prices
|
||||
setting.about.apis=Haveno uses Price Indices for Fiat and Altcoin market prices.
|
||||
setting.about.pricesProvided=Market prices provided by
|
||||
setting.about.feeEstimation.label=Mining fee estimation provided by
|
||||
setting.about.versionDetails=Version details
|
||||
|
|
@ -2034,9 +2031,9 @@ 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 this bug by opening a new issue at https://github.com/bisq-network/bisq/issues.\n\
|
||||
popup.reportError={0}\n\nTo help us to improve the software please report this bug by opening a new issue at https://github.com/haveno-dex/haveno/issues.\n\
|
||||
The above error message will be copied to the clipboard when you click either of the buttons below.\n\
|
||||
It will make debugging easier if you include the bisq.log file by pressing "Open log file", saving a copy, and attaching it to your bug report.
|
||||
It will make debugging easier if you include the haveno.log file by pressing "Open log file", saving a copy, and attaching it to your bug report.
|
||||
|
||||
popup.error.tryRestart=Please try to restart your application and check your network connection to see if you can resolve the issue.
|
||||
popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
|
||||
|
|
@ -2144,10 +2141,7 @@ popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO sta
|
|||
popup.privateNotification.headline=Important private notification!
|
||||
|
||||
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\
|
||||
- pruning is disabled ('prune=0' in bitcoin.conf)\n\
|
||||
- bloom filters are enabled ('peerbloomfilters=1' in bitcoin.conf)
|
||||
Please ensure the node is fully synced before starting Haveno\n\
|
||||
|
||||
popup.shutDownInProgress.headline=Shut down in progress
|
||||
popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.
|
||||
|
|
@ -2155,7 +2149,8 @@ popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\n
|
|||
popup.attention.forTradeWithId=Attention required for trade with ID {0}
|
||||
popup.attention.newFeatureDuplicateOffer=Welcome to the Haveno test instance!\n\n\
|
||||
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\
|
||||
If you encounter any problem, please let us know by opening an issue[HYPERLINK:https://github.com/haveno-dex/haveno/issues/new].
|
||||
If you encounter any problem, please let us know by opening an issue[HYPERLINK:https://github.com/haveno-dex/haveno/issues/new].\n\n\
|
||||
This is a test instance. Do not use real money!
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -56,11 +56,11 @@ public class AboutView extends ActivatableView<GridPane, Void> {
|
|||
label.setWrapText(true);
|
||||
GridPane.setColumnSpan(label, 2);
|
||||
GridPane.setHalignment(label, HPos.LEFT);
|
||||
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://bisq.network");
|
||||
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://haveno.exchange");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://bisq.network/source/bisq");
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/haveno-dex/haveno");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://bisq.network/source/bisq/blob/master/LICENSE");
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/haveno-dex/haveno/blob/master/LICENSE");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
|
||||
addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.support"), Layout.GROUP_DISTANCE);
|
||||
|
|
@ -69,7 +69,7 @@ public class AboutView extends ActivatableView<GridPane, Void> {
|
|||
label.setWrapText(true);
|
||||
GridPane.setColumnSpan(label, 2);
|
||||
GridPane.setHalignment(label, HPos.LEFT);
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bisq.network/contribute");
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://github.com/haveno-dex/haveno#support");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
|
||||
boolean isXmr = Res.getBaseCurrencyCode().equals("XMR");
|
||||
|
|
@ -79,9 +79,9 @@ public class AboutView extends ActivatableView<GridPane, Void> {
|
|||
label.setWrapText(true);
|
||||
GridPane.setHalignment(label, HPos.LEFT);
|
||||
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.pricesProvided"),
|
||||
"Bisq Price Index (https://bisq.wiki/Bisq_Price_Index)");
|
||||
"Haveno's pricenode (https://price.haveno.network)");
|
||||
if (isXmr)
|
||||
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "mempool.space (https://mempool.space)");
|
||||
addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "Monero node");
|
||||
|
||||
addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.versionDetails"), Layout.GROUP_DISTANCE);
|
||||
addCompactTopLabelTextField(root, gridRow, Res.get("setting.about.version"), Version.VERSION, Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE);
|
||||
|
|
|
|||
Loading…
Reference in a new issue