Merge pull request #3756 from bisq-network/release/v1.2.4

Release/v1.2.4

build.gradle

@@ -275,7 +275,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.2.3-SNAPSHOT'
+    version = '1.2.4-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

common/src/main/java/bisq/common/app/Version.java

@@ -27,7 +27,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.2.3";
+    public static final String VERSION = "1.2.4";
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

core/src/main/resources/i18n/displayStrings_ja.properties

@@ -672,7 +672,6 @@ portfolio.pending.step5_buyer.takersMiningFee=合計マイニング手数料
 portfolio.pending.step5_buyer.refunded=返金されたセキュリティデポジット
 portfolio.pending.step5_buyer.withdrawBTC=ビットコインを出金する
 portfolio.pending.step5_buyer.amount=出金額
-portfolio.pending.step5_buyer.signer=By withdrawing your bitcoins, you verify that the counterparty has acted according to the trade protocol.
 portfolio.pending.step5_buyer.withdrawToAddress=出金先アドレス
 portfolio.pending.step5_buyer.moveToBisqWallet=資金をBisqウォレットに移動する
 portfolio.pending.step5_buyer.withdrawExternal=外部ウォレットに出金する
@@ -873,7 +872,7 @@ support.sellerOfferer=BTC 売り手/メイカー
 support.buyerTaker=BTC 買い手/テイカー
 support.sellerTaker=BTC 売り手/テイカー
 
-support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders 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.The arbitrator has the third key of the deposit transaction and will make the payout based on their findings.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders 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 Bisq DAO.
 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\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\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\nPlease 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● 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\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2}
 support.systemMsg=システムメッセージ: {0}
 support.youOpenedTicket=サポートのリクエスト開始しました。\n\n{0}\n\nBisqバージョン: {1}
