[bisq-network/bisq] Trade protocol domain improvements (#4566)
m52go
notifications at github.com
Tue Sep 29 05:51:09 UTC 2020
@m52go commented on this pull request.
Mostly innocuous wording changes to make the messages easier to understand.
> +offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take that offer because you have taken it already earlier. \
+ It might be that the take offer attempt ended up in a failed trade.
```suggestion
offerbook.warning.offerWasAlreadyUsedInTrade=You cannot take this offer because you already took it earlier. \
It could be that your previous take-offer attempt resulted in a failed trade.
```
> +portfolio.pending.invalidDelayedPayoutTx=There is an issue with a missing or invalid transaction.\n\n\
+ Please do NOT send the Altcoin or Fiat payment but contact the Bisq \
+ developers at 'https://bisq.community' or the Keybase channel for further assistance.\n\n\
+ Error message: {0}
```suggestion
portfolio.pending.invalidDelayedPayoutTx=There is an issue with a missing or invalid transaction.\n\n\
Please do NOT send the fiat or altcoin payment. Contact Bisq \
developers on Keybase (https://keybase.io/team/bisq) or on the \
forum (https://bisq.community) for further assistance.\n\n\
Error message: {0}
```
Lowercased letters and added Keybase URL.
> @@ -830,10 +832,10 @@ portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks
portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute \
without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\n\
For further help please contact the Bisq support channel at the Bisq Keybase team.
-portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. The trade gets moved to the \
- failed trades section.
-portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. The trade gets \
- moved to the failed trades section.
+portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \
+ trade to the failed trades.
```suggestion
trade to failed trades.
```
> @@ -830,10 +832,10 @@ portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks
portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute \
without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\n\
For further help please contact the Bisq support channel at the Bisq Keybase team.
-portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. The trade gets moved to the \
- failed trades section.
-portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. The trade gets \
- moved to the failed trades section.
+portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \
+ trade to the failed trades.
+portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \
+ trade to the failed trades.
```suggestion
trade to failed trades.
```
> + Without that the trade cannot be completed. No funds have been locked up and no trade fee has been paid. \
+ You can move the trade to failed trades.
```suggestion
Without this tx, the trade cannot be completed. No funds have been locked and no trade fee has been paid. \
You can move this trade to failed trades.
```
> + Without that the trade cannot be completed. No funds have been locked up. \
+ Your offer is still available for other traders so you have not lost the maker fee. \
+ You can move the trade to failed trades.
```suggestion
Without this tx, the trade cannot be completed. No funds have been locked. \
Your offer is still available to other traders, so you have not lost the maker fee. \
You can move this trade to failed trades.
```
> +portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2of2 Multisig transaction) is missing.\n\n\
+ Without that the trade cannot be completed. No funds have been locked up but your trade fee has been paid. \
+ You can request at https://github.com/bisq-network/support/issues for getting reimbursed the lost trade fee. \
+ You can move the trade to failed trades.
```suggestion
portfolio.pending.failedTrade.missingDepositTx=The deposit transaction (the 2-of-2 multisig transaction) is missing.\n\n\
Without this tx, the trade cannot be completed. No funds have been locked but your trade fee has been paid. \
You can make a request to be reimbursed the trade fee here: https://github.com/bisq-network/support/issues. \n\n\
Feel free to move this trade to failed trades.
```
> +portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing.\n\n\
+ Without that arbitration cannot be opened. The funds have been locked up in the deposit transaction and you must not \
+ send the fiat or altcoin payment to the BTC seller. Open a mediation ticket by clicking cmd+o (or ctrl+o). \
+ The mediator should make a suggested payout so that the seller receives their trade amount back and both traders get \
+ back their security deposit. That way there is no security risk and only the trade fee is lost. \
+ You can request at https://github.com/bisq-network/support/issues for getting reimbursed the lost trade fee.
```suggestion
portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing, \
but funds have been locked in the deposit transaction.\n\n\
Please do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration \
cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. \
The mediator should suggest that both peers each get back the the full amount of their security deposits \
(with seller receiving full trade amount back as well). \
This way, there is no security risk, and only trade fees are lost. \n\n\
You can request a reimbursement for lost trade fees here: https://github.com/bisq-network/support/issues.
```
> +portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing.\n\n\
+ Without that arbitration cannot be opened. The funds have been locked up in the deposit transaction. If the buyer is \
+ also missing the delayed payout transaction he is instructed to not send the payment but open a mediation ticket. \
+ You should open a mediation ticket as well by clicking cmd+o (or ctrl+o). \
+ In case that the buyer has not sent the payment the mediator should make a suggested payout so that you receive \
+ your trade amount back and both traders get back their security deposit. Otherwise the trade amount should go to the buyer. \
+ You can request at https://github.com/bisq-network/support/issues for getting reimbursed the lost trade fee.
```suggestion
portfolio.pending.failedTrade.seller.existingDepositTxButMissingDelayedPayoutTx=The delayed payout transaction is missing \
but funds have been locked in the deposit transaction.\n\n\
If the buyer is also missing the delayed payout transaction, they will be instructed to NOT send the payment and open \
a mediation ticket instead. You should also open a mediation ticket with Cmd/Ctrl+o. \n\n\
If the buyer has not sent payment yet, the mediator should suggest that both peers each get back the full amount of \
their security deposits (with seller receiving full trade amount back as well). \
Otherwise the trade amount should go to the buyer. \n\n\
You can request a reimbursement for lost trade fees here: https://github.com/bisq-network/support/issues.
```
> +portfolio.pending.failedTrade.errorMsgSet=There have been an error during the trade protocol execution.\n\n\
+ Error: {0}\n\n\
+ This error might not be critical and the trade could be completed normally. If you are unsure you can open a mediation \
+ ticket to get advice from the Bisq mediators. If the error was critical and the trade cannot be completed you might \
+ have lost your trade fee. If so, you can request at https://github.com/bisq-network/support/issues for \
+ getting reimbursed the lost trade fee.
```suggestion
portfolio.pending.failedTrade.errorMsgSet=There was an error during trade protocol execution.\n\n\
Error: {0}\n\n\
It might be that this error is not critical, and the trade can be completed normally. If you are unsure, open a mediation \
ticket to get advice from Bisq mediators. \n\n\
If the error was critical and the trade cannot be completed, you might have lost your trade fee. \
Request a reimbursement for lost trade fees here: https://github.com/bisq-network/support/issues.
```
> + have lost your trade fee. If so, you can request at https://github.com/bisq-network/support/issues for \
+ getting reimbursed the lost trade fee.
```suggestion
have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: \
https://github.com/bisq-network/support/issues.
```
> + You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
```suggestion
You cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open \
trades screen any time.
```
I assumed this is what intended message is—please make sure it's correct.
> + The trade transactions have been published and funds are locked up. Only move the trade to failed trades if you are \
+ really sure. It might prevent options to resolve the problem.\n\n\
+ Do you want to move the trade to failed trades?\n\n\
+ You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
```suggestion
The trade transactions have been published and funds are locked. Only move the trade to failed trades if you are \
really sure. It might prevent options to resolve the problem.\n\n\
Do you want to move the trade to failed trades?\n\n\
You cannot open mediation or arbitration from the failed trades view, but you can move a failed trade back to the open \
```
> + The trade cannot be completed and you might \
+ have lost your trade fee. If so, you can request at https://github.com/bisq-network/support/issues for \
+ getting reimbursed the lost trade fee.
+portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0}
+portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\n\
+ Do you want to move the trade to failed trades?\n\n\
+ You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
+portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encountered some problems.\n\n{0}\n\n\
+ The trade transactions have been published and funds are locked up. Only move the trade to failed trades if you are \
+ really sure. It might prevent options to resolve the problem.\n\n\
+ Do you want to move the trade to failed trades?\n\n\
+ You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
+portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades
+portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of that trade
```suggestion
portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade
```
> + have lost your trade fee. If so, you can request at https://github.com/bisq-network/support/issues for \
+ getting reimbursed the lost trade fee.
+portfolio.pending.failedTrade.info.popup=The trade protocol encountered some problems.\n\n{0}
+portfolio.pending.failedTrade.txChainInvalid.moveToFailed=The trade protocol encountered a serious problem.\n\n{0}\n\n\
+ Do you want to move the trade to failed trades?\n\n\
+ You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
+portfolio.pending.failedTrade.txChainValid.moveToFailed=The trade protocol encountered some problems.\n\n{0}\n\n\
+ The trade transactions have been published and funds are locked up. Only move the trade to failed trades if you are \
+ really sure. It might prevent options to resolve the problem.\n\n\
+ Do you want to move the trade to failed trades?\n\n\
+ You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
+portfolio.pending.failedTrade.moveTradeToFailedIcon.tooltip=Move trade to failed trades
+portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of that trade
+portfolio.failed.revertToPending.popup=Do you want to move the trade to open trades?
```suggestion
portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades?
```
> @@ -2974,7 +3027,8 @@ addressTextField.openWallet.failed=Opening a default Bitcoin wallet application
peerInfoIcon.tooltip={0}\nTag: {1}
txIdTextField.copyIcon.tooltip=Copy transaction ID to clipboard
-txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with that transactions ID
+txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with that transaction ID
```suggestion
txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with this transaction ID
```
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/4566#pullrequestreview-498097669
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20200928/6724d558/attachment-0001.html>
More information about the bisq-github
mailing list