Merge branch 'master' into list-gamblecoin-asset

assets/src/main/java/bisq/asset/CryptonoteAddressValidator.java

@@ -49,6 +49,10 @@ public class CryptonoteAddressValidator implements AddressValidator {
 				//Aeon & Blur-type addresses
 				return AddressValidationResult.validAddress();
 			}
+            else if (prefix.length() == 4 && address.length() == 94 + prefix.length()) {
+			    // FourtyTwo-type address
+				return AddressValidationResult.validAddress();
+			}
 			else {
 				//Non-supported prefix
 				return AddressValidationResult.invalidStructure();
@@ -63,6 +67,10 @@ public class CryptonoteAddressValidator implements AddressValidator {
 				// Aeon, Mask & Blur-type subaddress
 				return AddressValidationResult.validAddress();
 			}
+            if (subAddressPrefix.length() == 5 && address.length() == 96 + subAddressPrefix.length()) {
+				// FourtyTwo-type subaddress
+				return AddressValidationResult.validAddress();
+			}
 			else {
             // Non-supported subAddress
             return AddressValidationResult.invalidStructure();

assets/src/main/java/bisq/asset/coins/Dextro.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AddressValidationResult;
+import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+import bisq.asset.NetworkParametersAdapter;
+
+public class Dextro extends Coin {
+
+    public Dextro() {
+        super("Dextro", "DXO", new Base58BitcoinAddressValidator(new DextroParams()));
+    }
+
+
+    public static class DextroAddressValidator extends Base58BitcoinAddressValidator {
+
+        public DextroAddressValidator() {
+            super(new DextroParams());
+        }
+
+        @Override
+        public AddressValidationResult validate(String address) {
+            if (!address.matches("^[D][a-km-zA-HJ-NP-Z1-9]{33}$"))
+                return AddressValidationResult.invalidStructure();
+
+            return super.validate(address);
+        }
+    }
+
+    
+    public static class DextroParams extends NetworkParametersAdapter {
+
+        public DextroParams() {
+            super();
+            addressHeader = 30;
+            p2shHeader = 90;
+            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
+        }
+    }
+}

assets/src/main/java/bisq/asset/coins/FourtyTwo.java

@@ -0,0 +1,28 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.Coin;
+import bisq.asset.CryptonoteAddressValidator;
+
+public class FourtyTwo extends Coin {
+
+    public FourtyTwo() {
+        super("FourtyTwo", "FRTY", new CryptonoteAddressValidator("foUr", "SNake"));
+    }
+}

assets/src/main/java/bisq/asset/coins/IdaPay.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AddressValidationResult;
+import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+import bisq.asset.NetworkParametersAdapter;
+
+public class IdaPay extends Coin {
+
+    public IdaPay() {
+        super("IdaPay", "IDA", new IdaPayAddressValidator());
+    }
+
+
+    public static class IdaPayAddressValidator extends Base58BitcoinAddressValidator {
+
+        public IdaPayAddressValidator() {
+            super(new IdaPayParams());
+        }
+
+        @Override
+        public AddressValidationResult validate(String address) {
+            if (!address.matches("^[CD][a-km-zA-HJ-NP-Z1-9]{33}$"))
+                return AddressValidationResult.invalidStructure();
+
+            return super.validate(address);
+        }
+    }
+
+
+    public static class IdaPayParams extends NetworkParametersAdapter {
+
+        public IdaPayParams() {
+            super();
+            addressHeader = 29;
+            p2shHeader = 36;
+            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
+        }
+    }
+}

assets/src/main/java/bisq/asset/coins/SpaceCash.java

@@ -0,0 +1,28 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.Coin;
+import bisq.asset.RegexAddressValidator;
+
+public class SpaceCash extends Coin {
+
+    public SpaceCash() {
+        super("SpaceCash", "SPACE", new RegexAddressValidator("^([0-9a-z]{76})$"));
+    }
+}

assets/src/main/java/bisq/asset/coins/UnitedCommunityCoin.java

@@ -0,0 +1,57 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AddressValidationResult;
+import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+import bisq.asset.NetworkParametersAdapter;
+
+public class UnitedCommunityCoin extends Coin {
+
+    public UnitedCommunityCoin() {
+        super("UnitedCommunityCoin", "UCC", new UnitedCommunityCoinAddressValidator());
+    }
+
+
+    public static class UnitedCommunityCoinAddressValidator extends Base58BitcoinAddressValidator {
+
+        public UnitedCommunityCoinAddressValidator() {
+            super(new UnitedCommunityCoinParams());
+        }
+
+        @Override
+        public AddressValidationResult validate(String address) {
+            if (!address.matches("^[U][a-km-zA-HJ-NP-Z1-9]{33}$"))
+                return AddressValidationResult.invalidStructure();
+
+            return super.validate(address);
+        }
+    }
+
+
+    public static class UnitedCommunityCoinParams extends NetworkParametersAdapter {
+
+        public UnitedCommunityCoinParams() {
+            super();
+            addressHeader = 68;
+            p2shHeader = 18;
+            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
+        }
+    }
+}

assets/src/main/resources/META-INF/services/bisq.asset.Asset

@@ -19,13 +19,16 @@ bisq.asset.coins.Counterparty
 bisq.asset.coins.Croat
 bisq.asset.coins.Dash
 bisq.asset.coins.Decred
+bisq.asset.coins.Dextro
 bisq.asset.coins.Dogecoin
 bisq.asset.coins.Dragonglass
 bisq.asset.coins.Ether
 bisq.asset.coins.EtherClassic
 bisq.asset.coins.GambleCoin
+bisq.asset.coins.FourtyTwo
 bisq.asset.coins.Gridcoin
 bisq.asset.coins.Horizen
+bisq.asset.coins.IdaPay
 bisq.asset.coins.Iridium
 bisq.asset.coins.Kekcoin
 bisq.asset.coins.Litecoin
@@ -46,10 +49,12 @@ bisq.asset.coins.Remix
 bisq.asset.coins.Ryo
 bisq.asset.coins.Siafund
 bisq.asset.coins.SiaPrimeCoin
+bisq.asset.coins.SpaceCash
 bisq.asset.coins.Spectrecoin
 bisq.asset.coins.Starwels
 bisq.asset.coins.SUB1X
 bisq.asset.coins.TurtleCoin
+bisq.asset.coins.UnitedCommunityCoin
 bisq.asset.coins.Unobtanium
 bisq.asset.coins.Zcash
 bisq.asset.coins.Zcoin

assets/src/test/java/bisq/asset/coins/DextroTest.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+
+import org.junit.Test;
+
+public class DextroTest extends AbstractAssetTest {
+
+    public DextroTest() {
+        super(new Dextro());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("DP9LSAMzxNAuSei1GH3pppMjDqBhNrSGov");
+        assertValidAddress("D8HwxDXPJhrSYonPF7YbCGENkM88cAYKb5");
+        assertValidAddress("DLhJt6UfwMtWLGMH3ADzjqaLaGG6Bz96Bz");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("DP9LSAMzxNAuSei1GH3pppMjDqBhNrSG0v");
+        assertInvalidAddress("DP9LSAMzxNAuSei1GH3pppMjDqBhNrSGovx");
+        assertInvalidAddress("DP9LSAMzxNAuSei1GH3pppMjDqBhNrSG#v");
+    }
+}

assets/src/test/java/bisq/asset/coins/FourtyTwoTest.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+import org.junit.Test;
+
+public class FourtyTwoTest extends AbstractAssetTest {
+
+    public FourtyTwoTest() {
+        super(new FourtyTwo());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("foUrDvc6vtJYMvqpx4oydJjL445udJ83M8rAqpkF8hEcbyLCp5MhvLaLGXtVYkqVXDG8YEpGBU7F241FtWXVCFEK7EMgnjrsM8");
+        assertValidAddress("foUrFDEDkMGjV4HJzgYqSHhPTFaHfcpLM4WGZjYQZyrcCgyZs32QweCZEysK8eNxgsWdXv3YBP8QWDDWBAPu55eJ6gLf2TubwG");
+        assertValidAddress("SNakeyQFcEacGHFaCgj4VpdfM3VTsFDygNHswx3CtKpn8uD1DmrbFwfM11cSyv3CZrNNWh4AALYuGS4U4pxYPHTiBn2DUJASoQw4B");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("fUrDvc6vtJYMvqpx4oydJjL445udJ83M8rAqpkF8hEcbyLCp5MhvLaLGXtVYkqVXDG8YEpGBU7F241FtWXVCFEK7EMgnjrsM8");
+        assertInvalidAddress("UrFDEDkMGjV4HJzgYqSHhPTFaHfcpLM4WGZjYQZyrcCgyZs32QweCZEysK8eNxgsWdXv3YBP8QWDDWBAPu55eJ6gLf2TubwG");
+        assertInvalidAddress("keyQFcEacGHFaCgj4VpdfM3VTsFDygNHswx3CtKpn8uD1DmrbFwfM11cSyv3CZrNNWh4AALYuGS4U4pxYPHTiBn2DUJASoQw4B!");
+        assertInvalidAddress("akeyQFcEacGHFaCgj4VpdfM3VTsFDygNHswx3CtKpn8uD1DmrbFwfM11cSyv3CZrNNWh4AALYuGS4U4pxYPHTiBn2DUJASoQw4B");
+    }
+}

assets/src/test/java/bisq/asset/coins/IdaPayTest.java

@@ -0,0 +1,45 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+
+import org.junit.Test;
+
+public class IdaPayTest extends AbstractAssetTest {
+
+    public IdaPayTest() {
+        super(new IdaPay());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("Cj6A8JJvovgSTiMc4r6PaJPrfwQnwnHDpg");
+        assertValidAddress("D4SEkXMAcxRBu2Gc1KpgcGunAu5rWttjRy");
+        assertValidAddress("CopBThXxkziyQEG6WxEfx36Ty46DygzHTW");
+        assertValidAddress("D3bEgYWDS7fxfu9y1zTSrcdP681w3MKw6W");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("Cj6A8JJv0vgSTiMc4r6PaJPrfwQnwnHDpg");
+        assertInvalidAddress("D4SEkXMAcxxRBu2Gc1KpgcGunAu5rWttjRy");
+        assertInvalidAddress("CopBThXxkziyQEG6WxEfx36Ty4#DygzHTW");
+        assertInvalidAddress("13bEgYWDS7fxfu9y1zTSrcdP681w3MKw6W");
+    }
+}

assets/src/test/java/bisq/asset/coins/SpaceCashTest.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+
+import org.junit.Test;
+
+public class SpaceCashTest extends AbstractAssetTest {
+
+    public SpaceCashTest() {
+        super(new SpaceCash());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("d9fe1331ed2ae1bbdfe0e2942e84d74b7310648e5a5f14c4980ec2c6a19f08af6894b9060e83");
+        assertValidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca2031");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca20311");
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca203");
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca2031#");
+        assertInvalidAddress("bvQpKvb1SswwxVTuyZocHWCVsUeGq7MwoR");
+        assertInvalidAddress("d9fe1331ed2ae1bbdfe0e2942e84d74b7310648e5a5f14c4980ec2c6a19f08af6894b9060E83");
+    }
+}

assets/src/test/java/bisq/asset/coins/UnitedCommunityCoinTest.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+
+import org.junit.Test;
+
+public class UnitedCommunityCoinTest extends AbstractAssetTest {
+
+    public UnitedCommunityCoinTest() {
+        super(new UnitedCommunityCoin());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("UX3DVuoiNR9Uwa22NLehu8yVKecjFKn4ii");
+        assertValidAddress("URqRRRFY7D6drJCput5UjTRUQYEL8npUwk");
+        assertValidAddress("Uha1WUkuYtW9Uapme2E46PBz2sBkM9qV9w");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("UX3DVuoiNR90wa22NLehu8yVKecjFKn4ii");
+        assertInvalidAddress("URqRRRFY7D6drJCput5UjTRUQYaEL8npUwk");
+        assertInvalidAddress("Uha1WUkuYtW9Uapme2E46PBz2$BkM9qV9w");
+    }
+}

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

@@ -580,7 +580,7 @@ portfolio.pending.step3_buyer.warn.part1b=at your payment provider (e.g. bank)
 portfolio.pending.step3_buyer.warn.part2=The BTC seller still has not confirmed your payment!\nPlease check {0} if the payment sending was successful.\nIf the BTC seller does not confirm the receipt of your payment by {1} the trade will be investigated by the arbitrator.
 portfolio.pending.step3_buyer.openForDispute=The BTC seller has not confirmed your payment!\nThe max. 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.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.part=Your trading partner has confirmed that he initiated the {0} payment.\n\n
+portfolio.pending.step3_seller.part=Your trading partner has confirmed that they have initiated the {0} payment.\n\n
 portfolio.pending.step3_seller.altcoin.explorer=on your favorite {0} blockchain explorer
 portfolio.pending.step3_seller.altcoin.wallet=at your {0} wallet
 portfolio.pending.step3_seller.altcoin={0}Please check {1} if the transaction to your receiving address\n\
@@ -589,7 +589,7 @@ has already sufficient blockchain confirmations.\nThe payment amount has to be {
 You can copy & paste your {4} address from the main screen after closing that popup.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.\n\n\
 The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"
-portfolio.pending.step3_seller.bank=Your trading partner has confirmed that he initiated the {0} payment.\n\n\
+portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\n\
   Please go to your online banking web page and check if you have received {1} from the BTC buyer.\n\n\
 The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"\n\n
 portfolio.pending.step3_seller.cash=Because the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
@@ -1000,9 +1000,9 @@ described on the {1} web page.\nUsing wallets from centralized exchanges where (
 (b) which don''t use compatible wallet software is risky: it can lead to loss of the traded funds!\nThe arbitrator is \
 not a {2} specialist and cannot help in such cases.
 account.altcoin.popup.wallet.confirm=I understand and confirm that I know which wallet I need to use.
-account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure you understand and fulfill \
+account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
-For sending XMR you need to use either the official Monero GUI wallet or Monero CLI wallet with the \
+For 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.\n\
 monero-wallet-cli (use the command get_tx_key)\n\
@@ -1015,13 +1015,13 @@ You 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\n\
-If you cannot provide the above data or if you used an incompatible wallet it would result in losing the \
-dispute case. The XMR sender is responsible to be able to verify the XMR transfer to the \
+Failure 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 \
 arbitrator in case of a dispute.\n\n\
 There is no payment ID required, just the normal public address.\n\
 If 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.blur.msg=If you want to trade BLUR on Bisq please be sure you understand and fulfill \
+account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
 To send BLUR you must use the Blur Network CLI or GUI Wallet. \n\n\
 If you are using the CLI wallet, a transaction hash (tx ID) will be displayed after a transfer is sent. You must save \
@@ -1033,22 +1033,22 @@ lower-right corner of the box containing the transaction. You must save this inf
 In the event that arbitration is necessary, you must present the following to an arbitrator: 1.) the transaction ID, \
 2.) the transaction private key, and 3.) the recipient's address.  The arbitrator will then verify the BLUR \
 transfer using the Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\n\
-If you cannot provide the required information to the arbitrator, you will lose the dispute. In all cases of dispute, the \
-BLUR sender bears 100% of the burden of responsiblity in verifying transactions to an arbitrator. \n\n\
+Failure to provide the required information to the 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 arbitrator. \n\n\
 If you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