@@ -1038,7 +1037,7 @@ account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements
 account.altcoin.popup.wallet.confirm=どのウォレットを使うべきか理解しており、承認する
 account.altcoin.popup.upx.msg=Trading UPX on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending UPX, you need to use either the official uPlexa GUI wallet or uPlexa CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nuplexa-wallet-cli (use the command get_tx_key)\nuplexa-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The UPX sender is responsible for providing verification of the UPX transfer to the arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit uPlexa discord channel (https://discord.gg/vhdNSrV) or the uPlexa Telegram Chat (https://t.me/uplexaOfficial) to find more information.
 account.altcoin.popup.arq.msg=Trading ARQ on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending ARQ, you need to use either the official ArQmA GUI wallet or ArQmA CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\narqma-wallet-cli (use the command get_tx_key)\narqma-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The ARQ sender is responsible for providing verification of the ARQ transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) or the ArQmA forum (https://labs.arqma.com) to find more information.
-account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending XMR, you need to use either the official Monero GUI wallet or Monero CLI wallet with the store-tx-info flag enabled (default in new versions). Please be sure you can access the tx key as that would be required in case of a dispute.\nmonero-wallet-cli (use the command get_tx_key)\nmonero-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nIn addition to XMR checktx tool (https://xmr.llcoins.net/checktx.html) verification can also be accomplished in-wallet.\nmonero-wallet-cli : using command (check_tx_key).\nmonero-wallet-gui : on the Advanced > Prove/Check page.\nAt normal block explorers the transfer is not verifiable.\n\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The XMR sender is responsible for providing verification of the XMR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process visit (https://www.getmonero.org/resources/user-guides/prove-payment.html) or the Monero forum (https://forum.getmonero.org) to find more information.
+account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand and fulfill the following requirements:\n\nProve payments: since Monero is a private coin, some transaction details aren't publicly available in the blockchain, and, in case of a dispute, the mediator or arbitrator needs them to check if the transaction was really made. In Bisq, the sender of the XMR transaction is the one responsible for providing this information to the mediator or arbitrator in case of a dispute. In order to do that, you must send XMR using a wallet that provides the information required to prove the payment was made, which includes:\n\n- the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n- the transaction ID (Tx ID or Tx Hash)\n- the destination address (recipient's address)\n\nThis information can be found in the official Monero GUI & CLI wallets, MyMonero, and Exodus (desktop) as well as in Cake Wallet, MyMonero, and Monerujo (mobile), in the following locations:\n\n- Monero GUI: go to Transactions tab\n- Monero CLI: use the command get_tx_key TXID. The flag store-tx-info must be enabled (enabled by default in new versions)\n- Other wallets: go to Transactions history and search for Transaction key (Tx key or Secret key) and the destination address in a sent transaction. Save recipient address option must be enabled in Cake Wallet settings.\n\nIf you are using a wallet different from the mentioned above, please be sure you can access those three pieces of information.Since the transaction key and the destination address are stored in the Monero wallet software, and they cannot be recovered in the Monero blockchain, you should never delete or restore your Monero wallet before a Bisq trade is completed. Failure to provide the above data will result in losing the dispute case.\n\nCheck payments: with those three pieces of information, the verification that a quantity of Monero was sent to a specific address can be accomplished the following way:\n\n- Monero GUI: change wallet to Advanced mode and go to Advanced > Prove/check > Check Transaction\n- Monero CLI: use the command check_tx_key TXID TXKEY ADDRESS\n- XMR checktx tool (https://xmr.llcoins.net/checktx.html)\n- Explore Monero website (https://www.exploremonero.com/receipt)\n\nIf you are still not sure about this process, visit (https://www.getmonero.org/resources/user-guides/prove-payment.html) to find more information or ask a question on the Monero support subreddit (https://www.reddit.com/r/monerosupport/).
 # suppress inspection "TrailingSpacesInProperty"
 account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill the following requirements:\n\nFor sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as that would be required in case of a dispute.\nmasari-wallet-cli (use the command get_tx_key)\nmasari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\nMasari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\nVerification can be accomplished in-wallet.\nmasari-wallet-cli : using command (check_tx_key).\nmasari-wallet-gui : on the Advanced > Prove/Check page.\nVerification can be accomplished in the block explorer \nOpen block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\nOnce transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\nYou need to provide the mediator or arbitrator the following data in case of a dispute:\n- The tx private key\n- The transaction hash\n- The recipient's public address\n\nFailure to provide the above data, or if you used an incompatible wallet, will result in losing the dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the mediator or arbitrator in case of a dispute.\n\nThere is no payment ID required, just the normal public address.\nIf you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs).
 account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill the following requirements:\n\nTo send BLUR you must use the Blur Network CLI or GUI Wallet. \n\nIf you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save this information. Immediately after sending the transfer, you must use the command 'get_tx_key' to retrieve the transaction private key. If you fail to perform this step, you may not be able to retrieve the key later. \n\nIf you are using the Blur Network GUI Wallet, the transaction private key and transaction ID can be found conveniently in the "History" tab.  Immediately after sending, locate the transaction of interest. Click the "?" symbol in the lower-right corner of the box containing the transaction. You must save this information. \n\nIn the event that arbitration is necessary, you must present the following to an mediator or arbitrator: 1.) the transaction ID, 2.) the transaction private key, and 3.) the recipient's address.  The mediator or arbitrator will then verify the BLUR transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nFailure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the BLUR sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -1169,6 +1168,7 @@ dao.lockedForVoteBalance=投票に使用済
 dao.lockedInBonds=ロック中の担保
 dao.availableNonBsqBalance=利用可能な非BSQ残高 (BTC)
 dao.totalBsqBalance=合計BSQ残高
+dao.reputationBalance=Merit Value (not spendable)
 
 dao.tx.published.success=トランザクションの発行に成功しました
 dao.proposal.menuItem.make=提案する
@@ -1961,7 +1961,7 @@ showWalletDataWindow.includePrivKeys=プライベートキーを含む
 tacWindow.headline=ユーザー規約
 tacWindow.agree=同意します
 tacWindow.disagree=同意せずにに終了
-tacWindow.arbitrationSystem=調停システム
+tacWindow.arbitrationSystem=Dispute resolution
 
 tradeDetailsWindow.headline=トレード
 tradeDetailsWindow.disputedPayoutTxId=係争中の支払い取引ID:
@@ -2152,7 +2152,7 @@ systemTray.show=アプリケーションウィンドウを表示
 systemTray.hide=アプリケーションウィンドウを隠す
 systemTray.info=Bisqについての情報
 systemTray.exit=終了
-systemTray.tooltip=Bisq: 非中央集権の交換ネットワーク
+systemTray.tooltip=Bisq: A decentralized bitcoin exchange network
 
 
 ####################################################################