<p></p>
<p><b>@m52go</b> commented on this pull request.</p>
<p>Mostly innocuous wording changes to make the messages easier to understand.</p><hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496405169">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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.
</pre>
⬇️ Suggested change
<pre style="color: #555">-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.
+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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496408703">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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}
</pre>
⬇️ Suggested change
<pre style="color: #555">-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}
+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}
</pre>
<p>Lowercased letters and added Keybase URL.</p>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496409429">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> @@ -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.
</pre>
⬇️ Suggested change
<pre style="color: #555">- trade to the failed trades.
+ trade to failed trades.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496409535">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> @@ -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.
</pre>
⬇️ Suggested change
<pre style="color: #555">- trade to the failed trades.
+ trade to failed trades.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496412063">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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.
</pre>
⬇️ Suggested change
<pre style="color: #555">- 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.
+ 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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496413243">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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.
</pre>
⬇️ Suggested change
<pre style="color: #555">- 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.
+ 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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496415052">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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.
</pre>
⬇️ Suggested change
<pre style="color: #555">-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.
+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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496419151">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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.
</pre>
⬇️ Suggested change
<pre style="color: #555">-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.
+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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496429558">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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.
</pre>
⬇️ Suggested change
<pre style="color: #555">-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.
+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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496431002">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> +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.
</pre>
⬇️ Suggested change
<pre style="color: #555">-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.
+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.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496431226">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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.
</pre>
⬇️ Suggested change
<pre style="color: #555">- 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.
+ have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: \
+ https://github.com/bisq-network/support/issues.
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496431697">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
+ trades screen any time.
</pre>
⬇️ Suggested change
<pre style="color: #555">- You cannot open mediation or arbitration from the failed trades view, but you can move it back to the open \
- trades screen any time.
+ 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.
</pre>
<p>I assumed this is what intended message is—please make sure it's correct.</p>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496432267">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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 \
</pre>
⬇️ Suggested change
<pre style="color: #555">- 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 \
+ 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 \
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496432356">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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
</pre>
⬇️ Suggested change
<pre style="color: #555">-portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of that trade
+portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496432420">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> + 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?
</pre>
⬇️ Suggested change
<pre style="color: #555">-portfolio.failed.revertToPending.popup=Do you want to move the trade to open trades?
+portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades?
</pre>
<hr>
<p>In <a href="https://github.com/bisq-network/bisq/pull/4566#discussion_r496432599">core/src/main/resources/i18n/displayStrings.properties</a>:</p>
<pre style='color:#555'>> @@ -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
</pre>
⬇️ Suggested change
<pre style="color: #555">-txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with that transaction ID
+txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with this transaction ID
</pre>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/4566#pullrequestreview-498097669">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNVU745S6ICC2NWSGUDSIFYU3ANCNFSM4R3L7WRA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNQSAEGJ77K7N7RLK7TSIFYU3A5CNFSM4R3L7WRKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGODWYF4BI.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/4566#pullrequestreview-498097669",
"url": "https://github.com/bisq-network/bisq/pull/4566#pullrequestreview-498097669",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>