-account.altcoin.popup.ccx.msg=If you want to trade CCX on Bisq please be sure you understand the following requirements:\n\n\
+account.altcoin.popup.ccx.msg=Trading CCX on Bisq requires that you understand the following requirements:\n\n\
 To send CCX you must use an official Conceal wallet, either CLI or GUI. After sending a transfer payment, the wallets\n\
 display the transaction secret key. You must save it along with the transaction hash (ID) and the recipient's public\n\
 address in case arbitration is necessary. In such a case, you must give all three to the arbitrator, who will then\n\
 verify the CCX transfer using the Conceal Transaction Viewer (https://explorer.conceal.network/txviewer).\n\
 Because Conceal is a privacy coin, block explorers cannot verify transfers.\n\n\
-If you cannot provide the required data to the arbitrator, you will lose the dispute case.\n\
+Failure to provide the required data to the arbitrator will result in losing the dispute case.\n\
 If you do not save the transaction secret key immediately after transferring CCX, it cannot be recovered later.\n\
 If you do not understand these requirements, seek help at the Conceal discord (http://discord.conceal.network).
 account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
-Because of the privacy Dragonglass provides a transaction is not verifyable on the public blockchain. If required you \
-can prove your payment thru use of your TXN-Private-Key.\n\
+Because of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you \
+can prove your payment through the use of your TXN-Private-Key.\n\
 The TXN-Private Key is a one-time key automatically generated for every transaction that can \
 only be accessed from within your DRGL wallet.\n\
 Either by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\n\
