mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-24 23:18:17 +01:00
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chimp1984/bisq into fix-delayed-payout-tx-issues
This commit is contained in:
chimp1984
commit
e9d7e53882
1 changed files with 45 additions and 41 deletions
|
|
@ -408,8 +408,8 @@ offerbook.warning.tradeLimitNotMatching=Your payment account has been created {0
|
|||
Your trade limit is: {1}\n\
|
||||
The min. trade amount of the offer is: {2}.\n\n\
|
||||
You cannot take that offer at the moment. Once your account is older than 2 months this restriction gets removed.
|
||||
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.
|
||||
|
||||
offerbook.info.sellAtMarketPrice=You will sell at market price (updated every minute).
|
||||
offerbook.info.buyAtMarketPrice=You will buy at market price (updated every minute).
|
||||
|
|
@ -562,8 +562,9 @@ portfolio.tab.failed=Failed
|
|||
portfolio.tab.editOpenOffer=Edit offer
|
||||
|
||||
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\
|
||||
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}
|
||||
|
||||
portfolio.pending.step1.waitForConf=Wait for blockchain confirmation
|
||||
|
|
@ -833,9 +834,9 @@ portfolio.pending.error.depositTxNull=The deposit transaction is null. You canno
|
|||
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. You can move the \
|
||||
trade to the failed trades.
|
||||
trade to failed trades.
|
||||
portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \
|
||||
trade to the failed trades.
|
||||
trade to failed trades.
|
||||
portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute \
|
||||
with an unconfirmed deposit transaction. Please wait until it is confirmed or 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.
|
||||
|
|
@ -906,53 +907,56 @@ portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbit
|
|||
portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted
|
||||
|
||||
portfolio.pending.failedTrade.taker.missingTakerFeeTx=The taker fee transaction is missing.\n\n\
|
||||
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.
|
||||
portfolio.pending.failedTrade.maker.missingTakerFeeTx=The peer's taker fee transaction is missing.\n\n\
|
||||
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.
|
||||
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.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.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.errorMsgSet=There have been an error during the trade protocol execution.\n\n\
|
||||
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 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, \
|
||||
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 \
|
||||
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 was an error during 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.
|
||||
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.
|
||||
portfolio.pending.failedTrade.missingContract=The trade contract is not set.\n\n\
|
||||
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.
|
||||
have lost your trade fee. If so, you can request a reimbursement for lost trade fees here: \
|
||||
https://github.com/bisq-network/support/issues.
|
||||
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 \
|
||||
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.
|
||||
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 \
|
||||
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 it back to the open \
|
||||
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.
|
||||
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?
|
||||
portfolio.pending.failedTrade.warningIcon.tooltip=Click to open details about the issues of this trade
|
||||
portfolio.failed.revertToPending.popup=Do you want to move this trade to open trades?
|
||||
portfolio.failed.revertToPending=Move trade to open trades
|
||||
|
||||
portfolio.closed.completed=Completed
|
||||
|
|
@ -3027,7 +3031,7 @@ 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 transaction ID
|
||||
txIdTextField.blockExplorerIcon.tooltip=Open a blockchain explorer with this transaction ID
|
||||
txIdTextField.missingTx.warning.tooltip=Missing required transaction
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue