Skip to content

Commit

Permalink
Fix mistakes in English source (#3386)
Browse files Browse the repository at this point in the history
* Fix broken placeholders

* Replace non existing pending trades screen with open trades screen

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

Co-Authored-By: Steve Jain <[email protected]>

* Update message in failed trade popup
  • Loading branch information
ripcurlx authored Oct 10, 2019
1 parent 679985d commit ccfbf6f
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -789,9 +789,8 @@ portfolio.pending.disputeOpenedMyUser=You opened already a dispute.\n{0}
portfolio.pending.disputeOpenedByPeer=Your trading peer opened a dispute\n{0}
portfolio.pending.supportTicketOpenedByPeer=Your trading peer opened a support ticket.\n{0}
portfolio.pending.noReceiverAddressDefined=No receiver address defined
portfolio.pending.removeFailedTrade=If the mediator or arbitrator could not close that trade you can move it yourself \
to the failed trades screen.\n\
Do you want to remove that failed trade from the Pending trades screen?
portfolio.pending.removeFailedTrade=Is this a failed trade? If so, would you like to manually \
close it, so that it no longer shows as an open trade?

portfolio.pending.mediationResult.headline=Suggested payout from mediation
portfolio.pending.mediationResult.info.noneAccepted=Complete the trade by accepting the mediator's suggestion for the trade payout.
Expand Down Expand Up @@ -944,7 +943,7 @@ support.sellerTaker=BTC seller/Taker

# TODO @m52go could you provide a good text here?
support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\n\
Traders can communicate within the application via a secure chat on the pending trades screen to attempt solving a dispute on their own. \
Traders can communicate within the application via a secure chat on the open trades screen to attempt solving a dispute on their own. \
If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and give a recommendation for the \
payout of the 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 recommended payout, they can request arbitration.\
Expand All @@ -962,7 +961,7 @@ support.initialInfo=Please enter a description of your problem in the text field
\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\
\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n\
Please make yourself familiar with the basic rules for the dispute process:\n\
\t● You need to respond to the {0}}''s requests within 2 days.\n\
\t● You need to respond to the {0}''s requests within 2 days.\n\
\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\
\t● The maximum period for a dispute is 14 days.\n\
\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\
Expand Down Expand Up @@ -1129,7 +1128,7 @@ account.arbitratorRegistration.pubKey=Public key
account.arbitratorRegistration.register=Register
account.arbitratorRegistration.registration={0} registration
account.arbitratorRegistration.revoke=Revoke
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 {0}}. 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 {0}. 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 registration from the Bisq network.
account.arbitratorRegistration.removedFailed=Could not remove registration.{0}
Expand Down Expand Up @@ -2441,7 +2440,7 @@ popup.warning.lockedUpFunds=You have locked up funds from a failed trade.\n\
Locked up balance: {0} \n\
Deposit tx address: {1}\n\
Trade ID: {2}.\n\n\
Please open a support ticket by selecting the trade in the pending trades screen and clicking \"alt + o\" or \"option + o\"."
Please open a support ticket by selecting the trade in the open trades screen and pressing \"alt + o\" or \"option + o\"."

popup.warning.nodeBanned=One of the {0} nodes got banned. Please restart your application to be sure to not be connected to the banned node.
popup.warning.priceRelay=price relay
Expand Down

0 comments on commit ccfbf6f

Please sign in to comment.