@@ -1058,8 +1058,8 @@ In case of a dispute, you must provide the arbitrator the following data:\n\
 - The transaction hash\n\
 - The recipient's public address\n\n\
 Verification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\n\
-If you cannot provide the above data or if you used an incompatible wallet it would result in losing the \
-dispute case. The Dragonglass sender is responsible to be able to verify the DRGL transfer to the \
+Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \
+dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the \
 arbitrator in case of a dispute. Use of PaymentID is not required.\n\n\
 If you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help.
 account.altcoin.popup.ZEC.msg=When using {0} you can only use the transparent addresses (starting with t) not \
@@ -1463,7 +1463,7 @@ dao.burnBsq.assets.lookBackPeriod=Verification period
 dao.burnBsq.assets.trialFee=Fee for trial period
 dao.burnBsq.assets.totalFee=Total fees paid
 dao.burnBsq.assets.days={0} days
-dao.burnBsq.assets.toFewDays=The asset fee is too low. The min. amount of days for the trial perios is {0}.
+dao.burnBsq.assets.toFewDays=The asset fee is too low. The min. amount of days for the trial period is {0}.
 
 # suppress inspection "UnusedProperty"
 dao.assetState.UNDEFINED=Undefined
@@ -2344,7 +2344,7 @@ payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Author
   The receipt must clearly show the seller's full name, country, state and the amount. The buyer will get displayed the seller's email in the trade process.
 payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. \
   The receipt must clearly show the seller's full name, city, country and the amount. The buyer will get displayed the seller's email in the trade process.
