From 73d097566bd382eb88b8a42e429793bd8ea05764 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:06:51 +0300 Subject: [PATCH 1/8] gender-neutral language change in P2PService.java --- p2p/src/main/java/bisq/network/p2p/P2PService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/src/main/java/bisq/network/p2p/P2PService.java b/p2p/src/main/java/bisq/network/p2p/P2PService.java index 0e7a566f295..b5238d414c3 100644 --- a/p2p/src/main/java/bisq/network/p2p/P2PService.java +++ b/p2p/src/main/java/bisq/network/p2p/P2PService.java @@ -631,7 +631,7 @@ private boolean capabilityRequiredAndCapabilityNotSupported(NodeAddress peersNod return !result; } - log.warn("We don't have the peer in our persisted peers so we don't know his capabilities. " + + log.warn("We don't have the peer in our persisted peers so we don't know their capabilities. " + "We decide to not sent the msg. peersNodeAddress={}", peersNodeAddress); return true; From e257df424481c8299b2e14b63999ea2c833ce843 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:12:19 +0300 Subject: [PATCH 2/8] Update displayStrings.properties --- core/src/main/resources/i18n/displayStrings.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index c534f009849..7568276eaff 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -503,7 +503,7 @@ takeOffer.failed.offerTaken=You cannot take that offer because the offer was alr takeOffer.failed.offerRemoved=You cannot take that offer because the offer has been removed in the meantime. takeOffer.failed.offererNotOnline=Take offer request failed because maker is not online anymore. takeOffer.failed.offererOffline=You cannot take that offer because the maker is offline. -takeOffer.warning.connectionToPeerLost=You lost connection to the maker.\nHe might have gone offline or has closed the connection to you because of too many open connections.\n\nIf you can still see his offer in the offerbook you can try to take the offer again. +takeOffer.warning.connectionToPeerLost=You lost connection to the maker.\nThey might have gone offline or has closed the connection to you because of too many open connections.\n\nIf you can still see their offer in the offerbook you can try to take the offer again. takeOffer.error.noFundsLost=\n\nNo funds have left your wallet yet.\nPlease try to restart your application and check your network connection to see if you can resolve the issue. takeOffer.error.feePaid=\n\nPlease try to restart your application and check your network connection to see if you can resolve the issue. @@ -1078,7 +1078,7 @@ account.arbitratorSelection.whichDoYouAccept=Which arbitrators do you accept account.arbitratorSelection.autoSelect=Auto select all arbitrators with matching language account.arbitratorSelection.regDate=Registration date account.arbitratorSelection.languages=Languages -account.arbitratorSelection.cannotSelectHimself=An arbitrator cannot select himself for trading. +account.arbitratorSelection.cannotSelectHimself=An arbitrator cannot select themselves for trading. account.arbitratorSelection.noMatchingLang=No matching language. account.arbitratorSelection.noLang=You can only select arbitrators who are speaking at least 1 common language. account.arbitratorSelection.minOne=You need to have at least one arbitrator selected. From ce431425074b03acbc4ec51e027f99d77b9a8a6f Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:14:01 +0300 Subject: [PATCH 3/8] Update TacWindow.java --- .../main/java/bisq/desktop/main/overlays/windows/TacWindow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java index ad62b5017e7..0f05ce75b22 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java @@ -84,7 +84,7 @@ public void show() { "accordance with the Bisq arbitration rules as at present in force. The arbitration is conducted online. " + "The language to be used in the arbitration proceedings shall be English if not otherwise stated.\n\n" + - "6. The user confirms that he has read and agreed to the rules regarding the dispute process:\n" + + "6. The user confirms that they have read and agreed to the rules regarding the dispute process:\n" + " - You must complete trades within the maximum duration specified for each payment method.\n" + " - You must enter the trade ID in the \"reason for payment\" text field when doing the fiat payment transfer.\n" + " - If the bank of the fiat sender charges fees, the sender (" + Res.getBaseCurrencyCode() + " buyer) has to cover the fees.\n" + From a25aeef9e7566bfbe236fc4892ad2cc7a4cff5d4 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:16:15 +0300 Subject: [PATCH 4/8] Update GetDataRequestHandler.java --- .../bisq/network/p2p/peers/getdata/GetDataRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java b/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java index 35e6c9ec217..e46fd4086e9 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java +++ b/p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java @@ -161,7 +161,7 @@ private Set getFilteredProtectedStorageEntries(GetDataReq if (connection.getCapabilities().containsAll(((CapabilityRequiringPayload) protectedStoragePayload).getRequiredCapabilities())) doAdd = true; else - log.debug("We do not send the message to the peer because he does not support the required capability for that message type.\n" + + log.debug("We do not send the message to the peer because they do not support the required capability for that message type.\n" + "storagePayload is: " + Utilities.toTruncatedString(protectedStoragePayload)); } else { doAdd = true; From 42a69c73bb3009024707f6a649f766e4c45bc726 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:31:35 +0300 Subject: [PATCH 5/8] add missing corrections --- core/src/main/resources/i18n/displayStrings.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 7568276eaff..014952778c4 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -606,7 +606,7 @@ portfolio.pending.step2_seller.waitPayment.headline=Wait for payment portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information portfolio.pending.step2_seller.waitPayment.msg=The deposit transaction has at least one blockchain confirmation.\nYou need to wait until the BTC buyer starts the {0} payment. portfolio.pending.step2_seller.warn=The BTC buyer still has not done the {0} payment.\nYou need to wait until they have started the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate. -portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started his payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute. +portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started their payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute. tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}'' tradeChat.openChat=Open chat window @@ -848,7 +848,7 @@ support.filter=Filter list support.filter.prompt=Enter trade ID, date, onion address or account data support.noTickets=There are no open tickets support.sendingMessage=Sending Message... -support.receiverNotOnline=Receiver is not online. Message is saved to his mailbox. +support.receiverNotOnline=Receiver is not online. Message is saved to their mailbox. support.sendMessageError=Sending message failed. Error: {0} support.wrongVersion=The offer in that dispute has been created with an older version of Bisq.\n\ You cannot close that dispute with your version of the application.\n\n\ From 688bb4e4232838f187dab662efc01b94521a588b Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:35:38 +0300 Subject: [PATCH 6/8] Update displayStrings.properties --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 014952778c4..0e23918fe8f 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -742,7 +742,7 @@ portfolio.pending.disputeOpened=Dispute opened portfolio.pending.openSupport=Open support ticket portfolio.pending.supportTicketOpened=Support ticket opened portfolio.pending.requestSupport=Request support -portfolio.pending.error.requestSupport=Please report the problem to your arbitrator.\n\nHe will forward the information to the developers to investigate the problem.\nAfter the problem has been analyzed you will get back all locked funds. +portfolio.pending.error.requestSupport=Please report the problem to your arbitrator.\n\nThey will forward the information to the developers to investigate the problem.\nAfter the problem has been analyzed you will get back all locked funds. portfolio.pending.communicateWithArbitrator=Please communicate in the \"Support\" screen with the arbitrator. portfolio.pending.supportTicketOpenedMyUser=You opened already a support ticket.\n{0} portfolio.pending.disputeOpenedMyUser=You opened already a dispute.\n{0} From 7b2ab4addafb6ecbfafc241701e52fffd2c3ac91 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:36:42 +0300 Subject: [PATCH 7/8] Update ApplyFilter.java --- .../main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java index 92c1185d950..84347281530 100644 --- a/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java +++ b/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java @@ -48,7 +48,7 @@ protected void run() { FilterManager filterManager = processModel.getFilterManager(); if (nodeAddress != null && filterManager.isNodeAddressBanned(nodeAddress)) { - failed("Other trader is banned by his node address.\n" + + failed("Other trader is banned by their node address.\n" + "tradingPeerNodeAddress=" + nodeAddress); } else if (filterManager.isOfferIdBanned(trade.getId())) { failed("Offer ID is banned.\n" + @@ -60,7 +60,7 @@ protected void run() { failed("Payment method is banned.\n" + "Payment method=" + trade.getOffer().getPaymentMethod().getId()); } else if (filterManager.isPeersPaymentAccountDataAreBanned(paymentAccountPayload, appliedPaymentAccountFilter)) { - failed("Other trader is banned by his trading account data.\n" + + failed("Other trader is banned by their trading account data.\n" + "paymentAccountPayload=" + paymentAccountPayload.getPaymentDetails() + "\n" + "banFilter=" + appliedPaymentAccountFilter[0].toString()); } else if (filterManager.requireUpdateToNewVersionForTrading()) { From 74215d1846f92b271a1084d15a8c10168f87e0a1 Mon Sep 17 00:00:00 2001 From: Gordon E <45173186+gordonel@users.noreply.github.com> Date: Tue, 3 Sep 2019 12:38:14 +0300 Subject: [PATCH 8/8] Update TakeOfferDataModel.java --- .../bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java index e27356082de..3b9f5a78507 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java @@ -362,7 +362,7 @@ public void estimateTxSize() { feeTxSize = 380; txFeeFromFeeService = txFeePerByteFromFeeService.multiply(feeTxSize); log.info("We cannot do the fee estimation because there are no funds in the wallet.\nThis is expected " + - "if the user has not funded his wallet yet.\n" + + "if the user has not funded their wallet yet.\n" + "In that case we use an estimated tx size of 380 bytes.\n" + "txFee based on estimated size of {} bytes. feeTxSize = {} bytes. Actual tx size = {} bytes. TxFee is {} ({} sat/byte)", feeTxSize, feeTxSize, txSize, txFeeFromFeeService.toFriendlyString(), feeService.getTxFeePerByte());