-payment.halCash.info=When using HalCash the BTC buyer need to send the BTC seller the HalCash code via a text message from the mobile phone.\n\n\
+payment.halCash.info=When using HalCash the BTC buyer needs to send the BTC seller the HalCash code via a text message from their mobile phone.\n\n\
   Please make sure to not exceed the maximum amount your bank allows you to send with HalCash. \
   The min. amount per withdrawal is 10 EUR and the max. amount is 600 EUR. For repeated withdrawals it is \
   3000 EUR per receiver per day and 6000 EUR per receiver per month. Please cross check those limits with your \
@@ -2352,7 +2352,7 @@ payment.halCash.info=When using HalCash the BTC buyer need to send the BTC selle
   The withdrawal amount must be a multiple of 10 EUR as you cannot withdraw other amounts from an ATM. The \
   UI in the create-offer and take-offer screen will adjust the BTC amount so that the EUR amount is correct. You cannot use market \
   based price as the EUR amount would be changing with changing prices.\n\n\
-  In case of a dispute the BTC buyer need to provide the proof that he sent the EUR.
+  In case of a dispute the BTC buyer needs to provide the proof that they sent the EUR.
 payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk.\n\
   \n\
   To mitigate this risk, Bisq sets per-trade limits based on two factors:\n\
@@ -2383,7 +2383,7 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ
   The main differences are:\n\
   ● The trading peers need to exchange information about the meeting location and time by using their provided contact details.\n\
   ● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n\
-  ● If a maker has special 'terms and conditions' he needs to state those in the 'Addition information' text field in the account.\n\
+  ● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n\
   ● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n\
   ● In case of a dispute the arbitrator cannot help much as it is usually hard to get tamper proof evidence of what \
   happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to \