Merge branch 'master' into monitor

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/Aeon.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 Aeon extends Coin {
+
+     public Aeon() {
+        super("Aeon", "AEON", new CryptonoteAddressValidator("Wm", "Xn"));
+    }
+}

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/Horizen.java

@@ -24,14 +24,14 @@ import bisq.asset.Coin;
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Base58;
 
-public class ZenCash extends Coin {
+public class Horizen extends Coin {
 
-    public ZenCash() {
-        super("ZenCash", "ZEN", new ZenCashAddressValidator());
+    public Horizen() {
+        super("Horizen", "ZEN", new HorizenAddressValidator());
     }
 
 
-    public static class ZenCashAddressValidator implements AddressValidator {
+    public static class HorizenAddressValidator implements AddressValidator {
 
         @Override
         public AddressValidationResult validate(String address) {

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/Iridium.java

@@ -0,0 +1,25 @@
+/*
+ * 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 Iridium extends Coin {
+    public Iridium() {
+        super("Iridium", "IRD", new RegexAddressValidator("^ir[1-9A-Za-z^OIl]{95}"));
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+import bisq.asset.NetworkParametersAdapter;
+
+public class Pinkcoin extends Coin {
+
+    public Pinkcoin() {
+        super("Pinkcoin", "PINK", new Base58BitcoinAddressValidator(new PinkcoinParams()));
+    }
+
+
+    public static class PinkcoinParams extends NetworkParametersAdapter {
+
+        public PinkcoinParams() {
+            addressHeader = 3;
+            p2shHeader = 28;
+            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package bisq.asset.coins;
+
+import bisq.asset.AddressValidationResult;
+import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Coin;
+import bisq.asset.NetworkParametersAdapter;
+
+public class Qbase extends Coin {
+    public Qbase() {
+        super("Qbase", "QBS", new Qbase.QbaseAddressValidator());
+    }
+
+
+    public static class QbaseAddressValidator extends Base58BitcoinAddressValidator {
+
+        public QbaseAddressValidator() {
+            super(new Qbase.QbaseParams());
+        }
+
+        @Override
+        public AddressValidationResult validate(String address) {
+            if (!address.matches("^[B][a-km-zA-HJ-NP-Z1-9]{25,34}$"))
+                return AddressValidationResult.invalidStructure();
+
+            return super.validate(address);
+        }
+    }
+
+
+    public static class QbaseParams extends NetworkParametersAdapter {
+
+        public QbaseParams() {
+            addressHeader = 25;
+            p2shHeader = 5;
+            acceptableAddressCodes = new int[]{addressHeader, p2shHeader};
+        }
+    }
+}

assets/src/main/java/bisq/asset/coins/Remix.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 Remix extends Coin {
+
+    public Remix() {
+        super("Remix", "RMX", new RegexAddressValidator("^((REMXi|SubRM)[1-9A-HJ-NP-Za-km-z]{94})$"));
+    }
+}

assets/src/main/java/bisq/asset/coins/SiaPrimeCoin.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 SiaPrimeCoin extends Coin {
+
+    public SiaPrimeCoin() {
+        super("SiaPrimeCoin", "SCP", new RegexAddressValidator("^([0-9a-z]{76})$"));
+    }
+}

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

@@ -3,6 +3,7 @@
 # See bisq.asset.Asset and bisq.asset.AssetRegistry for further details.
 # See https://bisq.network/list-asset for complete instructions.
 bisq.asset.coins.Actinium
+bisq.asset.coins.Aeon
 bisq.asset.coins.BitcoinClashic
 bisq.asset.coins.BitcoinRhodium
 bisq.asset.coins.Bitcoin$Mainnet
@@ -18,11 +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.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
 bisq.asset.coins.Mask
@@ -32,20 +38,25 @@ bisq.asset.coins.MonetaryUnit
 bisq.asset.coins.MoX
 bisq.asset.coins.Namecoin
 bisq.asset.coins.Neos
+bisq.asset.coins.Pinkcoin
 bisq.asset.coins.PIVX
 bisq.asset.coins.PZDC
+bisq.asset.coins.Qbase
 bisq.asset.coins.QMCoin
 bisq.asset.coins.Radium
+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
-bisq.asset.coins.ZenCash
 bisq.asset.coins.Zero
 bisq.asset.coins.ZeroOneCoin
 bisq.asset.tokens.EtherStone

assets/src/test/java/bisq/asset/coins/AeonTest.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 AeonTest extends AbstractAssetTest {
+
+     public AeonTest() {
+        super(new Aeon());
+    }
+
+     @Test
+    public void testValidAddresses() {
+        assertValidAddress("WmsSXcudnpRFjXr5qZzEY5AF64J6CpFKHYXJS92rF9WjHVjQvJxrmSGNQnSfwwJtGGeUMKvLYn5nz2yL9f6M4FN51Z5r8zt4C");
+        assertValidAddress("XnY88EywrSDKiQkeeoq261dShCcz1vEDwgk3Wxz77AWf9JBBtDRMTD9Fe3BMFAVyMPY1sP44ovKKpi4UrAR26o661aAcATQ1k");
+        assertValidAddress("Wmu42kYBnVJgDhBUPEtK5dicGPEtQLDUVWTHW74GYvTv1Zrki2DWqJuWKcWV4GVcqnEMgb1ZiufinCi7WXaGAmiM2Bugn9yTx");
+    }
+
+     @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("WmsSXcudnpRFjXr5qZzEY5AF64J6CpFKHYXJS92rF9WjHVjQvJxrmSGNQnSfwwJtGGeUMKvLYn5nz2yL9f6M4FN51Z5r8zt4");
+        assertInvalidAddress("XnY88EywrSDKiQkeeoq261dShCcz1vEDwgk3Wxz77AWf9JBBtDRMTD9Fe3BMFAVyMPY1sP44ovKKpi4UrAR26o661aAcATQ1kZz");
+        assertInvalidAddress("XaY88EywrSDKiQkeeoq261dShCcz1vEDwgk3Wxz77AWf9JBBtDRMTD9Fe3BMFAVyMPY1sP44ovKKpi4UrAR26o661aAcATQ1k");
+        assertInvalidAddress("Wmu42kYBnVJgDhBUPEtK5dicGPEtQLDUVWTHW74GYv#vZrki2DWqJuWKcWV4GVcqnEMgb1ZiufinCi7WXaGAmiM2Bugn9yTx");
+    }
+}

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/HorizenTest.java

@@ -21,10 +21,10 @@ import bisq.asset.AbstractAssetTest;
 
 import org.junit.Test;
 
-public class ZenCashTest extends AbstractAssetTest {
+public class HorizenTest extends AbstractAssetTest {
 
-    public ZenCashTest() {
-        super(new ZenCash());
+    public HorizenTest() {
+        super(new Horizen());
     }
 
     @Test

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/IridiumTest.java

@@ -0,0 +1,40 @@
+/*
+ * 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 IridiumTest extends AbstractAssetTest {
+    public IridiumTest() {
+        super(new Iridium());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("ir2oHYW7MbBQuMzTELg5o6FRqXNwWCU1wNzFsJG3VUCT9qMwayNsdwaQ85NHC3vLFSQ1eWtAPsYpvV4tXpnXKM9M377BW5KQ4");
+        assertValidAddress("ir2PK6y3hjq9wLqdTQnPQ2FXhCJqJ1pKXNXezZUqeUWbTb3T74Xqiy1Yqwtkgri934C1E9Ba2quJDDh75nxDqEQj1K8i9DQXf");
+        assertValidAddress("ir3steHWr1FRbtpjWWCAaxhzNggzJK6tqBy3qFw32YGV4CJdRsgYrpLifA7ivGdgZGNRKbRtYUp9GKvxnFSRFWTt2XuWunRYb");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("ir2oHYW7MbBQuMzTELg5o6FRqXNwWCU1wNzFsJG3VUCT9qMwayNsdwaQ85NHC3vLFSQ1eWtAPsYpvV4tXpnXKM9M377BW5KQ4t");
+        assertInvalidAddress("ir2PK6y3hjq9wLqdTQnPQ2FXhCJqJ1pKXNXezZUqeUWb#Tb3T74Xqiy1Yqwtkgri934C1E9Ba2quJDDh75nxDqEQj1K8i9DQXf");
+        assertInvalidAddress("");
+    }
+}

assets/src/test/java/bisq/asset/coins/PinkcoinTest.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 PinkcoinTest extends AbstractAssetTest {
+
+    public PinkcoinTest() {
+        super(new Pinkcoin());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("2KZEgvipDn5EkDAFB8UR8nVXuKuKt8rmgH");
+        assertValidAddress("2KVgwafcbw9LcJngqAzxu8UKpQSRwNhtTH");
+        assertValidAddress("2TPDcXRRmvTxJQ4V8xNhP1KmrTmH9KKCkg");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("PPo1gCi4xoC87gZZsnU2Uj6vSgZAAD9com");
+        assertInvalidAddress("z4Vg3S5pJEJY45tHX7u6X1r9tv2DEvCShi2");
+        assertInvalidAddress("1dQT9U73rNmomYkkxQwcNYhfQr9yy4Ani");
+    }
+}

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

@@ -0,0 +1,28 @@
+package bisq.asset.coins;
+
+import bisq.asset.AbstractAssetTest;
+
+import org.junit.Test;
+
+public class QbaseTest extends AbstractAssetTest {
+    public QbaseTest() {
+        super(new Qbase());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("BBrv1uUkQxpWayMvaVSw9Gr4X7CcdWUtcC");
+        assertValidAddress("BNMFjkDk9qqcF2rtoAbqbqWiHa41GPkQ2G");
+        assertValidAddress("B73WdFQXx8VGNg8h1BeJj6H2BEa1xrbtsT");
+        assertValidAddress("BGq4DH2BnS4kFWuNNQqfmiDLZvjaWtvnWX");
+        assertValidAddress("B9b8iTbVVcQrohrEnJ9ho4QUftHS3svB84");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("bBrv1uUkQxpWayMvaVSw9Gr4X7CcdWUtcC");
+        assertInvalidAddress("B3rv1uUkQxpWayMvaVSw9Gr4X7CcdWUtcC");
+        assertInvalidAddress("PXP75NnwDryYswQb9RaPFBchqLRSvBmDP");
+        assertInvalidAddress("PKr3vQ7S");
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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 RemixTest extends AbstractAssetTest {
+
+    public RemixTest() {
+        super(new Remix());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("REMXisBbsyWKYdENidNhiP3bGaVwVgtescK2ZuJMtxed4TqJGH8VX57gMSTyfC43FULSM4XXzmj727SGjDNak16mGaYdban4o4m");
+        assertValidAddress("REMXiqQhgfqWtZ1gfxP4iDbXEV4f8cUDFAp2Bz43PztJSJvv2mUqG4Z2YFBMauJV74YCDcJLyqkbCfsC55LNJhQfZxdiE5tGxKq");
+        assertValidAddress("SubRM7BgZyGiccN3pKuRPrN52FraE9j7miu17MDwx6wWb7J6XWeDykk48JBZ3QVSXR7GJWr2RdpjK3YCRAUdTbfRL4wGAn7oggi");
+        assertValidAddress("SubRM9N9dmoeawsXqNt94jVn6vSurYxxU3E6mEoMnzWvAMB7QjL3Zc9dmKTD64wE5ePFfACVLVLTZZa6GKVp6FuZ7Z9dJheMoJb");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("REMXiqQhgfqWtZ1gfxP4iDbXEV4f8cUDFAp2Bz43PztJSJvv2mUqG4Z2YFBMauJV74YCDcJLyqkbCfsC55LNJhQ");
+        assertInvalidAddress("REMXIqQhgfqWtZ1gfxP4iDbXEV4f8cUDFApdfgdfgdfgdfgr4453453453444JV74YCDcJLyqkbCfsC55LNJhQfZxdiE5tGxKq");
+        assertInvalidAddress("REMXiqQhgfqWtZ1gfxP4iDbXEV4f8cUDFAp2Bz43PztJS4dssdffffsdfsdfffffdfgdfgsaqkbCfsC4iDbXEV4f8cUDFAp2Bz");
+        assertInvalidAddress("SubRM9N9dmoeawsXqNt94jVn6vSurYxxU3E6mEoMnzWvAMB7QL3Zc9dmKTD64wE5ePFfACVLVLTZZa6GKVp6FuZ7Z9dJheMo69");
+        assertInvalidAddress("SubRM9N9dmoeawsXqNt94jdfsdfsdfsdfsdfsdfJb");
+        assertInvalidAddress("SubrM9N9dmoeawsXqNt94jVn6vSfeet");
+    }
+}

assets/src/test/java/bisq/asset/coins/SiaPrimeCoinTest.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 SiaPrimeCoinTest extends AbstractAssetTest {
+
+    public SiaPrimeCoinTest() {
+        super(new SiaPrimeCoin());
+    }
+
+    @Test
+    public void testValidAddresses() {
+        assertValidAddress("d9fe1331ed2ae1bbdfe0e2942e84d74b7310648e5a5f14c4980ec2c6a19f08af6894b9060e83");
+        assertValidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca2031");
+    }
+
+    @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca20311");
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca203");
+        assertInvalidAddress("205cf3be0f04397ee6cc1f52d8ae47f589a4ef5936949c158b2555df291efb87db2bbbca2031#");
+        assertInvalidAddress("bvQpKvb1SswwxVTuyZocHWCVsUeGq7MwoR");
+        assertInvalidAddress("d9fe1331ed2ae1bbdfe0e2942e84d74b7310648e5a5f14c4980ec2c6a19f08af6894b9060E83");
+    }
+}

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");
+    }
+}

build.gradle

@@ -49,7 +49,6 @@ configure(subprojects) {
     repositories {
         mavenCentral()
         maven { url 'https://jitpack.io' }
-        maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/8.0.3/release/' }
     }
 
     dependencies {
@@ -190,10 +189,10 @@ configure(project(':common')) {
 configure(project(':p2p')) {
     dependencies {
         compile project(':common')
-        compile('com.github.JesusMcCloud.netlayer:tor.native:0.6') {
+        compile('com.github.JesusMcCloud.netlayer:tor.native:0.6.2') {
             exclude(module: 'slf4j-api')
         }
-        compile('com.github.JesusMcCloud.netlayer:tor.external:0.6') {
+        compile('com.github.JesusMcCloud.netlayer:tor.external:0.6.2') {
             exclude(module: 'slf4j-api')
         }
         compile('org.apache.httpcomponents:httpclient:4.5.3') {
@@ -267,7 +266,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '0.9.0-SNAPSHOT'
+    version = '0.9.1-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 = "0.9.0";
+    public static final String VERSION = "0.9.1";
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

core/src/main/java/bisq/core/app/BisqSetup.java

@@ -591,7 +591,7 @@ public class BisqSetup {
         tradeManager.getAddressEntriesForAvailableBalanceStream()
                 .filter(addressEntry -> addressEntry.getOfferId() != null)
                 .forEach(addressEntry -> {
-                    log.debug("swapPendingOfferFundingEntries, offerId={}, OFFER_FUNDING", addressEntry.getOfferId());
+                    log.warn("Swapping pending OFFER_FUNDING entries at startup. offerId={}", addressEntry.getOfferId());
                     btcWalletService.swapTradeEntryToAvailableEntry(addressEntry.getOfferId(), AddressEntry.Context.OFFER_FUNDING);
                 });
 

core/src/main/java/bisq/core/btc/setup/BtcDeterministicKeyChain.java

@@ -65,6 +65,7 @@ class BtcDeterministicKeyChain extends DeterministicKeyChain {
         return new BtcDeterministicKeyChain(keyCrypter, aesKey, this);
     }
 
+    @Override
     protected DeterministicKeyChain makeKeyChainFromSeed(DeterministicSeed seed) {
         return new BtcDeterministicKeyChain(seed);
     }

core/src/main/java/bisq/core/btc/setup/WalletConfig.java

@@ -95,8 +95,6 @@ public class WalletConfig extends AbstractIdleService {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public interface BisqWalletFactory extends WalletProtobufSerializer.WalletFactory {
-        Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup);
-
         Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup, boolean isBsqWallet);
     }
 

core/src/main/java/bisq/core/btc/wallet/BisqRiskAnalysis.java

@@ -58,7 +58,8 @@ import static com.google.common.base.Preconditions.checkState;
 
 // Copied from DefaultRiskAnalysis as DefaultRiskAnalysis has mostly private methods and constructor so we cannot
 // override it.
-// Only change to DefaultRiskAnalysis is removal of the RBF check.
+// The changes to DefaultRiskAnalysis are: removal of the RBF check and accept as standard an OP_RETURN outputs
+// with 0 value.
 // For Bisq's use cases RBF is not considered risky. Requiring a confirmation for RBF payments from a users
 // external wallet to Bisq would hurt usability. The trade transaction requires anyway a confirmation and we don't see
 // a use case where a Bisq user accepts unconfirmed payment from untrusted peers and would not wait anyway for at least

core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java

@@ -636,7 +636,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     protected Set<Address> getAllAddressesFromActiveKeys() {
-        return wallet.getActiveKeychain().getLeafKeys().stream().
+        return wallet.getActiveKeyChain().getLeafKeys().stream().
                 map(key -> Address.fromP2SHHash(params, key.getPubKeyHash())).
                 collect(Collectors.toSet());
     }

core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java

@@ -656,6 +656,7 @@ public class BtcWalletService extends WalletService {
     }
 
     public void resetAddressEntriesForOpenOffer(String offerId) {
+        log.info("resetAddressEntriesForOpenOffer offerId={}", offerId);
         swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.OFFER_FUNDING);
         swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.RESERVED_FOR_TRADE);
     }

core/src/main/java/bisq/core/btc/wallet/WalletService.java

@@ -575,12 +575,12 @@ public abstract class WalletService {
 
     @Nullable
     public DeterministicKey findKeyFromPubKeyHash(byte[] pubKeyHash) {
-        return wallet.getActiveKeychain().findKeyFromPubHash(pubKeyHash);
+        return wallet.getActiveKeyChain().findKeyFromPubHash(pubKeyHash);
     }
 
     @Nullable
     public DeterministicKey findKeyFromPubKey(byte[] pubKey) {
-        return wallet.getActiveKeychain().findKeyFromPubKey(pubKey);
+        return wallet.getActiveKeyChain().findKeyFromPubKey(pubKey);
     }
 
     public Address freshReceiveAddress() {

core/src/main/java/bisq/core/dao/governance/period/CycleService.java

@@ -68,7 +68,7 @@ public class CycleService implements DaoStateListener, DaoSetupService {
 
     @Override
     public void start() {
-        daoStateService.getCycles().add(getFirstCycle());
+        addFirstCycle();
     }
 
 
@@ -96,6 +96,28 @@ public class CycleService implements DaoStateListener, DaoSetupService {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    public void addFirstCycle() {
+        daoStateService.getCycles().add(getFirstCycle());
+    }
+
+    public int getCycleIndex(Cycle cycle) {
+        return (cycle.getHeightOfFirstBlock() - genesisBlockHeight) / cycle.getDuration();
+    }
+
+    public boolean isTxInCycle(Cycle cycle, String txId) {
+        return daoStateService.getTx(txId).filter(tx -> isBlockHeightInCycle(tx.getBlockHeight(), cycle)).isPresent();
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    // Private
+    ///////////////////////////////////////////////////////////////////////////////////////////
+
+    private boolean isBlockHeightInCycle(int blockHeight, Cycle cycle) {
+        return blockHeight >= cycle.getHeightOfFirstBlock() &&
+                blockHeight <= cycle.getHeightOfLastBlock();
+    }
+
     private Optional<Cycle> maybeCreateNewCycle(int blockHeight, LinkedList<Cycle> cycles) {
         // We want to set the correct phase and cycle before we start parsing a new block.
         // For Genesis block we did it already in the start method.
@@ -128,24 +150,6 @@ public class CycleService implements DaoStateListener, DaoSetupService {
         return new Cycle(genesisBlockHeight, ImmutableList.copyOf(daoPhasesWithDefaultDuration));
     }
 
-    public int getCycleIndex(Cycle cycle) {
-        return (cycle.getHeightOfFirstBlock() - genesisBlockHeight) / cycle.getDuration();
-    }
-
-    public boolean isTxInCycle(Cycle cycle, String txId) {
-        return daoStateService.getTx(txId).filter(tx -> isBlockHeightInCycle(tx.getBlockHeight(), cycle)).isPresent();
-    }
-
-    private boolean isBlockHeightInCycle(int blockHeight, Cycle cycle) {
-        return blockHeight >= cycle.getHeightOfFirstBlock() &&
-                blockHeight <= cycle.getHeightOfLastBlock();
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////////////////////
-    // Private
-    ///////////////////////////////////////////////////////////////////////////////////////////
-
     private Cycle createNewCycle(int blockHeight, Cycle previousCycle) {
         List<DaoPhase> daoPhaseList = previousCycle.getDaoPhaseList().stream()
                 .map(daoPhase -> {

core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java

@@ -17,6 +17,7 @@
 
 package bisq.core.dao.state;
 
+import bisq.core.dao.governance.period.CycleService;
 import bisq.core.dao.state.model.DaoState;
 import bisq.core.dao.state.model.blockchain.Block;
 
@@ -41,6 +42,7 @@ public class DaoStateSnapshotService implements DaoStateListener {
 
     private final DaoStateService daoStateService;
     private final GenesisTxInfo genesisTxInfo;
+    private final CycleService cycleService;
     private final DaoStateStorageService daoStateStorageService;
 
     private DaoState snapshotCandidate;
@@ -53,9 +55,11 @@ public class DaoStateSnapshotService implements DaoStateListener {
     @Inject
     public DaoStateSnapshotService(DaoStateService daoStateService,
                                    GenesisTxInfo genesisTxInfo,
+                                   CycleService cycleService,
                                    DaoStateStorageService daoStateStorageService) {
         this.daoStateService = daoStateService;
         this.genesisTxInfo = genesisTxInfo;
+        this.cycleService = cycleService;
         this.daoStateStorageService = daoStateStorageService;
 
         this.daoStateService.addBsqStateListener(this);
@@ -128,19 +132,13 @@ public class DaoStateSnapshotService implements DaoStateListener {
                         log.warn("We applied already a snapshot with chainHeight {}. We will reset the daoState and " +
                                 "start over from the genesis transaction again.", chainHeightOfLastApplySnapshot);
                         persisted = new DaoState();
-                        int genesisBlockHeight = genesisTxInfo.getGenesisBlockHeight();
-                        persisted.setChainHeight(genesisBlockHeight);
-                        chainHeightOfLastApplySnapshot = genesisBlockHeight;
-                        daoStateService.applySnapshot(persisted);
+                        applyEmptySnapshot(persisted);
                     }
                 }
             } else if (fromReorg) {
                 log.info("We got a reorg and we want to apply the snapshot but it is empty. That is expected in the first blocks until the " +
                         "first snapshot has been created. We use our applySnapshot method and restart from the genesis tx");
-                int genesisBlockHeight = genesisTxInfo.getGenesisBlockHeight();
-                persisted.setChainHeight(genesisBlockHeight);
-                chainHeightOfLastApplySnapshot = genesisBlockHeight;
-                daoStateService.applySnapshot(persisted);
+                applyEmptySnapshot(persisted);
             }
         } else {
             log.info("Try to apply snapshot but no stored snapshot available. That is expected at first blocks.");
@@ -152,6 +150,15 @@ public class DaoStateSnapshotService implements DaoStateListener {
     // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    private void applyEmptySnapshot(DaoState persisted) {
+        int genesisBlockHeight = genesisTxInfo.getGenesisBlockHeight();
+        persisted.setChainHeight(genesisBlockHeight);
+        chainHeightOfLastApplySnapshot = genesisBlockHeight;
+        daoStateService.applySnapshot(persisted);
+        // In case we apply an empty snapshot we need to trigger the cycleService.addFirstCycle method
+        cycleService.addFirstCycle();
+    }
+
     @VisibleForTesting
     int getSnapshotHeight(int genesisHeight, int height, int grid) {
         return Math.round(Math.max(genesisHeight + 3 * grid, height) / grid) * grid - grid;

core/src/main/java/bisq/core/offer/OpenOfferManager.java

@@ -177,11 +177,13 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
     }
 
     private void cleanUpAddressEntries() {
-        Set<String> openTradesIdSet = openOffers.getList().stream().map(OpenOffer::getId).collect(Collectors.toSet());
+        Set<String> openOffersIdSet = openOffers.getList().stream().map(OpenOffer::getId).collect(Collectors.toSet());
         btcWalletService.getAddressEntriesForOpenOffer().stream()
-                .filter(e -> !openTradesIdSet.contains(e.getOfferId()))
+                .filter(e -> !openOffersIdSet.contains(e.getOfferId()))
                 .forEach(e -> {
-                    log.warn("We found an outdated addressEntry for openOffer {}", e.getOfferId());
+                    log.warn("We found an outdated addressEntry for openOffer {} (openOffers does not contain that " +
+                                    "offer), offers.size={}",
+                            e.getOfferId(), openOffers.size());
                     btcWalletService.resetAddressEntriesForOpenOffer(e.getOfferId());
                 });
     }
@@ -483,7 +485,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         openOffer.setState(OpenOffer.State.CANCELED);
         openOffers.remove(openOffer);
         closedTradableManager.add(openOffer);
-        log.debug("removeOpenOffer, offerId={}", offer.getId());
+        log.info("onRemoved offerId={}", offer.getId());
         btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
         resultHandler.handleResult();
     }

core/src/main/java/bisq/core/payment/validation/params/btc/AbstractBitcoinNetParams.java

@@ -1,180 +0,0 @@
-/*
- * 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/>.
- */
-
-/*
- * Copyright 2013 Google Inc.
- * Copyright 2015 Andreas Schildbach
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package bisq.core.payment.validation.params.btc;
-
-import org.bitcoinj.core.BitcoinSerializer;
-import org.bitcoinj.core.Block;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.StoredBlock;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.core.Utils;
-import org.bitcoinj.core.VerificationException;
-import org.bitcoinj.store.BlockStore;
-import org.bitcoinj.store.BlockStoreException;
-import org.bitcoinj.utils.MonetaryFormat;
-
-import com.google.common.base.Stopwatch;
-
-import java.math.BigInteger;
-
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Parameters for Bitcoin-like networks.
- */
-public abstract class AbstractBitcoinNetParams extends NetworkParameters {
-    /**
-     * Scheme part for Bitcoin URIs.
-     */
-    public static final String BITCOIN_SCHEME = "bitcoin";
-
-    private static final Logger log = LoggerFactory.getLogger(AbstractBitcoinNetParams.class);
-
-    public AbstractBitcoinNetParams() {
-        super();
-    }
-
-    /**
-     * Checks if we are at a difficulty transition point.
-     *
-     * @param storedPrev The previous stored block
-     * @return If this is a difficulty transition point
-     */
-    protected boolean isDifficultyTransitionPoint(StoredBlock storedPrev) {
-        return ((storedPrev.getHeight() + 1) % this.getInterval()) == 0;
-    }
-
-    @Override
-    public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block nextBlock,
-                                           final BlockStore blockStore) throws VerificationException, BlockStoreException {
-        Block prev = storedPrev.getHeader();
-
-        // Is this supposed to be a difficulty transition point?
-        if (!isDifficultyTransitionPoint(storedPrev)) {
-
-            // No ... so check the difficulty didn't actually change.
-            if (nextBlock.getDifficultyTarget() != prev.getDifficultyTarget())
-                throw new VerificationException("Unexpected change in difficulty at height " + storedPrev.getHeight() +
-                        ": " + Long.toHexString(nextBlock.getDifficultyTarget()) + " vs " +
-                        Long.toHexString(prev.getDifficultyTarget()));
-            return;
-        }
-
-        // We need to find a block far back in the chain. It's OK that this is expensive because it only occurs every
-        // two weeks after the initial block chain download.
-        final Stopwatch watch = Stopwatch.createStarted();
-        StoredBlock cursor = blockStore.get(prev.getHash());
-        for (int i = 0; i < this.getInterval() - 1; i++) {
-            if (cursor == null) {
-                // This should never happen. If it does, it means we are following an incorrect or busted chain.
-                throw new VerificationException(
-                        "Difficulty transition point but we did not find a way back to the genesis block.");
-            }
-            cursor = blockStore.get(cursor.getHeader().getPrevBlockHash());
-        }
-        watch.stop();
-        if (watch.elapsed(TimeUnit.MILLISECONDS) > 50)
-            log.info("Difficulty transition traversal took {}", watch);
-
-        Block blockIntervalAgo = cursor.getHeader();
-        int timespan = (int) (prev.getTimeSeconds() - blockIntervalAgo.getTimeSeconds());
-        // Limit the adjustment step.
-        final int targetTimespan = this.getTargetTimespan();
-        if (timespan < targetTimespan / 4)
-            timespan = targetTimespan / 4;
-        if (timespan > targetTimespan * 4)
-            timespan = targetTimespan * 4;
-
-        BigInteger newTarget = Utils.decodeCompactBits(prev.getDifficultyTarget());
-        newTarget = newTarget.multiply(BigInteger.valueOf(timespan));
-        newTarget = newTarget.divide(BigInteger.valueOf(targetTimespan));
-
-        if (newTarget.compareTo(this.getMaxTarget()) > 0) {
-            log.info("Difficulty hit proof of work limit: {}", newTarget.toString(16));
-            newTarget = this.getMaxTarget();
-        }
-
-        int accuracyBytes = (int) (nextBlock.getDifficultyTarget() >>> 24) - 3;
-        long receivedTargetCompact = nextBlock.getDifficultyTarget();
-
-        // The calculated difficulty is to a higher precision than received, so reduce here.
-        BigInteger mask = BigInteger.valueOf(0xFFFFFFL).shiftLeft(accuracyBytes * 8);
-        newTarget = newTarget.and(mask);
-        long newTargetCompact = Utils.encodeCompactBits(newTarget);
-
-        if (newTargetCompact != receivedTargetCompact)
-            throw new VerificationException("Network provided difficulty bits do not match what was calculated: " +
-                    Long.toHexString(newTargetCompact) + " vs " + Long.toHexString(receivedTargetCompact));
-    }
-
-    @Override
-    public Coin getMaxMoney() {
-        return MAX_MONEY;
-    }
-
-    @Override
-    public Coin getMinNonDustOutput() {
-        return Transaction.MIN_NONDUST_OUTPUT;
-    }
-
-    @Override
-    public MonetaryFormat getMonetaryFormat() {
-        return MonetaryFormat.BTC;
-    }
-
-    @Override
-    public int getProtocolVersionNum(final ProtocolVersion version) {
-        return version.getBitcoinProtocolVersion();
-    }
-
-    @Override
-    public BitcoinSerializer getSerializer(boolean parseRetain) {
-        return new BitcoinSerializer(this, parseRetain);
-    }
-
-    @Override
-    public String getUriScheme() {
-        return BITCOIN_SCHEME;
-    }
-
-    @Override
-    public boolean hasMaxMoney() {
-        return true;
-    }
-}

core/src/main/java/bisq/core/payment/validation/params/btc/Networks.java

@@ -1,84 +0,0 @@
-/*
- * 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/>.
- */
-
-/*
- * Copyright 2014 Giannis Dzegoutanis
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package bisq.core.payment.validation.params.btc;
-
-import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.params.MainNetParams;
-import org.bitcoinj.params.TestNet3Params;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * Utility class that holds all the registered NetworkParameters types used for Address auto discovery.
- * By default only MainNetParams and TestNet3Params are used. If you want to use TestNet2, RegTestParams or
- * UnitTestParams use the register and unregister the TestNet3Params as they don't have their own address
- * version/type code.
- */
-public class Networks {
-    /**
-     * Registered networks
-     */
-    private static Set<? extends NetworkParameters> networks = ImmutableSet.of(TestNet3Params.get(), MainNetParams.get());
-
-    public static Set<? extends NetworkParameters> get() {
-        return networks;
-    }
-
-    public static void register(NetworkParameters network) {
-        register(Lists.newArrayList(network));
-    }
-
-    public static void register(Collection<? extends NetworkParameters> networks) {
-        ImmutableSet.Builder<NetworkParameters> builder = ImmutableSet.builder();
-        builder.addAll(Networks.networks);
-        builder.addAll(networks);
-        Networks.networks = builder.build();
-    }
-
-    public static void unregister(NetworkParameters network) {
-        if (networks.contains(network)) {
-            ImmutableSet.Builder<NetworkParameters> builder = ImmutableSet.builder();
-            for (NetworkParameters parameters : networks) {
-                if (parameters.equals(network))
-                    continue;
-                builder.add(parameters);
-            }
-            networks = builder.build();
-        }
-    }
-}

core/src/main/java/bisq/core/trade/Contract.java

@@ -17,8 +17,11 @@
 
 package bisq.core.trade;
 
+import bisq.core.locale.CurrencyUtil;
 import bisq.core.monetary.Price;
+import bisq.core.monetary.Volume;
 import bisq.core.offer.OfferPayload;
+import bisq.core.offer.OfferUtil;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.payment.payload.PaymentMethod;
 import bisq.core.proto.CoreProtoResolver;
@@ -220,6 +223,17 @@ public final class Contract implements NetworkPayload {
         return Coin.valueOf(tradeAmount);
     }
 
+    public Volume getTradeVolume() {
+        Volume volumeByAmount = getTradePrice().getVolumeByAmount(getTradeAmount());
+
+        if (getPaymentMethodId().equals(PaymentMethod.HAL_CASH_ID))
+            volumeByAmount = OfferUtil.getAdjustedVolumeForHalCash(volumeByAmount);
+        else if (CurrencyUtil.isFiatCurrency(getOfferPayload().getCurrencyCode()))
+            volumeByAmount = OfferUtil.getRoundedFiatVolume(volumeByAmount);
+
+        return volumeByAmount;
+    }
+
     public Price getTradePrice() {
         return Price.valueOf(offerPayload.getCurrencyCode(), tradePrice);
     }

core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java

@@ -114,6 +114,7 @@ public class MakerSetupDepositTxListener extends TradeTask {
     }
 
     private void swapReservedForTradeEntry() {
+        log.info("swapReservedForTradeEntry");
         processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
     }
 

core/src/main/java/bisq/core/util/BSFormatter.java

@@ -318,10 +318,11 @@ public class BSFormatter {
 
     @NotNull
     public String fillUpPlacesWithEmptyStrings(String formattedNumber, int maxNumberOfDigits) {
-        int numberOfPlacesToFill = maxNumberOfDigits - formattedNumber.length();
+        //FIXME: temporary deactivate adding spaces in front of numbers as we don't use a monospace font right now.
+        /*int numberOfPlacesToFill = maxNumberOfDigits - formattedNumber.length();
         for (int i = 0; i < numberOfPlacesToFill; i++) {
             formattedNumber = " " + formattedNumber;
-        }
+        }*/
         return formattedNumber;
     }
 

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

@@ -556,7 +556,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Yes, I have started the payment
 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 he starts the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate.
+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.
 
 # suppress inspection "UnusedProperty"
@@ -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\
@@ -807,26 +807,26 @@ support.buyerOfferer=BTC buyer/Maker
 support.sellerOfferer=BTC seller/Maker
 support.buyerTaker=BTC buyer/Taker
 support.sellerTaker=BTC seller/Taker
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\n\
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\n\
 If there are disputes in the trade process (e.g. one trader does not follow the trade protocol) \
 the application will display an \"Open dispute\" button after the trade period is over \
-for contacting the arbitrator.\n\
-If there is an issue with the application, the software will try to detect this and, if possible, display \
+for contacting the arbitrator.\n\n\
+If there is an issue with the application, the software will try to detect it and, if possible, display \
 an \"Open support ticket\" button to contact the arbitrator who will forward the issue \
 to the developers.\n\n\
 If you are having an issue and did not see the \"Open support ticket\" button, \
-you can open a support ticket manually by selecting the trade which causes the problem \
-under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". \
-Please use that only if you are sure that the software is not working as expected. \
-If you have problems or questions, please review the FAQ at the \
-bisq.network web page or post in the Bisq forum at the support section.
+you can open a support ticket manually by selecting the trade causing issues \
+under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". \
+Please use this method only if you are sure that the software is not working as expected. \
+If you have problems or questions, please review the FAQ on the \
+bisq.network web page or post in the Bisq forum in the Support section.
 
 support.initialInfo=Please note the basic rules for the dispute process:\n\
-1. You need to respond to the arbitrators requests in between 2 days.\n\
-2. The maximum period for the dispute is 14 days.\n\
-3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n\
+1. You need to respond to the arbitrator's requests within 2 days.\n\
+2. The maximum period for a dispute is 14 days.\n\
+3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n\
 4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\n\
-Please read more in detail about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+Please read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=System message: {0}
 support.youOpenedTicket=You opened a request for support.
 support.youOpenedDispute=You opened a request for a dispute.\n\n{0}
@@ -899,11 +899,11 @@ settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are e
 settings.net.warn.usePublicNodes.useProvided=No, use provided nodes
 settings.net.warn.usePublicNodes.usePublic=Yes, use public network
 settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\n\
-  Connecting to nodes which are not following the Bitcoin Core consensus rules could screw up your wallet and cause problems in the trade process.\n\n\
-  Users who connect to nodes that violate consensus rules are responsible for any damage created by that. \
-  Disputes caused by that would be decided in favor of the other peer. No technical support will be given \
-  to users who ignore our warning and protection mechanisms!
-settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you get connected exclusively to that.)
+  Connecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\n\
+  Users who connect to nodes that violate consensus rules are responsible for any resulting damage. \
+  Any resulting disputes will be decided in favor of the other peer. No technical support will be given \
+  to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=Onion address
 settings.net.creationDateColumn=Established
@@ -926,18 +926,18 @@ settings.net.inbound=inbound
 settings.net.outbound=outbound
 settings.net.reSyncSPVChainLabel=Resync SPV chain
 settings.net.reSyncSPVChainButton=Delete SPV file and resync
-settings.net.reSyncSPVSuccess=The SPV chain file will be deleted at the next startup. You need to restart your application now.\n\n\
-After the restart it can take a while for resyncing with the network and you will only see all transactions once the resync is completed.\n\nPlease make another restart after the resync has completed because there are sometimes inconsistencies leading to incorrect balance display.
-settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please have patience, it can take a while when resyncing with the network.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\n\
+After the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=The resync is now completed. Please restart the application.
 settings.net.reSyncSPVFailed=Could not delete SPV chain file.\nError: {0}
 setting.about.aboutBisq=About Bisq
-setting.about.about=Bisq is an open source project and a decentralized network of users who want to exchange bitcoin with national currencies or alternative crypto currencies in a privacy protecting way. Learn more about Bisq on our project web page.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Bisq web page
 setting.about.code=Source code
 setting.about.agpl=AGPL License
 setting.about.support=Support Bisq
-setting.about.def=Bisq is not a company but a community project and open for participation. If you want to participate or support Bisq please follow the links below.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Contribute
 setting.about.donate=Donate
 setting.about.providers=Data providers
@@ -959,11 +959,11 @@ setting.about.subsystems.val=Network version: {0}; P2P message version: {1}; Loc
 account.tab.arbitratorRegistration=Arbitrator registration
 account.tab.account=Account
 account.info.headline=Welcome to your Bisq Account
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\n\
-An empty Bitcoin wallet was created the first time you started Bisq.\n\
-We recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\
-Privacy & Security:\n\
-Bisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\n\
+A new Bitcoin wallet was created the first time you started Bisq.\n\n\
+We strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\
+Privacy & security note: \
+because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=National currency accounts
 account.menu.altCoinsAccountView=Altcoin accounts
@@ -976,7 +976,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=Register arbitrator
 account.arbitratorRegistration.revoke=Revoke registration
-account.arbitratorRegistration.info.msg=Please note that you need to stay  available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=You need to set at least 1 language.\nWe added the default language for you.
 account.arbitratorRegistration.removedSuccess=You have successfully removed your arbitrator from the P2P network.
 account.arbitratorRegistration.removedFailed=Could not remove arbitrator.{0}
@@ -996,13 +996,13 @@ account.arbitratorSelection.minOne=You need to have at least one arbitrator sele
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
 account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as \
-described on the {1} web page.\nUsing wallets from centralized exchanges where you don''t have your keys under \
-your control or using a not compatible wallet software can lead to loss of the traded funds!\nThe arbitrator is \
+described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or \
+(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\
@@ -1057,9 +1057,9 @@ In case of a dispute, you must provide the arbitrator the following data:\n\
 - The TXN-Private key\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 \
+Verification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\n\
+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 \
@@ -1091,26 +1091,25 @@ account.password.removePw.button=Remove password
 account.password.removePw.headline=Remove password protection for wallet
 account.password.setPw.button=Set password
 account.password.setPw.headline=Set password protection for wallet
-account.password.info=With password protection you need to enter your password when withdrawing bitcoin \
-out of your wallet or if you want to view or restore a wallet from seed words as well as at application startup.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin \
+out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Backup your wallets seed words
 account.seed.info=Please write down both wallet seed words and the date! \
-You can recover your wallet any time with those seed words and the date.\n\
-The seed words are used for both the BTC and the BSQ wallet.\n\n\
+You can recover your wallet any time with seed words and the date.\n\
+The same seed words are used for the BTC and BSQ wallet.\n\n\
 You should write down the seed words on a sheet of paper. Do not save them on your computer.\n\n\
 Please note that the seed words are NOT a replacement for a backup.\n\
-You need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\n\
+You need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\n\
 Importing seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=You have not setup a wallet password which would protect the display of the seed words.\n\n\
 Do you want to display the seed words?
 account.seed.warn.noPw.yes=Yes, and don't ask me again
 account.seed.enterPw=Enter password to view seed words
-account.seed.restore.info=Please note that you cannot import a wallet from an old Bisq version (any version before 0.5.0), \
-  because the wallet format has changed!\n\n\
-  If you want to move the funds from the old version to the new Bisq application send it with a bitcoin transaction.\n\n\
-  Also be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\n\
-  It is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is \
+  only for emergency cases and might cause problems with the internal wallet database.\n\
+  It is not a way for applying a backup! Please use a backup from the application data directory for restoring a \
+  previous application state.
 account.seed.restore.ok=Ok, I understand and want to restore
 
 
@@ -1464,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
@@ -1938,8 +1937,8 @@ popup.headline.error=Error
 popup.doNotShowAgain=Don't show again
 popup.reportError.log=Open log file
 popup.reportError.gitHub=Report to GitHub issue tracker
-popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\n\
-The error message will be copied to the clipboard when you click the below buttons.\n\
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\n\
+The error message will be copied to the clipboard when you click a button below.\n\
 It will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Please try to restart your application and check your network connection to see if you can resolve the issue.
@@ -1995,7 +1994,11 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. Please restart your ap
 popup.warning.priceRelay=price relay
 popup.warning.seed=seed
 
-popup.info.securityDepositInfo=To ensure that both traders follow the trade protocol they need to pay a security deposit.\n\nThe deposit will stay in your local trading wallet until the offer gets accepted by another trader.\nIt will be refunded to you after the trade has successfully completed.\n\nPlease note that you need to keep your application running if you have an open offer. When another trader wants to take your offer it requires that your application is online for executing the trade protocol.\nBe sure that you have standby mode deactivated as that would disconnect the network (standby of the monitor is not a problem).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security \
+deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's \
+refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take \
+it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it \
+doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\n\
   The bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
@@ -2021,7 +2024,7 @@ popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\n
 popup.attention.forTradeWithId=Attention required for trade with ID {0}
 
 popup.roundedFiatValues.headline=New privacy feature: Rounded fiat values
-popup.roundedFiatValues.msg=To increase privacy of your trade the {0} amount was rounded.\n\nDepending on the client version you''ll pay or receive either values with decimals or rounded ones.\n\nBoth values do comply from now on with the trade protocol.\n\nAlso be aware that BTC values are changed automatically to match the rounded fiat amount as close as possible. 
+popup.roundedFiatValues.msg=To increase privacy of your trade the {0} amount was rounded.\n\nDepending on the client version you''ll pay or receive either values with decimals or rounded ones.\n\nBoth values do comply from now on with the trade protocol.\n\nAlso be aware that BTC values are changed automatically to match the rounded fiat amount as close as possible.
 
 
 ####################################################################
@@ -2299,7 +2302,7 @@ payment.emailOrMobile=Email or mobile nr
 payment.useCustomAccountName=Use custom account name
 payment.maxPeriod=Max. allowed trade period
 payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2}
-payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1} 
+payment.maxPeriodAndLimitCrypto=Max. trade duration: {0} / Max. trade limit: {1}
 payment.currencyWithSymbol=Currency: {0}
 payment.nameOfAcceptedBank=Name of accepted bank
 payment.addAcceptedBank=Add accepted bank
@@ -2341,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 \
@@ -2349,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\
@@ -2380,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 \

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

@@ -193,6 +193,9 @@ shared.all=Alle
 shared.edit=Bearbeiten
 shared.advancedOptions=Erweiterte Optionen
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Ja, ich habe die Zahlung begonnen
 portfolio.pending.step2_seller.waitPayment.headline=Auf Zahlung warten
 portfolio.pending.step2_seller.f2fInfo.headline=Kontaktinformation des Käufers
 portfolio.pending.step2_seller.waitPayment.msg=Die Kautionstransaktion hat mindestens eine Blockchain-Bestätigung.\nSie müssen warten bis der BTC-Käufer die {0}-Zahlung beginnt.
-portfolio.pending.step2_seller.warn=Der BTC-Käufer hat die {0}-Zahlung noch nicht getätigt.\nSie müssen warten bis die Zahlung begonnen wurde.\nWenn der Handel nicht bis {1} abgeschlossen wurde, wird der Vermittler diesen untersuchen.
+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=Der BTC-Käufer hat seine Zahlung noch nicht begonnen!\nDie maximale Handelsdauer wurde überschritten.\nSie können länger warten um dem Handelspartner mehr Zeit zu geben oder den Vermittler kontaktieren, um einen Konflikt zu öffnen.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Keine Transaktionen verfügbar
 funds.tx.revert=Umkehren
 funds.tx.txSent=Transaktion erfolgreich zu einer neuen Adresse in der lokalen Bisq-Brieftasche gesendet.
 funds.tx.direction.self=An Sie selbst senden
-funds.tx.proposalTxFee=Mining-Gebühr für Antrag
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Rückerstattungsantrag
 funds.tx.compensationRequestTxFee=Entlohnungsanfrage
 
@@ -762,9 +765,9 @@ support.buyerOfferer=BTC-Käufer/Ersteller
 support.sellerOfferer=BTC-Verkäufer/Ersteller
 support.buyerTaker=BTC-Käufer/Abnehmer
 support.sellerTaker=BTC-Verkäufer/Abnehmer
-support.backgroundInfo=Bisq ist keine Firma und betreibt keine Form von Kundendienst.\n\nFalls es während des Handelsprozess (z.B. ein Händler befolgt nicht das Handelsprotokoll) zu Konflikten kommen sollte, wird die Anwendung nach der Handelsdauer eine \"Konflikt öffnen\"-Schaltfläche anzeigen, um den Vermittler zu kontaktieren.\nIm Falle von Softwarefehlern oder anderen Problemen, die von der Anwendung entdeckt werden, wird eine \"Support-Ticket öffnen\" Schaltfläche angezeigt, um den Vermittler zu kontaktieren, der die Probleme an die Entwickler weiterleitet.\n\nFalls ein Nutzer durch einen Fehler fest hängt, ohne dass die \"Support-Ticket öffnen\"-Schaltfläche angezeigt wird, können Sie mit einer speziellen Tastenkombination manuell ein Support-Ticket öffnen.\n\nBitte nutzen Sie diese nur, wenn Sie sicher sind, dass sich die Software nicht wie erwartet verhält. Falls Sie nicht wissen wie man Bisq verwendet oder andere Fragen haben, überprüfen Sie bitte die FAQ auf der bisq.io-Website oder erstellen Sie einen Post im Support-Abschnitt des Bisq-Forums.\n\nFalls Sie sicher sind, dass Sie ein Support-Ticket öffnen wollen, wählen Sie bitte den Handel, der Probleme bereitet, unter \"Mappe/Offene Händel\" und drücken Sie die Tastenkombination \"alt + o\" oder \"option + o\" um das Support-Ticket zu öffnen.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=Bitte beachten Sie die grundlegenden Regeln für den Konfliktprozess:\n1. Sie müssen innerhalb von zwei Tagen auf die Anfrage des Vermittlers reagieren.\n2. Die maximale Dauer des Konflikts ist 14 Tage.\n3. Sie müssen befolgen, was der Vermittler von Ihnen verlangt, um Beweise für ihren Fall zu liefern.\n4. Sie haben beim ersten Start dieser Anwendung die Regeln akzeptiert, die im Wiki in den Nutzungsbedingungen zusammengefasst wurden.\n\nErfahren Sie mehr über den Konfliktprozess in unserem Wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Systemnachricht: {0}
 support.youOpenedTicket=Sie haben eine Anfrage für Support geöffnet.
 support.youOpenedDispute=Sie haben eine Anfrage für einen Konflikt geöffnet.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Spezifische Bitcoin-Core-Knoten verwenden
 settings.net.warn.usePublicNodes=Falls Sie das öffentliche Bitcoin-Netzwerk verwenden sind Sie einem schwerwiegenden Datenschutzproblem ausgesetzt durch das fehlerhafte Design und Implementierung des Bloom Filters in SPV-Brieftaschen wie BitcoinJ (verwendet in Bisq). Jeder verbundene Bitcoin-Core-Knoten könnte herausfinden, dass alle Ihre Brieftaschen-Adressen einer Person gehören.\n\nBitte informieren Sie sich dazu auf folgender Seite: https://bisq.network/blog/privacy-in-bitsquare.\n\nSind Sie sicher, dass Sie öffentliche Knoten verwenden möchten?
 settings.net.warn.usePublicNodes.useProvided=Nein, bereitgestellte Knoten verwenden
 settings.net.warn.usePublicNodes.usePublic=Ja, öffentliches Netzwerk verwenden
-settings.net.warn.useCustomNodes.B2XWarning=Bitte stellen Sie sicher, dass Sie sich mit einem vertrauenswürdigen Bitcoin-Core-Knoten verbinden!\n\nWenn Sie sich mit Knoten verbinden, die gegen die Bitcoin Core Konsensus-Regeln verstoßen, kann es zu Problemen in Ihrer Brieftasche und im Verlauf des Handelsprozesses kommen.\n\nBenutzer die sich zu oben genannten Knoten verbinden, sind für den verursachten Schaden verantwortlich. Dadurch entstandene Konflikte werden zugunsten des anderen Teilnehmers entschieden. Benutzer die unsere Warnungen und Sicherheitsmechanismen ignorieren wird keine technische Unterstützung geleistet!
-settings.net.localhostBtcNodeInfo=(Hintergrundinformation: Falls Sie einen lokalen Bitcoin-Knoten einsetzen (localhost) werden Sie nur mit diesem verbunden.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Verbundene Peers
 settings.net.onionAddressColumn=Onion-Adresse
 settings.net.creationDateColumn=Eingerichtet
@@ -857,17 +860,17 @@ settings.net.inbound=eingehend
 settings.net.outbound=ausgehend
 settings.net.reSyncSPVChainLabel=SPV-Kette neu synchronisieren
 settings.net.reSyncSPVChainButton=SPV-Datei löschen und neu synchronisieren
-settings.net.reSyncSPVSuccess=Die SPV-Kettendatei wird beim nächsten Start gelöscht. Sie müssen Ihre Anwendung jetzt neu starten.\n\nNach dem Neustart kann es eine Weile dauern, bis neu mit dem Netzwerk synchronisiert wurde und Sie werden erst alle Transaktionen sehen, wenn synchronisiert wurde.\n\nBitte starten Sie Ihre Anwendung nach Abschluss der Synchronisation neu, da es manchmal Inkonsistenten gibt, die zum Anzeigen falscher Guthaben führen.
-settings.net.reSyncSPVAfterRestart=Die SPV-Kettendatei wurde gelöscht. Haben Sie bitte Geduld, es kann eine Weile dauern mit dem Netzwerk neu zu synchronisieren.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=Die erneute Synchronisation ist jetzt abgeschlossen. Bitte starten Sie die Anwendung neu.
 settings.net.reSyncSPVFailed=Konnte SPV-Kettendatei nicht löschen.\nFehler: {0}
 setting.about.aboutBisq=Über Bisq
-setting.about.about=bisq ist ein Open-Source-Projekt und ein dezentrales Netzwerk von Nutzern, die Bitcoins gegen nationale Währungen oder alternative Cryptowährungen auf einem Weg tauschen wollen, der die Privatsphäre schützt. Lernen Sie auf unser Projektwebsite mehr über Bisq.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Bisq-Website
 setting.about.code=Quellcode
 setting.about.agpl=AGPL-Lizenz
 setting.about.support=Bisq unterstützen
-setting.about.def=Bisq ist keine Firma, sondern ein Gemeinschaftsprojekt, das offen für Mitwirken ist. Wenn Sie an Bisq mitwirken oder das Projekt unterstützen wollen, folgen Sie bitte den unten stehenden Links.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Mitwirken
 setting.about.donate=Spenden
 setting.about.providers=Datenanbieter
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Netzwerkversion: {0}; P2P-Nachrichtenversion: {1};
 account.tab.arbitratorRegistration=Vermittler-Registrierung
 account.tab.account=Konto
 account.info.headline=Willkommen in Ihrem Bisq-Konto
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Nationale Währungskonten
 account.menu.altCoinsAccountView=Altcoin-Konten
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Öffentlicher Schlüssel
 
 account.arbitratorRegistration.register=Vermittler registrieren
 account.arbitratorRegistration.revoke=Registrierung widerrufen
-account.arbitratorRegistration.info.msg=Beachten Sie bitte, dass Sie nach dem Widerrufen für 15 Tage verfügbar bleiben müssen, da es Händel geben kann, die Sie als Vermittler nutzen. Die maximal erlaubte Handelsdauer ist 8 Tage und der Konfliktprozess kann bis zu 7 Tage dauern.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=Sie müssen wenigstens eine Sprache festlegen.\nWir haben Ihre Standardsprache für Sie hinzugefügt.
 account.arbitratorRegistration.removedSuccess=Sie haben Ihren Vermittler erfolgreich aus dem P2P-Netzwerk entfernt.
 account.arbitratorRegistration.removedFailed=Der Vermittler konnte nicht entfernt werden.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Sie können nur Vermittler wählen, die wenig
 account.arbitratorSelection.minOne=Sie müssen wenigstens einen Vermittler auswählen.
 
 account.altcoin.yourAltcoinAccounts=Ihre Altcoin-Konten
-account.altcoin.popup.wallet.msg=Bitte stellen Sie sicher, dass Sie die Anforderungen für die Nutzung von {0}-Brieftaschen befolgen, die auf der {1}-Website beschrieben werden.\nDie Verwendung von Brieftaschen zentraler Börsen, bei denen Sie Ihre Schlüssel nicht selber verwalten, oder das Nutzen inkompatibler Brieftasche-Software können zum Verlust der gehandelten Gelder führen!\nDer Vermittler ist kein {2}-Spezialist und kann Ihnen in einem solchen Fall nicht helfen.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Ich verstehe und bestätige, dass ich weiß, welche Brieftasche ich benutzen muss.
 account.altcoin.popup.xmr.msg=Wenn Sie XMR auf Bisq handeln wollen, stellen Sie bitte sicher, dass Sie die folgenden Bedingungen verstehen und erfüllen:\n\nUm XMR zu senden, brauchen Sie entweder die offizielle Monero GUI Wallet oder die einfache Monero CLI Wallet mit aktivierter store-tx-info (Standard in neuen Versionen).\nStellen Sie bitte sicher, dass Sie auf den Tx-Schlüssel zugreifen können.\nmonero-wallet-cli: (nutzen Sie das get_tx_key Kommando)\nmonero-wallet-gui: (gehen sie zum Verlauf Tab und klicken Sie die (P) Schaltfläche um die Zahlungsbestätigung anzuzeigen)\n\nZusätzlich zum XMR checktx Werkzeug (https://xmr.llcoins.net/checktx.html) kann die Überprüfung auch innerhalb der Brieftasche durchgeführt werden. \nmonero-wallet-cli: verwenden Sie den Befehl (check_tx_key)\nmonero-wallet-gui: gehen Sie zur Erweitert > Beweisen/Prüfen-Seite\n\nIn normalen Blockexplorern ist die Übertragung nicht überprüfbar.\n\nIm Fall eines Konflikts müssen Sie dem Vermittler folgende Daten übergeben:\n- Den privaten Tx-Schlüssel\n- Den Transaktionshash\n- Die öffentliche Adresse des Empfängers\n\nSollten Sie die Daten nicht übergeben können oder eine inkompatible Wallet verwendet haben, werden Sie den Konflikt verlieren. Der XMR Sender ist in der Verantwortung die Übertragung der XMR gegenüber dem Vermittler im Falle eines Konflikts zu beweisen.\n\nEs wird keine Zahlungskennung benötigt, nur eine normale öffentliche Adresse.\n\nFalls Sie sich über diesen Prozess im Unklaren sind, besuchen Sie (https://www.getmonero.org/resources/user-guides/prove-payment.html) oder das Moneroforum (https://forum.getmonero.org) um weitere Informationen zu finden.
 account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Passwort entfernen
 account.password.removePw.headline=Passwortschutz Ihrer Brieftasche entfernen
 account.password.setPw.button=Passwort festlegen
 account.password.setPw.headline=Passwortschutz Ihrer Brieftasche einrichten
-account.password.info=Mit Passwortschutz müssen Sie Ihr Passwort eingeben, sowohl wenn Sie Bitcoins aus Ihrer Brieftasche abheben, wenn Sie Ihre Brieftasche einsehen oder aus den Seed-Wörtern wiederherstellen wollen, als auch beim Start der Anwendung.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Backup der Seed-Wörter Ihrer Brieftasche erstellen
-account.seed.info=Bitte schreiben Sie die sowohl Seed-Wörter als auch das Datum auf! Mit diesen Seed-Wörtern und dem Datum können Sie Ihre Brieftasche jederzeit wiederherstellen.\nDie Seed-Wörter werden für die BTC- und BSQ-Brieftasche genutzt.\n\nSchreiben Sie die Seed-Wörter auf ein Blatt Papier schreiben und speichern Sie sie nicht auf Ihrem Computer.\n\nBitte beachten Sie, dass die Seed-Wörter KEIN Ersatz für ein Backup sind.\nSie müssen ein Backup des gesamten Anwendungsverzeichnisses unter \"Konto/Backup\" erstellen, um den ursprünglichen Zustand der Anwendung wiederherstellen zu können.\nDas Importieren der Seed-Wörter wird nur für Notfälle empfohlen. Die Anwendung wird ohne richtiges Backup der Datenbankdateien und Schlüssel nicht funktionieren! 
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=Sie haben kein Brieftasche-Passwort festgelegt, was das Anzeigen der Seed-Wörter schützen würde.\n\nMöchten Sie die Seed-Wörter jetzt anzeigen?
 account.seed.warn.noPw.yes=Ja, und nicht erneut fragen
 account.seed.enterPw=Geben Sie Ihr Passwort ein um die Seed-Wörter zu sehen
-account.seed.restore.info=Beachten Sie, dass Sie eine Brieftasche aus einer alten Bisq-Version nicht importieren können (Versionen vor 0.5.0), weil sich das Waller-Format geändert hat!\n\nWenn Sie die Gelder aus der alten Version in die neue Bisq-Anwendung bewegen wollen, senden Sie diese mit einer Bitcoin-Transaktion.\n\nBeachten Sie auch, dass Brieftasche-Wiederherstellung nur für Notfälle ist und Probleme mit der internen Brieftasche-Datenbank verursachen kann.\nEs ist kein Weg ein Backup anzuwenden! Bitte nutzen Sie ein Backup aus dem Anwendungsdatenordner um eine vorherigen Zustand wiederherzustellen. 
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Ok, ich verstehe und möchte wiederherstellen
 
 
@@ -1303,7 +1306,7 @@ dao.burnBsq.assets.lookBackPeriod=Überprüfungsphase
 dao.burnBsq.assets.trialFee=Gebühr für Probezeit
 dao.burnBsq.assets.totalFee=Insgesamt gezahlte Gebühren
 dao.burnBsq.assets.days={0} Tage
-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=Die Altcoingebühr ist zu niedrig. Die min. Anzahl Tage für die Probezeit sind {0} Tage.
 
 # suppress inspection "UnusedProperty"
 dao.assetState.UNDEFINED=Undefiniert
@@ -1319,7 +1322,7 @@ dao.assetState.REMOVED_BY_VOTING=Durch Abstimmung entfernt
 dao.proofOfBurn.header=Nachweis der Verbrennung
 dao.proofOfBurn.amount=Betrag
 dao.proofOfBurn.preImage=Vorabbild
-dao.proofOfBurn.burn=Verbrennen
+dao.proofOfVerbrennen.burn=Verbrennen
 dao.proofOfBurn.allTxs=Alle Transaktionen zum Nachweis der Verbrennung
 dao.proofOfBurn.myItems=Meine Transaktionen zum Nachweis der Verbrennung
 dao.proofOfBurn.date=Datum
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=Vorschlagtyp
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=Meine Stimme
+dao.proposal.table.header.remove=Entfernen
 dao.proposal.table.icon.tooltip.removeProposal=Antrag entfernen
 dao.proposal.table.icon.tooltip.changeVote=Aktuelles Votum: ''{0}''. Votum abändern zu: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=BSQ-Gelder senden
 dao.wallet.send.sendBtc=BTC-Gelder senden
 dao.wallet.send.sendFunds.headline=Abhebeanfrage bestätigen
 dao.wallet.send.sendFunds.details=Sende: {0}\nAn Empfangsadresse: {1}\nBenötigte Transaktionsgebühr ist: {2} ({3} Satoshis/Byte)\nTransaktionsgröße: {4} Kb\n\nDer Empfänger erhält: {5}\n\nSind Sie sicher, dass Sie diesen Betrag abheben wollen?
-dao.wallet.chainHeightSynced=Synchronisiert bis Block: {0} (letzter Block: {1})
-dao.wallet.chainHeightSyncing=Synchronisiere Block: {0} (letzter Block: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Typ
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Überprüfung fehlgeschlagen.\nBitte l
 displayUpdateDownloadWindow.success=Die neue Version wurde erfolgreich heruntergeladen und die Signatur überprüft.\n\nBitte öffnen Sie das Downloadverzeichnis, schließen die Anwendung und installieren die neue Version.
 displayUpdateDownloadWindow.download.openDir=Downloadverzeichnis öffnen
 
-disputeSummaryWindow.title=Zusammenfassung
+disputeZusammenfassungWindow.title=Zusammenfassung
 disputeSummaryWindow.openDate=Erstellungsdatum des Tickets
 disputeSummaryWindow.role=Rolle des Händlers
 disputeSummaryWindow.evidence=Beweis
@@ -1741,7 +1746,7 @@ popup.headline.error=Fehler
 popup.doNotShowAgain=Nicht erneut anzeigen
 popup.reportError.log=Protokolldatei öffnen
 popup.reportError.gitHub=Auf GitHub-Issue-Tracker melden
-popup.reportError={0}\n\nUm uns bei der Verbesserung der Software zu helfen, erstellen Sie bitte einen Fehlerbericht auf unserem Issue-Tracker auf GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nDie Fehlermeldung wird in die Zwischenablage kopiert, wenn Sie auf die Schaltflächen unten klicken.\nEs wird das Debuggen einfacher machen, wenn Sie die bisq.log Datei anfügen.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Versuchen Sie bitte Ihre Anwendung neu zu starten und überprüfen Sie Ihre Netzwerkverbindung um zu sehen, ob Sie das Problem beheben können.
 popup.error.takeOfferRequestFailed=Es ist ein Fehler aufgetreten, als jemand versuchte eins Ihrer Angebote anzunehmen:\n{0}
@@ -1776,9 +1781,9 @@ popup.warning.lockedUpFunds=Sie haben eingesperrte Gelder von einem fehlgeschlag
 
 popup.warning.nodeBanned=Einer der {0} Knoten wurde gebannt. Bitte starten Sie die Anwendung neu, um sicher zu sein, nicht mit gebannten Knoten verbunden zu werden.
 popup.warning.priceRelay=Preisrelais
-popup.warning.seed=Seed
+popup.warning.Seed=Seed
 
-popup.info.securityDepositInfo=Um sicherzustellen, dass beide Händler dem Handelsprotokoll folgen, müssen diese eine Kaution zahlen.\n\nDie Kaution bleibt in Ihrer lokalen Brieftasche, bis das Angebot von einem anderen Händler angenommen wurde.\nSie wird Ihnen zurückerstattet, nachdem der Handel erfolgreich abgeschlossen wurde.\n\nBitte beachten Sie, dass Sie die Anwendung laufen lassen müssen, wenn Sie ein offenes Angebot haben.\nWenn ein anderer Händler Ihr Angebot annehmen möchte ist es notwendig, dass Ihre Anwendung online ist und reagieren kann.\nStellen Sie sicher, dass Sie den Ruhezustand deaktiviert haben, da dieser Ihren Client vom Netzwerk trennen würde (Der Ruhezustand des Monitors ist kein Problem).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Stellen Sie sicher, dass eine Bank-Filiale in Ihrer Nähe befindet, um die Bargeld Kaution zu zahlen.\nDie Bankkennung (BIC/SWIFT) der Bank des Verkäufers ist: {0}.
 popup.info.cashDepositInfo.confirm=Ich bestätige, dass ich die Kaution zahlen kann

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Ναι, ξεκίνησα την
 portfolio.pending.step2_seller.waitPayment.headline=Αναμονή για την πληρωμή
 portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
 portfolio.pending.step2_seller.waitPayment.msg=Η κατάθεση έχει τουλάχιστον μία επιβεβαίωση στο blockchain.\nΠρέπει να περιμένεις μέχρι να ξεκινήσει ο αγοραστής BTC την πληρωμή {0}.
-portfolio.pending.step2_seller.warn=Ο αγοραστής BTC δεν έχει κάνει ακόμα την πληρωμή {0}.\nΠρέπει να περιμένεις μέχρι να ξεκινήσει την πληρωμή.\nΑν η συναλλαγή δεν ολοκληρωθεί μέχρι την {1}, ο διαμεσολαβητής θα το διερευνήσει.
+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=Ο αγοραστής BTC δεν ξεκίνησε τη διαδικασία πληρωμής!\nΗ μέγιστη χρονική περίοδος συναλλαγής παρήλθε.\nΜπορείς να περιμένεις περισσότερο και να δώσεις επιπλέον χρόνο στον έτερο συναλλασσόμενο ή μπορείς να επικοινωνήσεις με τον διαμεσολαβητή και να ξεκινήσεις επίλυση διένεξης.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Δεν υπάρχουν διαθέσιμες συναλλ
 funds.tx.revert=Revert
 funds.tx.txSent=Η συναλλαγή απεστάλη επιτυχώς σε νέα διεύθυνση στο τοπικό πορτοφόλι Bisq.
 funds.tx.direction.self=Αποστολή στον εαυτό σου
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=Αίτημα αποζημίωσης
 
@@ -762,9 +765,9 @@ support.buyerOfferer=Αγοραστής/Maker BTC
 support.sellerOfferer=Πωλητής/Maker BTC
 support.buyerTaker=Αγοραστής/Taker BTC
 support.sellerTaker=Πωλητής/Taker BTC
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=Λάβε υπόψιν τους βασικούς κανόνες επίλυσης διένεξης:\n1. Πρέπει να απαντήσεις στα αιτήματα του διαμεσολαβητή εντός 2 ημερών.\n2. Η μέγιστη χρονική περίοδος μιας διένεξης είναι 14 ημέρες.\n3. Πρέπει να εκπληρώσεις τις απαιτήσεις του διαμεσολαβητή προς το πρόσωπό σου σχετικά με παραδόσεις στοιχείων που αφορούν την υπόθεση.\n4. Αποδέχτηκες τους κανόνες που αναφέρονται στο wiki στη συμφωνία χρήστη, όταν εκκίνησες για πρώτη φορά την εφαρμογή.\n\nΜπορείς να διαβάσεις περισσότερες λεπτομέρειες σχετικά με τη διαδικασία επίλυσης διενέξεων στο wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Μήνυμα συστήματος: {0}
 support.youOpenedTicket=Άνοιξες ένα αίτημα υποστήριξης.
 support.youOpenedDispute=Άνοιξες ένα αίτημα για επίλυση διένεξης.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Χρήση προσωπικών επιλογώ
 settings.net.warn.usePublicNodes=Αν χρησιμοποιήσεις το δημόσιο δίκτυο Bitcoin εκτίθεσαι σε σοβαρά προβλήματα απορρήτου, τα οποία προκαλούνται από το σχεδιασμό και την εφαρμογή του φίλτρου bloom σε SPV πορτοφόλια όπως το BitcoinJ (χρησιμοποιείται στο Bisq). Οποιοσδήποτε πλήρης κόμβος στον οποίο είσαι συνδεδεμένος μπορεί να εντοπίσει όλες τις διευθύνσεις πορτοφολιού που ανήκουν στο ίδιο πρόσωπο.\n\nΓια περισσότερες λεπτομέρειες διάβασε: https://bisq.network/blog/privacy-in-bitsquare\n\nΘέλεις σίγουρα να χρησιμοποιήσεις δημόσιους κόμβους;
 settings.net.warn.usePublicNodes.useProvided=Όχι, χρησιμοποίησε προτεινόμενους κόμβους
 settings.net.warn.usePublicNodes.usePublic=Ναι, χρησιμοποίησε δημόσιο δίκτυο
-settings.net.warn.useCustomNodes.B2XWarning=Βεβαιώσου πως ο κόμβος Bitcoin που χρησιμοποιείς είναι έμπιστος Bitcoin Core κόμβος!\n\nΣύνδεση με κόμβους που δεν ακολουθούν τα Bitcoin Core πρωτόκολλα μπορούν να διαβάλουν το πορτοφόλι σου και να προκαλέσουν προβλήματα στη διαδικασία συναλλαγής.\n\nΧρήστες που συνδέονται με κόμβους που παραβιάζουν αυτά τα πρωτόκολλα είναι υπεύθυνοι για οποιαδήποτε ζημιά προκληθεί από αυτό. Διενέξεις που θα ξεκινήσουν εξαιτίας τους θα επιλύονται προς όφελος του άλλου συναλλασσόμενου. Καμία τεχνική υποστήριξη δεν θα προσφέρεται σε χρήστες που αγνοούν τις προειδοποιήσεις μας και τους μηχανισμούς προστασίας!
-settings.net.localhostBtcNodeInfo=(Βοηθητική πληροφορία: Αν τρέχεις έναν τοπικό κόμβο Bitcoin (localhost) θα συνδεθείς αποκλειστικά σε αυτόν.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=Διεύθυνση onion
 settings.net.creationDateColumn=Καθιερώθηκε
@@ -857,17 +860,17 @@ settings.net.inbound=εισερχόμενα
 settings.net.outbound=εξερχόμενα
 settings.net.reSyncSPVChainLabel=Επανασυγχρονισμός αλυσίδας SPV
 settings.net.reSyncSPVChainButton=Διάγραψε το αρχείο SPV και επανασυγχρονίσου 
-settings.net.reSyncSPVSuccess=Το αρχείο αλυσίδας SPV θα διαγραφεί στην επόμενη εκκίνηση. Πρέπει να επανεκκινήσεις την εφαρμογή τώρα.\n\nΜετά την επανεκκίνηση ίσως χρειαστεί λίγη ώρα για τον επανασυγχρονισμό με το δίκτυο και θα δεις όλες τις συναλλαγές μόλις ολοκληρωθεί ο συγχρονισμός.\n\nΕπανεκκίνησε μία επιπλέον φορά μετά την ολοκλήρωση του συγχρονισμού, καθώς μερικές φορές προκύπτουν ασυνέπειες που οδηγούν σε εσφαλμένη εμφάνιση υπολοίπου.
-settings.net.reSyncSPVAfterRestart=Το αρχείο αλυσίδας SPV διαγράφηκε. Παρακαλούμε για την υπομονή σου. Ίσως χρειαστεί λίγη ώρα για τον επανασυγχρονισμό με το δίκτυο.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=Ο επανασυγχρονισμός ολοκληρώθηκε. Επανεκκίνησε την εφαρμογή.
 settings.net.reSyncSPVFailed=Αποτυχία διαγραφής αρχείου αλυσίδας SPV.\nΣφάλμα: {0}
 setting.about.aboutBisq=Σχετικά με το Bisq
-setting.about.about=Το Bisq είναι ένα εγχείρημα ανοιχτού κώδικα και παράλληλα ένα αποκεντρωμένο δίκτυο χρηστών που επιθυμούν να ανταλλάξουν bitcoin έναντι εθνικών νομισμάτων ή εναλλακτικών κρυπτονομισμάτων με εμπιστευτικό και προστατευμένο τρόπο. Μπορείς να μάθεις περισσότερα για το Bisq στην ιστοσελίδα μας.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Ιστοσελίδα bisq
 setting.about.code=Πηγαίος κώδικας
 setting.about.agpl=Άδεια AGPL
 setting.about.support=Υποστήριξε το Bisq
-setting.about.def=Το Bisq δεν είναι εταιρία, αλλά ένα συλλογικό εγχείρημα, ανοιχτό σε συμμετοχές. Αν θέλεις να συμμετάσχεις ή να υποστηρίξεις το Bisq ακολούθησε τους παρακάτω συνδέσμους.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Συνεισφορά
 setting.about.donate=Δωρεά
 setting.about.providers=Πάροχοι δεδομένων
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Έκδοση δικτύου: {0}. Έκδοση P2P
 account.tab.arbitratorRegistration=Εγγραφή διαμεσολαβητή
 account.tab.account=Λογαριασμός
 account.info.headline=Καλωσόρισες στον Bisq λογαριασμό σου
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Λογαριασμοί εθνικών νομισμάτων
 account.menu.altCoinsAccountView=Λογαριασμοί altcoins
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=Εγγραφή διαμεσολαβητή
 account.arbitratorRegistration.revoke=Ανάκληση εγγραφής
-account.arbitratorRegistration.info.msg=Λάβε υπόψιν σου πως απαιτείται να παραμείνεις διαθέσιμος για 15 ημέρες μετά την ανάκλησή σου, καθώς ίσως υπάρχουν συναλλαγές στις οποίες έχεις ρόλο διαμεσολαβητή. Η μέγιστη επιτρεπόμενη περίοδος συναλλαγών είναι 8 ημέρες και η επίλυση διένεξης μπορεί να διαρκέσει μέχρι 7 ημέρες.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=Πρέπει να προσθέσεις τουλάχιστον μία γλώσσα.\nΠροσθέσαμε ήδη την προεπιλεγμένη γλώσσα.
 account.arbitratorRegistration.removedSuccess=Διέγραψες επιτυχώς τον διαμεσολαβητή σου από το δίκτυο P2P.
 account.arbitratorRegistration.removedFailed= Δεν ήταν δυνατή η διαγραφή του διαμεσολαβητή.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Μπορείς να επιλέξεις μον
 account.arbitratorSelection.minOne=Πρέπει να επιλέξεις τουλάχιστον έναν διαμεσολαβητή.
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=Βεβαιώσου πως πληρείς τις απαιτήσεις για τη χρήση των {0} πορτοφολιών, όπως αυτές περιγράφονται στην ιστοσελίδα {1}.\nΗ χρήση είτε πορτοφολιών κεντρικών ανταλλακτηρίων όπου δεν έχεις τον έλεγχο των κλειδιών σου, είτε πορτοφολιού ασύμβατου λογισμικού, μπορεί να οδηγήσει σε απώλεια κεφαλαίων!\nΟ διαμεσολαβητής δεν είναι ειδικός {2} και δεν μπορεί να βοηθήσει σε τέτοιες περιπτώσεις.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Κατανοώ και επιβεβαιώνω πως γνωρίζω ποιο πορτοφόλι πρέπει να χρησιμοποιήσω.
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Αφαίρεση κωδικού
 account.password.removePw.headline=Αφαίρεση κωδικού προστασίας  πορτοφολιού
 account.password.setPw.button=Όρισε κωδικό
 account.password.setPw.headline=Όρισε κωδικό προστασίας πορτοφολιού
-account.password.info=Με κωδικό προστασίας απαιτείται η εισαγωγή του κωδικού για αναλήψεις bitcoin από το πορτοφόλι σου ή αν θέλεις να δεις ή να επαναφέρεις ένα πορτοφόλι μέσω των λέξεων seed, καθώς και κατά την εκκίνηση της εφαρμογής.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Αποθήκευση αντιγράφου ασφαλείας για seed words πορτοφολιού
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=Δεν έχεις δημιουργήσει κωδικό πορτοφολιού, ο οποίος θα προστατεύσει την εμφάνιση των λέξεων seed.\n\nΘέλεις να εμφανίσεις τις λέξεις seed;
 account.seed.warn.noPw.yes=Ναι, και να μην ερωτηθώ ξανά
 account.seed.enterPw=Εισήγαγε κωδικό για την εμφάνιση των λέξεων seed
-account.seed.restore.info=Επισημαίνουμε πως δεν μπορείς να εισάγεις πορτοφόλι από παλαιότερη έκδοση Bisq (οποιαδήποτε έκδοση πριν την 0.5.0), καθώς έχει αλλάξει το format του πορτοφολιού!\n\nΑν επιθυμείς να μετακινήσεις κεφάλαια από παλαιότερη έκδοση στη νέα εφαρμογή Bisq, χρησιμοποίησε αποστολή bitcoin.\n\nΕπίσης λάβε υπόψιν πως η επαναφορά πορτοφολιού πρέπει να χρησιμοποιείται αποκλειστικά για περιπτώσεις έκτακτης ανάγκης, και μπορεί να προκαλέσει προβλήματα στην εσωτερική βάση δεδομένων του πορτοφολιού.\nΔεν πρέπει να χρησιμοποιείται για τη δημιουργία αντιγράφου ασφαλείας! Χρησιμοποίησε ένα αντίγραφο ασφαλείας από τον κατάλογο δεδομένων εφαρμογής για την επαναφορά προηγούμενης κατάστασης της εφαρμογής.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Εντάξει, καταλαβαίνω και θέλω να κάνω επαναφορά.
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=Τύπος πρότασης
 dao.proposal.table.header.link=Σύνδεσμος
+dao.proposal.table.header.myVote=Η ψήφος μου
+dao.proposal.table.header.remove=Απόσυρε
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=Αποστολή κεφαλαίων BSQ
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=Επιβεβαίωση αίτησης ανάληψης
 dao.wallet.send.sendFunds.details=Αποστολή: {0}\nΔιεύθυνση παραλαβής: {1}\nΑπαιτούμενη αμοιβή συναλλαγής: {2} ({3} satoshis/byte)\nΜέγεθος συναλλαγής: {4} Kb\n\nΟ παραλήπτης θα λάβει: {5}\n\nΕίσαι σίγουρος πως θέλεις να κάνεις ανάληψη αυτού του ποσού;
-dao.wallet.chainHeightSynced=Συγχρονισμένο μέχρι το block:{0} (τελευταίο block: {1})
-dao.wallet.chainHeightSyncing=Συγχρονισμός block: {0} (τελευταίο block: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Τύπος
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Αποτυχία επαλήθευση
 displayUpdateDownloadWindow.success=Η νέα έκδοση αποθηκεύτηκε επιτυχώς και η υπογραφή επαληθεύτηκε.\n\nΆνοιξε το φάκελο αποθήκευσης, κλείσε την εφαρμογή και εγκατάστησε τη νέα έκδοση.
 displayUpdateDownloadWindow.download.openDir=Άνοιγμα καταλόγου λήψης
 
-disputeSummaryWindow.title=Περίληψη
+disputeΠερίληψηWindow.title=Περίληψη
 disputeSummaryWindow.openDate=Ticket opening date
 disputeSummaryWindow.role=Trader's role
 disputeSummaryWindow.evidence=Evidence
@@ -1741,7 +1746,7 @@ popup.headline.error=Σφάλμα
 popup.doNotShowAgain=Ακύρωση επανεμφάνισης
 popup.reportError.log=Άνοιγμα αρχείου log
 popup.reportError.gitHub=Ανάφερε στο GitHub issue tracker
-popup.reportError={0}\n\nΒοήθησέ μας να βελτιώσουμε το πρόγραμμα αναφέροντας το σφάλμα στη λίστα ζητημάτων του GithHub  (https://github.com/bisq-network/bisq-desktop/issues).\nΤο μήνυμα σφάλματος θα αντιγραφεί στο πρόχειρο όταν πατήσεις τα πιο κάτω κουμπιά.\nΘα διευκολύνει την αποσφαλμάτωση, αν επισυνάψεις το αρχείο bisq.log.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Επανεκκίνησε την εφαρμογή και έλεγξε τη σύνδεση δικτύου, ώστε να επιλυθεί το πρόβλημα.
 popup.error.takeOfferRequestFailed=Προέκυψε σφάλμα κατά την αποδοχή της προσφοράς σου.\n\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=Ένας από τους κόμβους {0} απαγο
 popup.warning.priceRelay=αναμετάδοση τιμής
 popup.warning.seed=Λέξεις seed
 
-popup.info.securityDepositInfo=Για να εξασφαλιστεί πως και οι δύο συναλλασσόμενοι ακολουθούν το πρωτόκολλο συναλλαγών, απαιτείται να καταθέσουν ένα ποσό εγγύησης.\n\nΗ εγγύηση θα παραμείνει στο τοπικό πορτοφόλι σου μέχρι η προσφορά σου γίνει αποδεκτή από κάποιον συναλλασσόμενο.\nΘα σου επιστραφεί μετά την επιτυχή ολοκλήρωση της συναλλαγής.\n\nΛάβε υπόψιν πως η εφαρμογή χρειάζεται να παραμείνει ενεργή εάν έχεις ανοιχτή προφορά.\nΌταν ένας άλλος συναλλασσόμενος επιθυμεί να αποδεχτεί την προσφορά σου, απαιτείται η εφαρμογή να είναι συνδεδεμένη με το διαδίκτυο για να ενεργοποιήσει το πρωτόκολλο συναλλαγών.\nΒεβαιώσου πως έχεις απενεργοποιήσει τη λειτουργία αναμονής, καθώς μπορεί να αποσυνδέσει την εφαρμογή από το δίκτυο (η λειτουργία αναμονής της οθόνης δεν αποτελεί πρόβλημα).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Βεβαιώσου πως έχεις υποκατάστημα τράπεζας στην περιοχή σου όπου μπορείς να κάνεις την κατάθεση.\nBIC/SWIFT τράπεζας πωλητή: {0}.
 popup.info.cashDepositInfo.confirm=Επιβεβαιώνω πως μπορώ να κάνω την κατάθεση

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

@@ -193,6 +193,9 @@ shared.all=Todos
 shared.edit=Editar
 shared.advancedOptions=Opciones avanzadas
 shared.interval=Intervalo
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Sí, lo he iniciado.
 portfolio.pending.step2_seller.waitPayment.headline=Esperar al pago.
 portfolio.pending.step2_seller.f2fInfo.headline=Información de contacto del comprador
 portfolio.pending.step2_seller.waitPayment.msg=La transacción del depósito tiene al menos una confirmación en la cadena de bloques.\nTien que esperar hasta que el comprador de BTC comience el pago de {0}.
-portfolio.pending.step2_seller.warn=El comprador de BTC aún no ha realizado el pago de {0}.\nNecesita esperar hasta que el pago comience.\nSi el intercambio aún no se ha completado el {1} el árbitro procederá a investigar.
+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=El comprador de BTC no ha comenzado su pago!\nEl periodo máximo permitido ha finalizado.\nPuede esperar más y dar más tiempo a la otra parte o contactar con el árbitro para abrir una disputa.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Sin transacciones disponibles
 funds.tx.revert=Revertir
 funds.tx.txSent=La transacción se ha enviado exitosamente a una nueva dirección en la billetera Bisq local.
 funds.tx.direction.self=Enviado a usted mismo
-funds.tx.proposalTxFee=Tasa de minado de la propuesta
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Requerimiento de reembolso
 funds.tx.compensationRequestTxFee=Petición de compensación
 
@@ -762,9 +765,9 @@ support.buyerOfferer= comprador/creador BTC
 support.sellerOfferer=vendedor/creador BTC
 support.buyerTaker=comprador/Tomador BTC
 support.sellerTaker=vendedor/Tomador BTC
-support.backgroundInfo=Bisq no es una compañía y no provee ningún tipo de atención al cliente. \n\nSi hay disputas en el proceso de intercambio (v.g un comerciante no sigue el protocolo de intercambio) la aplicación mostrará el botón \"Abrir disputa\" después de que el periodo de intercambio termine para contactar con el árbitro. \nEn casos de bugs u otros problemas, el software intentará encontrarlos y se mostrará el botón \"Abrir ticket de soporte\" para contactar al árbitro, que enviará el problema a los desarrolladores.\n\nSi tiene un problema y no se mostrase el botón \"Abrir ticket de soporte\", puede abrir un ticket de soporte manualmente seleccionando el intercambio que causa el problema en \"Portafolio/Intercambios abiertos\" y tecleando al combinación \"alt + o\" o \"option + +o\". Por favor, úselo sólo si está seguro de que el software no está trabajando como debería. Si tiene dudas o problemas, por favor lea el FAQ (preguntas frecuentes) en la web bisq.network o postee en el forum Bisq en la sección de soporte. 
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo="Por favor, tenga en cuenta las reglas básicas del proceso de disputa:\n1. Necesita responder a los requerimientos del árbitro en 2 días.\n2. El periodo máximo para la disputa es de 14 días.\n3. Necesita cumplir lo que el árbitro requiera de usted para mostrar entregar evidencia de su caso.\n4. Acepta las reglas mostradas en la wiki de acuerdo de usuario cuando inició la aplicación.\n\nPor favor lea más en detalle acerca del proceso de disputa en nuestra wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Mensaje de sistema: {0}
 support.youOpenedTicket=Ha abierto una solicitud de soporte.
 support.youOpenedDispute=Ha abierto una solicitud de disputa.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Utilizar nodos Bitcoin Core personalizados
 settings.net.warn.usePublicNodes=Si usa una red pública de Bitcoin está expuesto a problemas de seguridad causados por el fallo en el diseño y la implementación del filtro bloom que se utiliza para carteras SPV como BitcoinJ (usado en Bisq). Cualquier nodo completo al que esté conectado podría conocer que todas las direcciones del monedero pertenecen a una entidad.\n\nPor favor, lea más sobre los detalles en: https://bisq.network/blog/privacy-in-bitsquare.\n\n¿Está seguro de que quiere utilizar los nodos públicos?
 settings.net.warn.usePublicNodes.useProvided=No, utilizar nodos proporcionados
 settings.net.warn.usePublicNodes.usePublic=Sí, utilizar la red pública
-settings.net.warn.useCustomNodes.B2XWarning=¡Por favor, asegúrese de que su nodo Bitcoin es un nodo de confianza Bitcoin Core!\n\nConectar a nodos que no siguen las reglas de consenso puede causar perjuicios a su cartera y causar problemas en el proceso de intercambio.\n\nLos usuarios que se conecten a los nodos que violan las reglas de consenso son responsables de cualquier daño que estos creen. Las disputas causadas por ello se decidirán en favor del otro participante. No se dará soporte técnico a usuarios que ignoren esta advertencia y los mecanismos de protección!
-settings.net.localhostBtcNodeInfo=(Información de contexto: Si está corriendo un nodo bitcoin local (localhost) se conectará exclusivamente a eso.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Pares conectados
 settings.net.onionAddressColumn=Dirección onion
 settings.net.creationDateColumn=Establecido
@@ -857,17 +860,17 @@ settings.net.inbound=entrante
 settings.net.outbound=saliente
 settings.net.reSyncSPVChainLabel=Resincronizar cadena SPV
 settings.net.reSyncSPVChainButton=Borrar archivo SPV y resincronizar
-settings.net.reSyncSPVSuccess=El archivo de cadena SPV se borrará en el siguiente inicio. Puede reiniciar la aplicación ahora.\n\nDespués del reinicio puede llevar un rato resincronizar con la red y verá todas las transacciones una vez completada la resincronización.\n\nPor favor haga otro reinicio después de resincroniza porque a veces hay inconsistencias que llevan a un balance mostrado incorrecto.
-settings.net.reSyncSPVAfterRestart=El archivo de cadena SPV ha sido borrado. Por favor, tenga paciencia. Puede llevar un tiempo resincronizar con la red.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=La resincronización se ha completado. Por favor, reinicie la aplicación.
 settings.net.reSyncSPVFailed=No se pudo borrar el archivo de cadena SPV\nError: {0}
 setting.about.aboutBisq=Acerca de Bisq
-setting.about.about=Bisq es un proyecto de código abierto y una red descentralizada de usuarios que desean intercambiar Bitcoin con monedas nacionales o criptomonedas alternativas protegiendo su privacidad. Conozca más acerca de Bisq en la página de nuestro proyecto.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Página web de Bisq
 setting.about.code=código fuente
 setting.about.agpl=Licencia AGPL
 setting.about.support=Apoye Bisq
-setting.about.def=Bisq no es una empresa, es un proyecto de comunidad abierto a contribuciones. Si desea participar o apoyar Bisq, por favor, ingrese a los enlaces debajo.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Contribuir
 setting.about.donate=Donar
 setting.about.providers=Proveedores de datos
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Versión de red: {0}; Versión de mensajes P2P: {1}
 account.tab.arbitratorRegistration=Registro de árbitro
 account.tab.account=Cuenta
 account.info.headline=Bienvenido a su cuenta Bisq
-account.info.msg=Aquí puede añadir cuentas de intercambio para monedas nacionales y altcoins, seleccionar árbitros y crear una copia de seguridad de la cartera y datos e la cuenta.\n\nSe ha creado una cartera vacía de Bitcoin la primera vez que inició Bisq.\nRecomendamos que anote las palabras semilla de la cartera (ver botón a la izquierda) y considere añadir una contraseña antes de enviar fondos. Los depósitos y retiros Bitcoin se controlan en la sección \"Fondos\".\n\nPrivacidad y Seguridad:\nBisq es una casa de cambio descentralizada - lo que significa que todos los datos se mantienen en su computadora - no hay servidores y no tenemos acceso a su información personal, sus fondos e incluso su dirección IP. Datos como números de cuenta bancaria, direcciones Bitcoin y altcoin, etc sólo se comparten con el par de intercambio para completar los intercambios iniciados (en caso de disputa, el árbitro verá los mismos datos que el par de intercambio).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Cuentas de moneda nacional
 account.menu.altCoinsAccountView=Cuentas de altcoi
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Clave pública
 
 account.arbitratorRegistration.register=Registro de árbitro
 account.arbitratorRegistration.revoke=Revocar registro
-account.arbitratorRegistration.info.msg=Por favor, tenga en cuenta que necesita estar disponible durante 15 días después de la revocación porque puede haber intercambios en los que esté envuelto. El periodo máximo de intercambio es de 8 días y el proceso de disputa puede llevar hasta 7 días.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=Necesita introducir al menos 1 idioma.\nHemos añadido el idioma por defecto para usted.
 account.arbitratorRegistration.removedSuccess=Ha eliminado su árbitro de la red P2P satisfactoriamente.
 account.arbitratorRegistration.removedFailed=No se pudo eliminar el árbitro. {0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Puede seleccionar solamente árbitros que hab
 account.arbitratorSelection.minOne=Necesita tener al menos un árbitro seleccionado.
 
 account.altcoin.yourAltcoinAccounts=Sus cuentas de altcoin
-account.altcoin.popup.wallet.msg=Por favor, asegúrese de que sigue los requerimientos para el uso de {0} cartera(s) tal como se describe en la página web {1}.\n¡Usar carteras desde casas de cambio centralizadas donde no tiene control sobre las claves o usar un software de cartera no compatible puede llevar a la pérdida de los fondos intercambiados!\nEl árbitro no es un especialista {2} y no puede ayudar en tales casos.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Entiendo y confirmo que sé qué monedero tengo que utilizar.
 account.altcoin.popup.xmr.msg=Si quiere comerciar XMR en Bisq, por favor asegúrese de que entiende y cumple todos los requerimientos.\n\nPara enviar XMR necesita usar o el monedero oficial Monero GUI o el monedero Monero simple con la bandera store-tx-info habilitada (por defecto en las nuevas versiones).\nPor favor asegúrese de que puede acceder a la tx key (usar el comando get_tx_key en simplewallet) porque podría requerirse en caso de disputa.\n\nmonero-wallet-cli (use el comando get_tx_key)\nmonero-wallet-gui (vaya a la pestaña de historia y clique en el botón (P) para prueba de pago)\n\nAdemás de la herramienta XMR checktx (https://xmr.llcoins.net/checktx.html) la verificación también se puede cumplir dentro del monedero.\nmonero-wallet-cli : usando el comando (check_tx_key).\nmonero-wallet-gui : en Avanzado > Probar/Comprobar página.\nEn exploradores de bloque normales la transferencia no es verificable.\n\nNecesita entregar al árbitro la siguiente información en caso de disputa:\n- La clave privada de transacción (tx private key).\n- El hash de transacción.\n- La dirección pública del receptor.\n\nSi no puede proveer la información o si ha usado un monedero incompatible resultaría en la pérdida del caso de disputa. El emisor de XMR es responsable de ser capaz de verificar la transacción XMR a el árbitro en caso de disputa.\n\nNo se requiere la ID de pago, sólo la dirección pública normal.\n\nSi no está seguro del proceso visite (https://www.getmonero.org/resources/user-guides/prove-payment.html) o el foro Monero (https://forum.getmonero.org) para más  información.
 account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Eliminar password
 account.password.removePw.headline=Eliminar protección por password del monedero
 account.password.setPw.button=Establecer password
 account.password.setPw.headline=Establecer protección por password del monedero
-account.password.info=Con protección por password tiene que introducir su password al retirar bitcoin de su monedero o si quiere ver o restaurar un monedero desde las palabras semilla, así como al inicio de la aplicación
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Copia de seguridad de palabras semilla del monedero
-account.seed.info=Por favor apunte en un papel tanto las palabras semilla del monedero como la fecha! Puede recuperar su monedero en cualquier momento con las palabras semilla y la fecha.\nLas palabras semilla se usan tanto para el monedero BTC como para el monedero BSQ.\n\nDebe apuntar las palabras semillas en una hoja de papel y no guardarla en su computadora.\n\nPor favor, tenga en cuenta que las palabras semilla no son un sustituto de la copia de seguridad.\nNecesita hacer la copia de seguridad de todo el directorio de aplicación en la pantalla \"Cuenta/Copia de Seguridad\" para recuperar un estado de aplicación válido y los datos.\nImportar las palabras semilla solo se recomienda para casos de emergencia. La aplicación no será funcional sin una adecuada copia de seguridad de los archivos de la base de datos y claves!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=No ha establecido una contraseña de cartera que proteja la visualización de las palabras semilla.\n\n¿Quiere que se muestren las palabras semilla?
 account.seed.warn.noPw.yes=Sí, y no preguntar de nuevo
 account.seed.enterPw=Introducir password para ver las palabras semilla
-account.seed.restore.info=Por favor tenga en cuenta que no puede importar un monedero desde una versión antigua de Bisq (ninguna versión anterior a la 0.5.0), porque el formato de monedero ha cambiado!\n\nSi quiere mover los fondos desde la versión vieja a la nueva aplicación Bisq envíelos con una transacción Bitcoin.\n\nTambién a en cuenta que la restauración de monedero es sólo para casos de emergencia y puede causar problemas con la base de datos del monedero interno.\nNo es manera de aplicar una copia de seguridad! Por favor utilice una copia de seguridad desde el directorio de datos de la aplicación para restaurar a un estado previo de la aplicación.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Ok, entiendo y quiero restaurar
 
 
@@ -1319,7 +1322,7 @@ dao.assetState.REMOVED_BY_VOTING=Eliminados por votación
 dao.proofOfBurn.header=Prueba de quemado
 dao.proofOfBurn.amount=Cantidad
 dao.proofOfBurn.preImage=Pre-imagen
-dao.proofOfBurn.burn=Quemar
+dao.proofOfQuemar.burn=Quemar
 dao.proofOfBurn.allTxs=Todas las transacciones de prueba de quemado
 dao.proofOfBurn.myItems=Mis transacciones de prueba de quemado
 dao.proofOfBurn.date=Fecha
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Opción
 
 dao.proposal.table.header.proposalType=Tipo de propuesta
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=Mi voto
+dao.proposal.table.header.remove=Eliminar
 dao.proposal.table.icon.tooltip.removeProposal=Eliminar mi propuesta
 dao.proposal.table.icon.tooltip.changeVote=Voto actual: ''{0}''. Cambiar voto a: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=Enviar fondos BSQ
 dao.wallet.send.sendBtc=Enviar fondos BTC
 dao.wallet.send.sendFunds.headline=Confirme la petición de retiro
 dao.wallet.send.sendFunds.details=Enviando: {0}\nA la dirección receptora: {1}.\nLa tasa de transacción requerida es: {2} ({3} Satoshis/byte)\nTamaño de la transacción: {4} Kb\n\nEl receptor recibirá: {5}\n\nSeguro que quiere retirar esta cantidad?
-dao.wallet.chainHeightSynced=Sincronizado con la cadena de bloques. Altura actual: {0} / Mejor altura de la cadena: {1}
-dao.wallet.chainHeightSyncing=Sincronizando con la cadena de bloques. Altura actual: {0} / Mejor altura de la cadena: {1}
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Tipo
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Verificación fallida./nPor favor desc
 displayUpdateDownloadWindow.success=La nueva versión ha sido descargada con éxito y la firma verificada./n/nPor favor abra el directorio de descargas, cierre la aplicación e instale la nueva versión.
 displayUpdateDownloadWindow.download.openDir=Abrir directorio de descargas
 
-disputeSummaryWindow.title=Resumen
+disputeResumenWindow.title=Resumen
 disputeSummaryWindow.openDate=Fecha de apertura de ticket
 disputeSummaryWindow.role=Rol del trader
 disputeSummaryWindow.evidence=Evidencia
@@ -1741,7 +1746,7 @@ popup.headline.error=Error
 popup.doNotShowAgain=No mostrar de nuevo
 popup.reportError.log=Abrir archivo de registro
 popup.reportError.gitHub=Reportar al rastreador de problemas de Github
-popup.reportError={0}\n\nPara ayudarnos a mejorar el software, por favor reporte el error en nuestro registro de incidentes en GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nEl mensaje de error se copiará en el portapapeles cuando haga clic en los botones más abajo.\nAdemás, se facilitará la corrección del error si puede adjuntar el archivo bisq.log
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Por favor pruebe a reiniciar la aplicación y comprobar su conexión a la red para ver si puede resolver el problema.
 popup.error.takeOfferRequestFailed=Un error ocurrió cuando alguien intentó tomar una de sus ofertas:/n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=Uno de los nodos {0} ha sido baneado. Por favor reinici
 popup.warning.priceRelay=retransmisión de precios
 popup.warning.seed=Semilla
 
-popup.info.securityDepositInfo=Para asegurarse de que ambos comerciantes siguen el protocolo de intercambio, necesitan pagar un depósito de seguridad.\n\nEl depósito seguirá en su monedero de intercambio local hasta que la oferta sea aceptada por otro comerciante.\nSe le devolverá después de que el intercambio se complete satisfactoriamente.\n\nPor favor tenga en cuenta que necesita mantener la aplicación en marcha si tiene alguna oferta abierta. Cuando otro comerciante quierea tomar la oferta, se requiere que su aplicación esté online para ejecutar el protocolo de intercambio.\nAsegúrese de que tiene el modo standby desactivado, ya que esto desconectaría la red (el standby del monitor no es un problema).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Por favor asegúrese de que tiene una oficina bancaria donde pueda hacer el depósito de efectivo.\nEl banco con ID (BIC/SWIFT) de el banco del vendedor es: {0}
 popup.info.cashDepositInfo.confirm=Confirmo que puedo hacer el depósito

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

@@ -137,7 +137,7 @@ shared.saveNewAccount=ذخیره‌ی حساب جدید
 shared.selectedAccount=حساب انتخاب شده
 shared.deleteAccount=حذف حساب
 shared.errorMessageInline=\nپیغام خطا: {0}
-shared.errorMessage=Error message
+shared.errorMessage=پیام خطا
 shared.information=اطلاعات
 shared.name=نام
 shared.id=شناسه
@@ -152,19 +152,19 @@ shared.seller=فروشنده
 shared.buyer=خریدار
 shared.allEuroCountries=تمام کشورهای یورو
 shared.acceptedTakerCountries=کشورهای هدف برای پذیرش طرف معامله
-shared.arbitrator=Selected arbitrator
+shared.arbitrator=داور انتخاب شده
 shared.tradePrice=قیمت معامله
 shared.tradeAmount=مقدار معامله
 shared.tradeVolume=حجم معامله
 shared.invalidKey=کلید وارد شده صحیح نیست.
-shared.enterPrivKey=Enter private key to unlock
-shared.makerFeeTxId=Maker fee transaction ID
-shared.takerFeeTxId=Taker fee transaction ID
-shared.payoutTxId=Payout transaction ID
-shared.contractAsJson=Contract in JSON format
+shared.enterPrivKey=کلید خصوصی را برای بازگشایی وارد کنید
+shared.makerFeeTxId=شناسه تراکنش کارمزد سفارش‌گذار
+shared.takerFeeTxId=شناسه تراکنش کارمزد پذیرنده
+shared.payoutTxId=شناسه تراکنش پرداخت
+shared.contractAsJson=قرارداد در قالب JSON
 shared.viewContractAsJson=مشاهده‌ی قرارداد در قالب JSON:
 shared.contract.title=قرارداد برای معامله با شناسه ی {0}
-shared.paymentDetails=BTC {0} payment details
+shared.paymentDetails=جزئیات پرداخت BTC {0}
 shared.securityDeposit=سپرده‌ی اطمینان
 shared.yourSecurityDeposit=سپرده ی اطمینان شما
 shared.contract=قرارداد
@@ -172,27 +172,30 @@ shared.messageArrived=پیام رسید.
 shared.messageStoredInMailbox=پیام در پیام‌های دریافتی ذخیره شد.
 shared.messageSendingFailed=ارسال پیام ناموفق بود. خطا: {0}
 shared.unlock=باز کردن
-shared.toReceive=to receive
-shared.toSpend=to spend
+shared.toReceive=قابل دریافت
+shared.toSpend=قابل خرج کردن
 shared.btcAmount=مقدار بیتکوین
-shared.yourLanguage=Your languages
+shared.yourLanguage=زبان‌های شما
 shared.addLanguage=افزودن زبان
 shared.total=مجموع
-shared.totalsNeeded=Funds needed
-shared.tradeWalletAddress=Trade wallet address
-shared.tradeWalletBalance=Trade wallet balance
+shared.totalsNeeded=وجه مورد نیاز
+shared.tradeWalletAddress=آدرس کیف‌پول معاملات
+shared.tradeWalletBalance=موجودی کیف‌پول معاملات
 shared.makerTxFee=سفارش گذار: {0}
 shared.takerTxFee=پذیرنده سفارش: {0}
 shared.securityDepositBox.description=سپرده‌ی اطمینان بیتکوین {0}
 shared.iConfirm=تایید می‌کنم
 shared.tradingFeeInBsqInfo=معادل با {0} برای کارمزد معدن‌کاوان مورد استفاده قرار گرفته است.
 shared.openURL=باز {0}
-shared.fiat=Fiat
-shared.crypto=Crypto
-shared.all=All
-shared.edit=Edit
-shared.advancedOptions=Advanced options
-shared.interval=Interval
+shared.fiat=فیات
+shared.crypto=کریپتو
+shared.all=همه
+shared.edit=ویرایش
+shared.advancedOptions=گزینه‌های پیشرفته
+shared.interval=دوره
+shared.actions=عملیات
+shared.buyerUpperCase=خریدار
+shared.sellerUpperCase=فروشنده
 
 ####################################################################
 # UI views
@@ -212,9 +215,9 @@ mainView.menu.settings=تنظیمات
 mainView.menu.account=حساب
 mainView.menu.dao=DAO (موسسه خودمختار غیرمتمرکز)
 
-mainView.marketPrice.provider=Price by
-mainView.marketPrice.label=Market price
-mainView.marketPriceWithProvider.label=Market price by {0}
+mainView.marketPrice.provider=قیمت بر اساس
+mainView.marketPrice.label=قیمت بازار
+mainView.marketPriceWithProvider.label=قیمت بازار بر اساس {0}
 mainView.marketPrice.bisqInternalPrice=قیمت آخرین معامله‌ی Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=قیمت بازارهای خارجی موجود نیست.\nقیمت نمایش داده شده، از آخرین معامله‌ی Bisq برای ارز موردنظر اتخاذ شده است.
 mainView.marketPrice.tooltip=قیمت بازار توسط {0}{1} ارائه شده است\nآخرین به روز رسانی: {2}\nURL لینک Node ارائه دهنده: {3}
@@ -222,8 +225,8 @@ mainView.marketPrice.tooltip.altcoinExtra=در صورتی که آلتکوین د
 mainView.balance.available=موجودی در دسترس
 mainView.balance.reserved=رزرو شده در پیشنهادها
 mainView.balance.locked=قفل شده در معاملات
-mainView.balance.reserved.short=Reserved
-mainView.balance.locked.short=Locked
+mainView.balance.reserved.short=اندوخته
+mainView.balance.locked.short=قفل شده
 
 mainView.footer.usingTor=(استفاده از Tor)
 mainView.footer.localhostBitcoinNode=(لوکال هاست)
@@ -303,7 +306,7 @@ offerbook.offerersBankSeat=کشور بانک سفارش‌گذار: {0}
 offerbook.offerersAcceptedBankSeatsEuro=بانک‌های کشورهای پذیرفته شده (پذیرنده): تمام کشورهای یورو
 offerbook.offerersAcceptedBankSeats=بانک‌های کشورهای پذیرفته شده (پذیرنده): \n{0}
 offerbook.availableOffers=پیشنهادهای موجود
-offerbook.filterByCurrency=Filter by currency
+offerbook.filterByCurrency=فیلتر بر اساس ارز
 offerbook.filterByPaymentMethod=فیلتر بر اساس روش پرداخت
 
 offerbook.nrOffers=تعداد پیشنهادها: {0}
@@ -360,7 +363,7 @@ createOffer.amountPriceBox.minAmountDescription=حداقل مقدار بیتکو
 createOffer.securityDeposit.prompt=سپرده‌ی اطمینان در بیتکوین
 createOffer.fundsBox.title=پیشنهاد خود را تامین وجه نمایید
 createOffer.fundsBox.offerFee=هزینه‌ی معامله
-createOffer.fundsBox.networkFee=Mining fee
+createOffer.fundsBox.networkFee=هرینه استخراج
 createOffer.fundsBox.placeOfferSpinnerInfo=انتشار پیشنهاد در حال انجام است ...
 createOffer.fundsBox.paymentLabel=معامله Bisq با شناسه‌ی {0}
 createOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} هزینه‌ی معامله، {2} هزینه‌ی تراکنش شبکه)
@@ -373,8 +376,8 @@ createOffer.info.buyBelowMarketPrice=شما همیشه {0}% کمتر از نرخ
 createOffer.warning.sellBelowMarketPrice=شما همیشه {0}% کمتر از نرخ روز فعلی بازار دریافت خواهید کرد، زیرا قیمت پیشنهادتان به طور مداوم به روز رسانی خواهد شد.
 createOffer.warning.buyAboveMarketPrice=شما همیشه {0}% کمتر از نرخ روز فعلی بازار پرداخت خواهید کرد، زیرا قیمت پیشنهادتان به طور مداوم به روز رسانی خواهد شد.
 createOffer.tradeFee.descriptionBTCOnly=هزینه‌ی معامله
-createOffer.tradeFee.descriptionBSQEnabled=Select trade fee currency
-createOffer.tradeFee.fiatAndPercent=≈ {0} / {1} of trade amount
+createOffer.tradeFee.descriptionBSQEnabled=انتخاب ارز برای کارمزد معامله
+createOffer.tradeFee.fiatAndPercent=≈ {1} / {0} از مبلغ معامله
 
 # new entries
 createOffer.placeOfferButton=بررسی: پیشنهاد را برای  {0} بیتکوین بگذارید
@@ -417,9 +420,9 @@ takeOffer.validation.amountLargerThanOfferAmount=مقدار ورودی نمی‌
 takeOffer.validation.amountLargerThanOfferAmountMinusFee=مقدار ورودی، باعث ایجاد تغییر جزئی برای فروشنده بیتکوین می شود.
 takeOffer.fundsBox.title=معامله خود را تأمین وجه نمایید
 takeOffer.fundsBox.isOfferAvailable=بررسی کنید آیا پیشنهاد در دسترس است...
-takeOffer.fundsBox.tradeAmount=Amount to sell
+takeOffer.fundsBox.tradeAmount=مبلغ فروش
 takeOffer.fundsBox.offerFee=هزینه‌ی معامله
-takeOffer.fundsBox.networkFee=Total mining fees
+takeOffer.fundsBox.networkFee=کل هزینه استخراج
 takeOffer.fundsBox.takeOfferSpinnerInfo=برداشتن پیشنهاد در حال انجام است...
 takeOffer.fundsBox.paymentLabel=معامله Bisq با شناسه‌ی {0}
 takeOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} هزینه‌ی معامله، {2} هزینه تراکنش شبکه)
@@ -511,9 +514,9 @@ portfolio.pending.step2_buyer.postal=لطفاً {0} را توسط \"US Postal Mo
 portfolio.pending.step2_buyer.bank=لطفاً به صفحه‌ی وبسایت بانکداری آنلاین خود رفته و {0} را فروشنده‌ی بیتکوین پرداخت کنید.\n\n
 portfolio.pending.step2_buyer.f2f=لطفا با استفاده از راه‌های ارتباطی ارائه شده توسط فروشنده با وی تماس بگیرید و قرار ملاقاتی را برای پرداخت {0} بیتکوین تنظیم کنید.\n
 portfolio.pending.step2_buyer.startPaymentUsing=آغاز پرداخت با استفاده از {0}
-portfolio.pending.step2_buyer.amountToTransfer=Amount to transfer
-portfolio.pending.step2_buyer.sellersAddress=Seller''s {0} address
-portfolio.pending.step2_buyer.buyerAccount=Your payment account to be used
+portfolio.pending.step2_buyer.amountToTransfer=مبلغ انتقال
+portfolio.pending.step2_buyer.sellersAddress=آدرس {0} فروشنده
+portfolio.pending.step2_buyer.buyerAccount=حساب پرداخت مورد استفاده
 portfolio.pending.step2_buyer.paymentStarted=پرداخت آغاز شد
 portfolio.pending.step2_buyer.warn=شما هنوز پرداخت {0} خود را انجام نداده‌اید.\nلطفاً توجه داشته باشید که معامله باید تا {1} تکمیل شود، در غیراینصورت معامله توسط داور مورد بررسی قرار خواهد گرفت.
 portfolio.pending.step2_buyer.openForDispute=شما پرداخت خود را تکمیل نکرده اید.\nحداکثر دوره‌ی زمانی برای معامله، به پایان رسیده است. \n\nلطفاً برای بازگشایی یک مناقشه، با داور تماس بگیرید.
@@ -525,13 +528,13 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=MTCN و رسید ر
 portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=شما باید MTCN (شماره پیگیری) و یک عکس از رسید را با ایمیل به فروشنده‌ی بیتکوین ارسال نمایید.\nرسید باید به طور واضح نام کامل، کشور، ایالت فروشنده و مقدار را نشان دهد. ایمیل فروشنده: {0}.\n\nآیا MTCN و قرارداد را برای فروشنده فرستادید؟
 portfolio.pending.step2_buyer.halCashInfo.headline=کد HalCash را بفرستید
 portfolio.pending.step2_buyer.halCashInfo.msg=باید کد HalCash و شناسه‌ی معامله ({0}) را به فروشنده بیتکوین پیامک بفرستید. شماره موبایل فروشنده بیتکوین {1} است. آیا کد را برای فروشنده فرستادید؟
-portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Some banks might require the receiver's name. The UK sort code and account number is sufficient for a Faster Payment transfer and the receivers name is not verified by any of the banks.
+portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=بعضی از بانک‌ها ممکن است نیاز به نام دریافت کننده داشته باشند. کد ترتیب (sort) UK و شماره حساب برای انتقال سریع‌تر کفایت می‌کند و نام دریافت کننده صحت‌سنجی نمی‌شود.
 portfolio.pending.step2_buyer.confirmStart.headline=تأیید کنید که پرداخت را آغاز کرده‌اید
 portfolio.pending.step2_buyer.confirmStart.msg=آیا شما پرداخت {0} را به شریک معاملاتی خود آغاز کردید؟
 portfolio.pending.step2_buyer.confirmStart.yes=بلی، پرداخت را آغاز کرده‌ام
 
 portfolio.pending.step2_seller.waitPayment.headline=برای پرداخت منتظر باشید
-portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
+portfolio.pending.step2_seller.f2fInfo.headline=اطلاعات تماس خریدار
 portfolio.pending.step2_seller.waitPayment.msg=تراکنش سپرده، حداقل یک تأییدیه بلاکچین دارد.شما\nباید تا آغاز پرداخت {0} از جانب خریدار بیتکوین، صبر نمایید.
 portfolio.pending.step2_seller.warn=خریدار بیتکوین هنوز پرداخت {0} را انجام نداده است.\nشما باید تا آغاز پرداخت از جانب او، صبر نمایید.\nاگر معامله روی {1} تکمیل نشده است، داور بررسی خواهد کرد.
 portfolio.pending.step2_seller.openForDispute=خریدار بیتکوین پرداخت خود را آغاز نکرده است.\nحداکثر دوره‌ی زمانی مجاز برای معامله به پایان رسیده است.\nشما می توانید بیشتر صبر کرده و به همتای معامله زمان بیشتری بدهید یا برای بازگشایی یک مناقشه، با داور تماس بگیرید.
@@ -551,19 +554,19 @@ message.state.FAILED=ارسال پیام ناموفق بود
 
 portfolio.pending.step3_buyer.wait.headline=برای تأییدیه‌ی پرداخت فروشنده‌ی بیتکوین منتظر باشید
 portfolio.pending.step3_buyer.wait.info=برای تأییدیه رسید پرداخت {0} از جانب فروشنده‌ی بیتکوین، منتظر باشید
-portfolio.pending.step3_buyer.wait.msgStateInfo.label=Payment started message status
+portfolio.pending.step3_buyer.wait.msgStateInfo.label=وضعیت پیام پرداخت آغاز شد
 portfolio.pending.step3_buyer.warn.part1a=بر بلاکچین {0}
 portfolio.pending.step3_buyer.warn.part1b=در ارائه دهنده‌ی پرداخت شما (برای مثال بانک)
 portfolio.pending.step3_buyer.warn.part2=فروشنده‌ی بیتکوین هنوز پرداخت شما را تأیید نکرده است.\nلطفاً {0} را بررسی کنید اگر ارسال پرداخت موفقیت آمیز بوده است.\nاگر فروشنده‌ی بیتکوین رسید پرداخت شما را تا {1} تأیید نکند، معامله توسط داور مورد بررسی قرار خواهد گرفت.
 portfolio.pending.step3_buyer.openForDispute=فروشنده‌ی بیتکوین هنوز پرداخت شما را تأیید نکرده است.\nحداکثر دوره‌ی زمانی مجاز برای معامله به پایان رسیده است.\nشما می‌توانید بیشتر صبر کرده و به همتای معامله زمان بیشتری بدهید یا برای بازگشایی یک مناقشه، با داور تماس بگیرید.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.part=شریک معاملاتی شما تأیید کرده که پرداخت {0} را آغاز نموده است.\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{2}\nhas already sufficient blockchain confirmations.\nThe payment amount has to be {3}\n\nYou can copy & paste your {4} address from the main screen after closing that popup.
+portfolio.pending.step3_seller.altcoin.explorer=در کاوشگر بلاکچین محبوبتان {0}
+portfolio.pending.step3_seller.altcoin.wallet=در والت {0} شما
+portfolio.pending.step3_seller.altcoin={0} لطفا بررسی کنید {1} که آیا تراکنش مربوط به آدرس شما\n{2}\n تعداد تاییدیه‌های کافی بر روی بلاکچین دریافت کرده است یا خیر.\nمبلغ پرداخت باید {3} باشد\nشما می‌توانید آدرس {4} خود را پس از بستن پنجره از صفحه اصلی کپی کنید.
 portfolio.pending.step3_seller.postal={0}لطفاً بررسی کنید که آیا {1} را با \"US Postal Money Order\" از خریدار بیتکوین دریافت کرده‌اید یا خیر.\n\nشناسه معامله (متن \"دلیل پرداخت\") تراکنش: \"{2}\"
 portfolio.pending.step3_seller.bank=شریک معاملاتی شما تأیید کرده که پرداخت {0} را آغاز نموده است.\n\nلطفاً به صفحه‌ی وبسایت بانکداری آنلاین خود رفته و بررسی کنید که آیا {1} را از خریدار بیتکوین دریافته کرده‌اید یا خیر.\n\nشناسه معامله (متن \"دلیل پرداخت\") تراکنش: \"{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\nTo avoid chargeback risk, only confirm if you received the email and if you are sure the paper receipt is valid.\nIf you are not sure, {0}
+portfolio.pending.step3_seller.cash=چون پرداخت از طریق سپرده‌ی نقدی انجام شده است، خریدار BTC باید عبارت \"غیر قابل استرداد\" را روی رسید کاغذی بنویسد، آن را به 2 قسمت پاره کند و از طریق ایمیل به شما یک عکس ارسال کند.\n\nبه منظور اجتناب از استرداد وجه، تنها در صورتی تایید کنید که ایمیل را دریافت کرده باشید و از صحت رسید کاغذی مطمئن باشید.\nاگر مطمئن نیستید، {0}
 portfolio.pending.step3_seller.moneyGram=خریدار باید شماره مجوز و عکسی از رسید را به ایمیل شما ارسال کند.\nرسید باید به طور واضح نام کامل شما ، کشور، ایالت فروشنده و مقدار را نشان دهد. لطفاً ایمیل خود را بررسی کنید که آیا شماره مجوز را دریافت کرده‌اید یا خیر.\n\nپس از بستن پنجره، نام و آدرس خریدار بیتکوین را برای برداشت پول از مانی‌گرام خواهید دید.\n\nتنها پس از برداشت موفقیت آمیز پول، رسید را تأیید کنید!
 portfolio.pending.step3_seller.westernUnion=خریدار باید MTCN (شماره پیگیری) و عکسی از رسید را به ایمیل شما ارسال کند.\nرسید باید به طور واضح نام کامل شما، کشور، ایالت فروشنده و مقدار را نشان دهد. لطفاً ایمیل خود را بررسی کنید که آیا MTCN را دریافت کرده اید یا خیر.\nپس از بستن پنجره، نام و آدرس خریدار بیتکوین را برای برداشت پول از Western Union خواهید دید.\nتنها پس از برداشت موفقیت آمیز پول، رسید را تأیید کنید!
 portfolio.pending.step3_seller.halCash=خریدار باید کد HalCash را برای شما با پیامک بفرستد. علاه‌برآن شما از HalCash پیامی را محتوی اطلاعات موردنیاز برای برداشت EUR از خودپردازهای پشتیبان HalCash دریافت خواهید کرد.\n\nپس از اینکه پول را از دستگاه خودپرداز دریافت کردید، لطفا در اینجا رسید پرداخت را تایید کنید.
@@ -571,11 +574,11 @@ portfolio.pending.step3_seller.halCash=خریدار باید کد HalCash را
 portfolio.pending.step3_seller.bankCheck=\n\nلطفاً همچنین تأیید کنید که نام فرستنده در اظهارنامه بانک شما، با نام فرستنده در قرارداد معامله مطابقت دارد:\nنام فرستنده: {0}\nاگر نام مذکور همان نامی نیست که در اینجا نشان داده شده است، {1}
 portfolio.pending.step3_seller.openDispute=لطفاً تأیید نکنید بلکه یک مناقشه را با وارد کردن \"alt + o\" یا \"option + o\" باز کنید.
 portfolio.pending.step3_seller.confirmPaymentReceipt=تأیید رسید پرداخت
-portfolio.pending.step3_seller.amountToReceive=Amount to receive
-portfolio.pending.step3_seller.yourAddress=Your {0} address
-portfolio.pending.step3_seller.buyersAddress=Buyers {0} address
-portfolio.pending.step3_seller.yourAccount=Your trading account
-portfolio.pending.step3_seller.buyersAccount=Buyers trading account
+portfolio.pending.step3_seller.amountToReceive=مبلغ قابل دریافت
+portfolio.pending.step3_seller.yourAddress=آدرس {0} شما
+portfolio.pending.step3_seller.buyersAddress=آدرس {0} خریدار
+portfolio.pending.step3_seller.yourAccount=حساب معاملاتی شما
+portfolio.pending.step3_seller.buyersAccount=حساب معاملاتی خریدار
 portfolio.pending.step3_seller.confirmReceipt=تأیید رسید پرداخت
 portfolio.pending.step3_seller.buyerStartedPayment=خریدار بیتکوین پرداخت {0} را آغاز کرده است.\n{1}
 portfolio.pending.step3_seller.buyerStartedPayment.altcoin=تأییدیه‌های بلاکچین را در کیف پول آلتکوین خود یا بلاکچین اکسپلورر بررسی کنید و هنگامی که تأییدیه های بلاکچین کافی دارید، پرداخت را تأیید کنید.
@@ -596,12 +599,12 @@ portfolio.pending.step3_seller.onPaymentReceived.confirm.yes=بله وجه را
 
 portfolio.pending.step5_buyer.groupTitle=خلاصه‌ای از معامله‌ی کامل شده
 portfolio.pending.step5_buyer.tradeFee=هزینه‌ی معامله
-portfolio.pending.step5_buyer.makersMiningFee=Mining fee
-portfolio.pending.step5_buyer.takersMiningFee=Total mining fees
-portfolio.pending.step5_buyer.refunded=Refunded security deposit
+portfolio.pending.step5_buyer.makersMiningFee=هرینه استخراج
+portfolio.pending.step5_buyer.takersMiningFee=کل هزینه استخراج
+portfolio.pending.step5_buyer.refunded=سپرده اطمینان مسترد شده
 portfolio.pending.step5_buyer.withdrawBTC=برداشت بیتکوین شما
-portfolio.pending.step5_buyer.amount=Amount to withdraw
-portfolio.pending.step5_buyer.withdrawToAddress=Withdraw to address
+portfolio.pending.step5_buyer.amount=مبلغ قابل برداشت
+portfolio.pending.step5_buyer.withdrawToAddress=برداشت به آدرس
 portfolio.pending.step5_buyer.moveToBisqWallet=انتقال وجوه به کیف پول Bisq 
 portfolio.pending.step5_buyer.withdrawExternal=برداشت به کیف پول خارجی
 portfolio.pending.step5_buyer.alreadyWithdrawn=وجوه شما در حال حاضر برداشت شده است.\nلطفاً تاریخچه‌ی تراکنش را بررسی کنید.
@@ -609,11 +612,11 @@ portfolio.pending.step5_buyer.confirmWithdrawal=تأیید درخواست برد
 portfolio.pending.step5_buyer.amountTooLow=مقدار مورد انتقال کمتر از هزینه تراکنش و حداقل ارزش tx (dust) است.
 portfolio.pending.step5_buyer.withdrawalCompleted.headline=برداشت تکمیل شد
 portfolio.pending.step5_buyer.withdrawalCompleted.msg=معاملات تکمیل شده‌ی شما در \"سبد سهام/تاریخچه\" ذخیره شده است.\nشما میتوانید تمام تراکنش‌های بیتکوین خود را در \"وجوه/تراکنش‌ها\" مرور کنید.
-portfolio.pending.step5_buyer.bought=You have bought
-portfolio.pending.step5_buyer.paid=You have paid
+portfolio.pending.step5_buyer.bought=شما خریده‌اید
+portfolio.pending.step5_buyer.paid=شما پرداخت کرده‌اید
 
-portfolio.pending.step5_seller.sold=You have sold
-portfolio.pending.step5_seller.received=You have received
+portfolio.pending.step5_seller.sold=شما فروخته‌اید
+portfolio.pending.step5_seller.received=شما دریافت کرده‌اید
 
 tradeFeedbackWindow.title=تبریک، معامله شما کامل شد.
 tradeFeedbackWindow.msg.part1=دوست داریم تجربه شما را بشنویم. این امر به ما کمک می کند تا نرم افزار را بهبود بخشیم و مشکلات را حل کنیم. اگر می خواهید بازخوردی ارائه کنید، لطفا این نظرسنجی کوتاه (بدون نیاز به ثبت نام) را در زیر پر کنید:
@@ -649,7 +652,7 @@ portfolio.pending.removeFailedTrade=اگر داور نتواند آن معامل
 portfolio.closed.completed=تکمیل شده
 portfolio.closed.ticketClosed=تیکت بسته شده است
 portfolio.closed.canceled=لغو شده است
-portfolio.failed.Failed=ناموفق
+portfolio.failed.ناموفق=ناموفق
 
 
 ####################################################################
@@ -667,7 +670,7 @@ funds.deposit.usedInTx=مورد استفاده در تراکنش (های) {0}
 funds.deposit.fundBisqWallet=تأمین مالی کیف پول Bisq 
 funds.deposit.noAddresses=آدرس‌هایی برای سپرده ایجاد نشده است
 funds.deposit.fundWallet=تأمین مالی کیف پول شما
-funds.deposit.withdrawFromWallet=Send funds from wallet
+funds.deposit.withdrawFromWallet=ارسال وجه از کیف‌پول
 funds.deposit.amount=Amount in BTC (optional)
 funds.deposit.generateAddress=ایجاد آدرس جدید
 funds.deposit.selectUnused=لطفاً به جای ایجاد یک آدرس جدید، یک آدرس استفاده نشده را از جدول بالا انتخاب کنید.
@@ -681,7 +684,7 @@ funds.withdrawal.senderAmount=مقدار فرستنده
 funds.withdrawal.feeExcluded=این مبلغ کارمزد تراکنش در شبکه را شامل نمی‌شود
 funds.withdrawal.feeIncluded=این مبلغ کارمزد تراکنش در شبکه را شامل می‌شود
 funds.withdrawal.fromLabel=Withdraw from address
-funds.withdrawal.toLabel=Withdraw to address
+funds.withdrawal.toLabel=برداشت به آدرس
 funds.withdrawal.withdrawButton=برداشت انتخاب شد
 funds.withdrawal.noFundsAvailable=وجهی برای برداشت وجود ندارد
 funds.withdrawal.confirmWithdrawalRequest=تأیید درخواست برداشت
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=هیچ تراکنشی موجود نیست
 funds.tx.revert=عودت
 funds.tx.txSent=تراکنش به طور موفقیت آمیز به یک آدرس جدید در کیف پول محلی Bisq ارسال شد.
 funds.tx.direction.self=ارسال شده به خودتان
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=درخواست خسارت
 
@@ -762,9 +765,9 @@ support.buyerOfferer=خریدار/سفارش گذار بیتکوین
 support.sellerOfferer=فروشنده/سفارش گذار بیتکوین
 support.buyerTaker=خریدار/پذیرنده‌ی بیتکوین
 support.sellerTaker=فروشنده/پذیرنده‌ی بیتکوین
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=لطفاً به قوانین مهم برای فرآیند مناقشه توجه داشته باشید:\n1. شما باید ظرف مدت 2 روز به درخواست‌های داور پاسخ دهید.\n2. حداکثر دوره‌ی زمانی برای مناقشه 14 روز است.\n3. شما باید با تحویل شواهد خودتان، آنچه را که داور درخواست می‌کند برآورده سازید.\n4. اولین بار که استفاده از نرم افزار را شروع کردید، قوانین مشخص شده در ویکی در موافقتنامه‌ی کاربر را پذیرفتید.\n\nلطفاً جزئیات بیشتر درباره‌ی فرآیند مناقشه را در ویکی ما بخوانید:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=پیغام سیستم: {0}
 support.youOpenedTicket=درخواستی برای پشتیبانی باز کردید.
 support.youOpenedDispute=درخواستی برای مناقشه باز کردید.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio= استفاده از نودهای بیتکوی
 settings.net.warn.usePublicNodes=اگر از شبکه عمومی بیتکوین استفاده می‌کنید، حریم خصوصی شما در معرض نودهای شبکه بیتکوین قرار می‌گیرد. این نقص ناشی از طراحی و پیاده‌سازی معیوب تکنولوژی Bloom Filter است که در کیف پول های SPV مانند BitcoinJ (که در Bisq هم استفاده می‌شود) وجود دارد. هر نود کامل بیتکوین که به آن متصل باشید می‌تواند هویت شما را با آدرس‌های کیف‌پول‌شما مرتبط بداند و این می‌تواند باعث برملا شدن هویت شما به نودهای شبکه بیتکوین شود.\nلطفاً جزئیات بیشتر را در این لینک بخوانید: https://bisq.network/blog/privacy-in-bitsquare.\n\nآیا مطمئن هستید که می‌خواهید از نودهای عمومی استفاده کنید؟
 settings.net.warn.usePublicNodes.useProvided=خیر، از نودهای فراهم شده استفاده کنید.
 settings.net.warn.usePublicNodes.usePublic=بلی، از شبکه عمومی استفاده کنید.
-settings.net.warn.useCustomNodes.B2XWarning=لطفاً مطمئن شوید که نود بیتکوین شما، یک نود بیتکوین مورد اعتماد است!\n\nارتباط با نودهایی که از قوانین اجماع بیتکوین استفاده نمی‌کنند، می‌تواند کیف‌پول شما را دچار مشکل کرده و منجر به اختلال در فرآیند معامله شود.\n\nکاربرانی که به نودهای ناقض قوانین اجماع بیتکوین متصل می شوند، مسئول هرگونه آسیب ایجاد شده توسط آن نود هستند. مناقشات ایجاد شده توسط آن به نفع همتای دیگر، تصمیم گیری می‌شوند. هیچ پشتیبانی فنی به کاربرانی که سازوکارهای محافظت و هشدار ما را نادیده می‌گیرند، اعطا نمی‌شود!
-settings.net.localhostBtcNodeInfo=(اطلاعات پیش زمینه: اگر شما یک نود لوکال بیتکوین (لوکال هاست) را اجرا می‌کنید، به طور انحصاری به آن متصل می‌شوید.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=آدرس Onion
 settings.net.creationDateColumn=تثبیت شده
@@ -857,17 +860,17 @@ settings.net.inbound=وارد شونده
 settings.net.outbound=خارج شونده
 settings.net.reSyncSPVChainLabel=همگام سازی مجدد زنجیره SPV 
 settings.net.reSyncSPVChainButton=حذف فایل SPV  و همگام سازی مجدد
-settings.net.reSyncSPVSuccess=در راه اندازی بعدی، فایل زنجیره SPV حذف خواهد شد. شما باید نرم افزار را الآن مجدداً راه اندازی کنید.\n\nبعد از راه اندازی مجدد، همگام سازی با شبکه کمی طول می کشد و هنگامی که همگام سازی مجدد تکمیل شد،شما فقط تمام تراکنش ها را خواهید دید.\n\nلطفاً پس از تکمیل همگام سازی مجدد، برنامه را باز هم راه اندازی مجدد کنید زیرا گاهی اوقات ناهماهنگی هایی وجود دارد که منجر به نمایش نادرست تراز می شود.
-settings.net.reSyncSPVAfterRestart=فایل زنجیره SPV حذف شده است. لطفاً صبور باشید، همگام سازی مجدد با شبکه کمی طول خواهد کشید.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=همگام سازی مجدد هم اکنون تکمیل شده است. لطفاً برنامه را مجدداً راه اندازی نمایید.
 settings.net.reSyncSPVFailed=حذف فایل زنجیره SPV امکان پذیر نیست. \nخطا: {0}
 setting.about.aboutBisq=درباره Bisq
-setting.about.about=Bisq یک پروژه منبع باز و یک شبکه غیر متمرکز از کاربرانی است که می خواهند بیتکوین را با ارزهای ملی یا ارزهای رمزگزاری شده جایگزین به روشی امن تبادل کنند. در صفحه وب پروژه ی ما، درباره Bisq بیشتر یاد بگیرید.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=صفحه وب Bisq
 setting.about.code=کد منبع
 setting.about.agpl=مجوز AGPL
 setting.about.support=پشتیبانی از Bisq
-setting.about.def=Bisq یک شرکت نیست، بلکه یک پروژه اجتماعی است و برای مشارکت آزاد است. اگر می خواهید در آن مشارکت کنید یا از آن پشتیبانی نمایید، لینک های زیر را دنبال کنید.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=مشارکت
 setting.about.donate=اهدا
 setting.about.providers=ارائه دهندگان داده
@@ -889,7 +892,7 @@ setting.about.subsystems.val=نسخه ی شبکه: {0}; نسخه ی پیام ه
 account.tab.arbitratorRegistration=ثبت نام داور
 account.tab.account=حساب
 account.info.headline=به حساب Bisq خود خوش آمدید
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=حساب های ارز ملی 
 account.menu.altCoinsAccountView=حساب های آلت کوین
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=ثبت نام داور
 account.arbitratorRegistration.revoke=لغو ثبت نام
-account.arbitratorRegistration.info.msg=لطفاً توجه داشته باشید که شما باید برای 15 روز پس از لغو کردن دردسترس باشید زیرا ممکن است معاملاتی وجود داشته باشند که از شما به عنوان داور استفاده می کنند. حداکثر دوره زمانی معامله مجاز 8 روز است و فرآیند مناقشه ممکن است تا 7 روز طول بکشد.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=شما باید حداقل 1 زبان را انتخاب کنید.\nما زبان پیشفرض را برای شما اضافه کردیم.
 account.arbitratorRegistration.removedSuccess=شما با موفقیت داورتان را از شبکه ی P2P  حذف کردید.
 account.arbitratorRegistration.removedFailed=حذف داور امکانپذیر نیست.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=شما می توانید داورانی را
 account.arbitratorSelection.minOne=شما باید حداقل یک داور را انتخاب کنید.
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=لطفا مطمئن شوید که الزامات استفاده از کیف پول {0} را همان طور که در صفحه {1} شرح داده شده است، پیروی می کنید.\nاستفاده از کیف پول مبادلات متمرکز که در آن کلید های خود را تحت کنترل ندارید و یا استفاده از یک نرم افزار کیف پول ناسازگار می تواند منجر به از دست رفتن وجوه معامله شده شود!\nداور یک متخصص {2} نیست و در چنین مواردی نمی تواند کمک کند.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=من می فهمم و تأیید می کنم که می دانم از کدام کیف پول باید استفاده کنم.
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=حذف رمز
 account.password.removePw.headline=حذف رمز محافظ برای کیف پول
 account.password.setPw.button=تنظیم رمز
 account.password.setPw.headline=تنظیم  رمز محافظ  برای کیف پول
-account.password.info=با محافظت رمزی شما باید کل رمز خودتان را هنگام برداشت بیتکوین از کیف پول یا هنگام مشاهده یا استرداد یک کیف پول از کلمات رمز خصوصی و همچنین در راه اندازی برنامه وارد کنید.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=پشتیبان گیری از کلمات رمز خصوصی کیف های پول شما
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=شما یک رمز عبور کیف پول تنظیم نکرده اید که از نمایش کلمات رمز خصوصی محافظت کند.\n\nآیا می خواهید کلمات رمز خصوصی نشان داده شود؟
 account.seed.warn.noPw.yes=بلی، و دوباره از من نپرس
 account.seed.enterPw=وارد کردن رمز عبور به منظور مشاهده ی کلمات رمز خصوصی
-account.seed.restore.info=لطفاً توجه داشته باشید که نمی توانید یک کیف پول را از نسخه ی قدیمی Bisq (هر نسخه ی قبل از 0.5.0) وارد کنید، چون قالب کیف پول تغییر کرده است!\n\nاگر شما می خواهید وجوه را از نسخه ی قدیمی به نسخه ی جدید برنامه ی Bisq منتقل کنید، آن را با یک تراکنش بیتکوین بفرستید.\n\nهمچنین آگاه باشید که بازگردانی کیف پول تنها برای موارد اضطراری است و شاید منجر به مشکلاتی با پایگاه داده داخلی کیف پول شود.\nاین یک راه برای استفاده از پشتیبان نیست! لطفاً برای بازگرداندن حالت قبلی برنامه از یک پشتیبان از راهنما داده برنامه استفاده کنید.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=خوب، من می فهمم و می خواهم بازگردانی کنم
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=نوع پیشنهاد
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=My vote
+dao.proposal.table.header.remove=حذف 
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=ارسال وجوه BSQ
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=تأیید درخواست برداشت
 dao.wallet.send.sendFunds.details=در حال ارسال: {0} به آدرس گیرنده ی: {1} . \nهزینه لازم برای معامله عبارت است از: {2} ({3} ساتوشی/ بایت)\nاندازه تراکنش: {4} کیلوبایت\n\n دریافت کننده {5} دریافت خواهد کرد\n\n آیا شما مطمئن هستید که می خواهید این مبلغ را برداشت کنید؟
-dao.wallet.chainHeightSynced=همگام شده تا بلاک: {0} (آخرین بلوک: {1})
-dao.wallet.chainHeightSyncing=بلاک همگام شده: {0} (آخرین بلوک: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=نوع
 
 # suppress inspection "UnusedProperty"
@@ -1690,7 +1695,7 @@ tacWindow.arbitrationSystem=سیستم داوری
 tradeDetailsWindow.headline=معامله
 tradeDetailsWindow.disputedPayoutTxId=شناسه تراکنش پرداختی مورد مناقشه:
 tradeDetailsWindow.tradeDate=تاریخ معامله
-tradeDetailsWindow.txFee=Mining fee
+tradeDetailsWindow.txFee=هرینه استخراج
 tradeDetailsWindow.tradingPeersOnion=آدرس Onion همتایان معامله:
 tradeDetailsWindow.tradeState=Trade state
 
@@ -1741,7 +1746,7 @@ popup.headline.error=خطا
 popup.doNotShowAgain=دوباره نشان نده
 popup.reportError.log=باز کردن فایل گزارش
 popup.reportError.gitHub=گزارش به پیگیر مسائل GitHub 
-popup.reportError={0}\n\nبرای کمک به ما در بهبود برنامه، لطفا اشکال را به پیگیر مسئله ی ما در GitHub گزارش کنید (https://github.com/bisq-network/bisq-desktop/issues).\nوقتی روی دکمه های زیر کلیک کنید، پیغام خطا در حافظه ی موقتی رونوشت خواهد شد.\nاگر شما بتوانید فایل bisq.log را هم ضمیمه کنید، رفع اشکال آسان تر خواهد شد.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=لطفاً سعی کنید برنامه را مجدداً راه اندازی کنید و اتصال شبکه خود را بررسی کنید تا ببینید آیا می توانید مشکل را حل کنید یا خیر.
 popup.error.takeOfferRequestFailed=وقتی کسی تلاش کرد تا یکی از پیشنهادات شما را بپذیرد خطایی رخ داد:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=یکی از گره های {0} مسدود شده است.
 popup.warning.priceRelay=رله قیمت
 popup.warning.seed=دانه
 
-popup.info.securityDepositInfo=برای اطمینان از این که هر دو معامله گر از پروتکل معامله پیروی می کنند، آنها باید مبلغ سپرده اطمینان را پرداخت کنند. \n\nسپرده در کیف پول معاملاتی محلی شما باقی خواهد ماند تا زمانی که پیشنهاد توسط معامله گر دیگر پذیرفته شد.\nپس از این که معامله با موفقیت انجام شد، بازپرداخت به شما انجام خواهد شد.\n\nلطفا توجه داشته باشید که اگر شما یک پیشنهاد باز کنید، باید برنامه خود را در حال اجرا نگاه دارید. هنگامی که یک معامله گر دیگر بخواهد پیشنهاد شما را بپذیرد، باید برنامه ی شما برای اجرا پروتکل معامله، آنلاین باشد.\n مطمئن شوید که حالت آماده به کار غیرفعال شده است، زیرا شبکه را قطع خواهد کرد (حالت آماده به کار مانیتور مشکلی ندارد).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=لطفا مطمئن شوید که شما یک شعبه بانک در منطقه خود دارید تا بتوانید سپرده نقدی را بپردازید. شناسه بانکی (BIC/SWIFT) بانک فروشنده: {0}.
 popup.info.cashDepositInfo.confirm=تأیید می کنم که می توانم سپرده را ایجاد کنم

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Igen, elkezdtem a kifizetést
 portfolio.pending.step2_seller.waitPayment.headline=Várás fizetésre
 portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
 portfolio.pending.step2_seller.waitPayment.msg=A betét tranzakció legalább egy blokklánc konfirmaciót kapott.\nMeg kell várnia, amíg a BTC vevő el nem indítja a {0} fizetést.
-portfolio.pending.step2_seller.warn=A BTC vevő a {0} még mindig nem fizette ki.\nMeg kell várnia, amíg ez el nem végzi a kifizetést.\nHa a tranzakció még nem fejeződött be {1}-éig, a bíróhoz kerül megvizsgálásra.
+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=A BTC vevő még nem kezdte meg fizetését!\nA tranzakció maximális megengedett időtartama lejárt.\nVárakozhat hosszabb ideig, ezennel több időt adhatna váltótársának vagy kapcsolatba léphet a bíróval egy vita megnyitásához.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Nincs hozzáférhető tranzakció
 funds.tx.revert=Visszaszállás
 funds.tx.txSent=Tranzakció sikeresen elküldve egy új címre a helyi Bisq pénztárcában.
 funds.tx.direction.self=Küld saját magadnak.
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=Kártérítési kérelem
 
@@ -762,9 +765,9 @@ support.buyerOfferer=BTC vevő/Ajánló
 support.sellerOfferer=BTC eladó/Ajánló
 support.buyerTaker=BTC vásárló/Vevő
 support.sellerTaker=BTC eladó/Vevő
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=Kérjük, vegye figyelembe a vitarendezés alapvető szabályait:\n1. A bírók kérelmeit válaszolnia kell 2 napon belül.\n2. A vita maximális időtartama 14 nap.\n3. Felelnie kell amire a bíró kérni fog Öntől hogy bizonyítékot szolgáltasson ügyének.\n4. Elfogadta a wiki felhasználói körében vázolt szabályokat, amikor elindította az alkalmazást.\n\nKérjük olvassa el részletesebben a vitarendezési folyamatot a wiki weboldalunkon:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Rendszerüzenet: {0}
 support.youOpenedTicket=Nyitottál egy támogatási kérelmet.
 support.youOpenedDispute=Megindítottál egy vitarendezési kérelmet.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Használj egyéni Bitcoin Core csomópontokat
 settings.net.warn.usePublicNodes=Ha a nyilvános Bitcoin hálózatot használja, súlyos adatvédelmi problémára van kitéve, amelyet a hibás szűrőtervezés és -végrehajtás okoz, amelyet az SPV pénztárcákhoz használnak, mint a BitcoinJ (a Bisq-ban használt). Bármely teljes csomópont amelyhez csatlakozik megtudhatja, hogy az összes pénztárca címei egy egységhez tartoznak.\n\nKérjük olvassa el a részleteket a következő címen: https://bisq.network/blog/privacy-in-bitsquare.\n\nBiztosan szeretné használni a nyilvános csomópontokat?
 settings.net.warn.usePublicNodes.useProvided=Nem, használd a megadott csomópontokat
 settings.net.warn.usePublicNodes.usePublic=Igen, használd a nyilvános hálózatot
-settings.net.warn.useCustomNodes.B2XWarning=Győződjön meg róla, hogy a Bitcoin csomópontja egy megbízható Bitcoin Core csomópont!\n\nA Bitcoin alapvető konszenzus szabályait nem követő csomópontok összekapcsolása felboríthatja a mobiltárcáját, és problémákat okozhat a tranzakció folyamatán.\n\nAzok a felhasználók, akik a konszenzus szabályokat sértő csomópontokhoz csatlakoznak, felelősek az esetleges károkért. Az ezzel járó vitákat a másik fél javára döntődnek. Nem lesz ajánlva technikai támogatást olyan felhasználóknak, akik figyelmen kívül hagyják figyelmeztető és védelmi mechanizmusaikat!
-settings.net.localhostBtcNodeInfo=(Háttér-információ: Ha helyi bitcoin csomópontot (localhost) futtat, akkor kizárólag ehhez kapcsolódik.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=Onion cím
 settings.net.creationDateColumn=Alapítva
@@ -857,17 +860,17 @@ settings.net.inbound=bejövő
 settings.net.outbound=kimenő
 settings.net.reSyncSPVChainLabel=SPV lánc újraszinkronizálása
 settings.net.reSyncSPVChainButton=Töröld az SPV fájlt és újraszinkronizálj
-settings.net.reSyncSPVSuccess=Az SPV láncfájl a következő indításkor törölve lesz. Most újra kell indítania az alkalmazását.\n\nÚjraindítás után a hálózathoz való újszinkronizálás eltarthat egy ideig, és csupán e befejezése után láthatja az összes tranzakciót.\n\nÚjszinkronizálás után kérjük végezzen ismét egy újraindítást, mert néha bizonyos ellentmondások helytelen mérlegkijelzéshez vezethetnek.
-settings.net.reSyncSPVAfterRestart=Az SPV láncfájl törölve lett. Kérjük legyen türelemmel, időbe telhet a hálózattal való újraszinkronizálás.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=Az újraszinkronizálás befejeződött. Kérjük, indítsa újra az alkalmazást.
 settings.net.reSyncSPVFailed=Nem sikerült törölni az SPV-lánc fájlt.\nHiba: {0}
 setting.about.aboutBisq=Bisq-ről
-setting.about.about=A Bisq egy nyílt forráskódú projekt és egy decentralizált hálózat, olyan felhasználóknak akik Bitcoint nemzeti valutákkal vagy alternatív kriptográfiai valutákkal szeretnének váltani adatvédelmezett módon. További információ a Bisq-ról a projekt weboldalán.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Bisq honlap
 setting.about.code=Forráskód
 setting.about.agpl=AGPL licenc
 setting.about.support=Támogasd Bisq-et
-setting.about.def=Bisq nem egy vállalat, hanem közösségi projekt és nyitott részvételre. Ha részt szeretne venni vagy támogatni a Bisq-et, kérjük kövesse az alábbi linkeket.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Hozzájárulás
 setting.about.donate=Adományoz
 setting.about.providers=Adatszolgáltatók
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Hálózati verzió: {0}; P2P üzenet verziója: {1}
 account.tab.arbitratorRegistration=Bírói bejegyzés
 account.tab.account=Fiók
 account.info.headline=Üdvözöljük a Bisq-fiókodban
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Nemzeti valuta fiókok
 account.menu.altCoinsAccountView=Altérmék fiókok
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=Bíró regisztrálás
 account.arbitratorRegistration.revoke=Regisztráció visszavonása
-account.arbitratorRegistration.info.msg=Kérjük vegye figyelembe, hogy a visszavonás után 15 napig elérhetőnek kell maradnia, mivel lehetnek olyan tranzakciók, amelyek önt bíróként használják. A maximálisan megengedett tranzakciói időszak 8 nap, és a vitarendezés akár 7 napig is eltarthat.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=Legalább 1 nyelvet kell beállítanod.\nHozzáadtuk az alapértelmezett nyelvet számodra.
 account.arbitratorRegistration.removedSuccess=Sikeresen eltávolította bíróját a P2P hálózatból.
 account.arbitratorRegistration.removedFailed=A bíró nem távolítható el.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Csak olyan bírákat választhat ki, akik leg
 account.arbitratorSelection.minOne=Legalább egy bírót kell választania.
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=Ügyeljen arra, hogy követi a {0} pénztárcák használatának követelményeit a {1} weboldalon leírtak szerint.\nKözpontosított váltók pénztárcáinak használatávál, ahol nincsen hozzáférése kulcsaihoz vagy egy inkompatibilis pénztárca szoftvert használnak, tranzakciózói értékeinek elvesztéséhez vezethet!\nA bíró nem {2} szakember, és ilyenféle esetekben nem tud segíteni.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Megértem és  alátámasztom, hogy tudom, melyik pénztárcát kell használnom.
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Jelszó törlése
 account.password.removePw.headline=Pénztárca jelszavas védelmének távolítása
 account.password.setPw.button=Jelszó beiktatása
 account.password.setPw.headline=Pénztárca jelszóvédelmének beiktatása
-account.password.info=Jelszavas védelemmel meg kell adnia a jelszavát, amikor kivonja a bitcoint a pénztárcából, vagy meg szeretné nézni illetve visszaállítani egy mobiltárcát a magszavakból, valamint az alkalmazás indításakor.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Pénztárca magszavak biztonsági mentése
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=Nem állított be olyan pénztárca jelszót, amely megvédené a magszavak megjelenítését.\n\nMeg szeretné jeleníteni a magszavakat?
 account.seed.warn.noPw.yes=Igen, és ne kérdezz többé
 account.seed.enterPw=Írd be a jelszót a magszavak megtekintéséhez
-account.seed.restore.info=Kérjük vegye figyelembe, hogy nem importálhat egy régi Bisq verziót (bármilyen változat 0.5.0 előtt), mivel hogy a pénztárca formátuma megváltozott!\n\nHa a régi verziótól az új Bisq alkalmazásba szeretné áthelyezni összegeit, küldje el ezeket egy Bitcoin tranzakción át.\n\nUgyanakkor vegye figyelembe, hogy a pénztárca visszaállítása csak vészhelyzet esetén történhet, és problémákat okozhat a belső pénztárca-adatbázisban.\nEz nem egy általunk ajánlott módszer a biztonsági másolat alkalmazására! Kérjük használjon egy biztonsági másolatot az alkalmazásadat könyvtárból a korábbi alkalmazásállapot helyreállításához.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Oké, értem és vissza szeretném állítani
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=Proposal type
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=My vote
+dao.proposal.table.header.remove=Eltávolít
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=BSQ pénzeszközök átutalása
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=Visszavonási kérelem jóváhagyása
 dao.wallet.send.sendFunds.details=Küldve: {0}\nFogadó címe: {1}.\nSzükséges tranzakciós díj: {2} ({3} Satoshi/bájt)\nTranzakcióméret: {4} Kb\n\nCímzett kapni fog: {5}\n\nBiztosan szeretné visszavonni az összeget?
-dao.wallet.chainHeightSynced={0} blokkig szinkronizálva (legújabb blokk: {1})
-dao.wallet.chainHeightSyncing={0} blokk szinkronizálása (legújabb blokk: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Típus
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Sikertelen ellenőrzés.\nKérjük tö
 displayUpdateDownloadWindow.success=Az új verziót sikeresen letöltötték és az aláírást ellenőrizték.\n\nKérjük nyissa meg a letöltési könyvtárat, állítsa le az alkalmazást és telepítse az új verziót.
 displayUpdateDownloadWindow.download.openDir=Letöltési könyvtár megnyitása
 
-disputeSummaryWindow.title=Összefogló
+disputeÖsszefoglóWindow.title=Összefogló
 disputeSummaryWindow.openDate=Ticket opening date
 disputeSummaryWindow.role=Trader's role
 disputeSummaryWindow.evidence=Evidence
@@ -1741,7 +1746,7 @@ popup.headline.error=Hiba
 popup.doNotShowAgain=Ne mutasd ezt újra
 popup.reportError.log=Naplófájl nyitása
 popup.reportError.gitHub=Jelentés a Github kibocsátás-követőhöz
-popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click the below buttons.\nIt will make debugging easier if you can attach the bisq.log file as well.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Próbálja meg újraindítani az alkalmazást, és ellenőrizze a hálózati kapcsolatot, hogy meg tudja-e oldani a problémát.
 popup.error.takeOfferRequestFailed=Hiba történt amikor valaki megpróbálta felvenni ajánlatát:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=A {0} csomópontok egyike tiltva lett. Kérjük indíts
 popup.warning.priceRelay=árjelentés
 popup.warning.seed=mag
 
-popup.info.securityDepositInfo=Annak biztosítása érdekében, hogy mindkét kereskedő kövesse a kereskedelmi protokollt, szükségük van egy kaucióra.\n\nA kaució a helyi tranzakciós pénztárcájában marad, amíg az ajánlatot egy másik kereskedő elfogadja.\nA tranzakció sikeres befejezése után ez visszatérítésre kerül.\n\nKérjük vegye figyelembe, hogy alkalmazását nyitva kell tartania ha nyitott ajánlatai vannak. Annak hogy egy másik kereskedő ajánlatát igénybe tudja venni, alkalmazásának szükséges online lenni, hogy a tranzakciói protokollt végrehajthassa.\nGyőződjön meg róla, hogy a készenléti állapot ki van kapcsolva, mert ez lezárja a hálózatot (a monitor készenléti állapota nem jelent problémát).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\nThe bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
 popup.info.cashDepositInfo.confirm=I confirm that I can make the deposit

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Da, am inițiat plata
 portfolio.pending.step2_seller.waitPayment.headline=Așteaptă plata
 portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
 portfolio.pending.step2_seller.waitPayment.msg=Tranzacția de depozitare are cel puțin o confirmare pe blockchain.\nTrebuie să aștepți până când cumpărătorul de BTC inițiază plata {0}.
-portfolio.pending.step2_seller.warn=Cumpărătorul de BTC încă nu a efectuat plata {0}.\nTrebuie să aștepți până când acesta inițiază plata.\nDacă tranzacția nu a fost finalizată la {1}, arbitrul o va investiga.
+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=Vânzătorul de BTC înca nu a inițiat plata!\nPerioada maximă de timp pentru tranzacționare a expirat.\nPoți aștepta mai mult astfel acordând mai mult timp partenerului de tranzacționare sau poți contacta arbitrul în vederea deschiderii unei dispute.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Nicio tranzacție disponibilă
 funds.tx.revert=Revenire
 funds.tx.txSent=Tranzacția a fost virată cu succes la o nouă adresă în portofelul Bisq local.
 funds.tx.direction.self=Trimite-ți ție
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=Solicitare de despăgubire
 
@@ -762,9 +765,9 @@ support.buyerOfferer=Ofertant/Cumpărător BTC
 support.sellerOfferer=Ofertant/Vânzător BTC
 support.buyerTaker=Acceptant/Cumpărător BTC
 support.sellerTaker=Acceptant/Vânzător BTC
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=Reține regulile de bază ale procesului de dispută:\n1. Trebuie să răspunzi solicitărilor arbitrilor în termen de 2 zile.\n2. Termenul maxim pentru o dispută este de 14 zile.\n3. Trebuie să îndeplinești ceea ce arbitrul îți va solicita și să furnizezi dovezi susținătoare cazul tău.\n4. Ai acceptat regulile descrise în wiki în cadrul acordului de utilizare atunci când ați pornit prima dată aplicația.\n\nTe rugăm să citești în detaliu despre procesul disputelor pe wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Mesaj de sistem: {0}
 support.youOpenedTicket=Ați deschis o solicitare de asistență.
 support.youOpenedDispute=Ai deschis o cerere pentru dispută.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Folosește noduri Bitcoin Core preferențiale
 settings.net.warn.usePublicNodes=Dacă folosești rețeaua publică de Bitcoin vei fi expus la probleme grave de confidențialitate provocate de designul și implementarea filtrului eronat bloom care este folosit pentru portofele SPV precum BitcoinJ (folosit în Bisq). Orice nod complet la care ești conectat îți poate afla toate adresele de portofel ca aparținând unei singure entități.\n\nTe invităm să citești mai multe în detaliu la: https://bisq.network/blog/privacy-in-bitsquare.\n\nSigur dorești să folosești nodurile publice?
 settings.net.warn.usePublicNodes.useProvided=Nu, folosește noduri implicite
 settings.net.warn.usePublicNodes.usePublic=Da, folosește rețeaua publică
-settings.net.warn.useCustomNodes.B2XWarning=Asigură-te că nodul tău de Bitcoin este un nod Bitcoin Core de încredere!\n\nConectarea la noduri ce nu respectă regulile de consimțământ Bitcoin Core ar putea să îți avarieze portofelul și să provoace probleme în procesul de tranzacționare.\n\nUtilizatorii care se conectează la noduri ce încalcă regulile consensuale sunt responsabili pentru eventualele daune create de acestea. Disputele cauzate de acest act s-ar decide în favoarea celuilalt partener. Nu se va acorda niciun suport tehnic utilizatorilor care ignoră mecanismele noastre de avertizare și protecție!
-settings.net.localhostBtcNodeInfo=(Informație de bază: dacă rulezi un nod local de bitcoin (localhost), vei fi conectat exclusiv la acesta.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=Adresa de Onion
 settings.net.creationDateColumn=Stabilită
@@ -857,17 +860,17 @@ settings.net.inbound=Intrare
 settings.net.outbound=ieșire
 settings.net.reSyncSPVChainLabel=Resincronizează lanțul SPV
 settings.net.reSyncSPVChainButton=Șterge fișierul SPV și resincronizează
-settings.net.reSyncSPVSuccess=Fișierul lanțului SPV va fi șters la următoarea pornire. Acum trebuie să repornești aplicația.\n\nDupă repornire, poate dura puțin timp până se resincronizează cu rețeaua și vei vedea toate tranzacțiile numai după finalizarea resincronizării.\n\nTe rugăm să repornești din nou după finalizarea resincronizării deoarece uneori pot apărea neconcordanțe ce duc la afișarea incorectă a soldului.
-settings.net.reSyncSPVAfterRestart=Fișierul lanțului SPV a fost șters. Te rugăm să ai răbdare, resincronizarea cu rețeaua poate dura ceva timp.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=Resincronizarea s-a încheiat. Te rog repornește aplicația.
 settings.net.reSyncSPVFailed=Nu s-a putut șterge fișierul lanțului SPV.\nEroare: {0}
 setting.about.aboutBisq=Despre Bisq
-setting.about.about=Bisq este un proiect open source și o rețea descentralizată de utilizatori care doresc să schimbe Bitcoin cu monedele naționale sau cu cripto-valutele alternative într-un mod care protejează intimitatea interlocutorilor. Află mai multe despre Bisq pe pagina noastră web a proiectului.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Pagina web Bisq
 setting.about.code=Cod sursă
 setting.about.agpl=Licență AGPL
 setting.about.support=Susține Bisq
-setting.about.def=Bisq nu este o companie, ci un proiect comunitar și deschis pentru participare. Dacă dorești să participi sau să sprijiniți Bisq, te rugăm să urmezi link-urile de mai jos.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Contribuie
 setting.about.donate=Donează
 setting.about.providers=Furnizori de date
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Versiune rețea: {0}; Versiune mesaj P2P: {1}; Vers
 account.tab.arbitratorRegistration=Înregistrare arbitru
 account.tab.account=Cont
 account.info.headline=Bine ai venit în contul tău Bisq
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Conturile valutelor naționale
 account.menu.altCoinsAccountView=Conturi altcoin
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=Înregistrează arbitru
 account.arbitratorRegistration.revoke=Revocă înregistrarea
-account.arbitratorRegistration.info.msg=Reține că trebuie să rămâi disponibil timp de 15 zile după revocare, deoarece ar putea exista tranzacții care să te folosească ca arbitru. Perioada de tranzacționare maximă permisă este de 8 zile, iar procesul de dispută poate dura până la 7 zile.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=Trebuie să setezi cel puțin 1 limbă.\nAm adăugat limba prestabilită pentru tine.
 account.arbitratorRegistration.removedSuccess=Ți-ai înlăturat cu succes arbitrul din rețeaua P2P.
 account.arbitratorRegistration.removedFailed=Arbitrul nu a putut fi eliminat.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Poți selecta doar arbitri care vorbesc cel p
 account.arbitratorSelection.minOne=Trebuie să ai ales cel puțin un arbitru.
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=Asigură-te că respecți cerințele pentru utilizarea {0} portofelelor așa cum este descris pe pagina web {1}.\nFolosind portofelelor de pe schimburile centralizate unde nu ai sub controlul tău cheile private sau utilizând un soft de portofel incompatibil poate duce la pierderea fondurilor tranzacționate!\nArbitrul nu este un {2} specialist și nu poate ajuta în astfel de cazuri.
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Înțeleg și confirm că știu ce portofel trebuie să folosesc.
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Înlătură parola
 account.password.removePw.headline=Înlătură protecția prin parolă a portofelului
 account.password.setPw.button=Setează parola
 account.password.setPw.headline=Setează protecția prin parolă a portofelului
-account.password.info=Cu protecția prin parolă, trebuie să-ți introduci parola când retragi bitcoin din portofel sau dacă dorești să vizualizezi, restaurezi un portofel din cuvintele-nucleu, precum și la pornirea aplicației.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Salvează cuvintele-nucleu ale portofelului tău
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=Nu ai creat o parolă pentru portofel care să protejeze afișarea cuvintelor-nucleu.\n\nDorești afișarea cuvintelor-nucleu?
 account.seed.warn.noPw.yes=Da, și nu mă mai întreba vreodată
 account.seed.enterPw=Introdu parola pentru a vizualiza cuvintele-nucleu
-account.seed.restore.info=Reține că nu poți importa un portofel dintr-o versiune veche Bisq (orice versiune mai veche de 0.5.0), deoarece formatul portofelului sa schimbat!\n\nDacă dorești să muți fondurile din versiunea veche în noua aplicație Bisq, trimite-o cu o tranzacție Bitcoin.\n\nDe asemenea, reține că restaurarea portofelului este recomandată numai pentru cazurile de urgență și poate cauza probleme cu baza de date internă a portofelului.\nAceasta nu este o modalitate de a încărca o copie de rezervă! Folosește o copie de rezervă din directorul de date al aplicației pentru a restaura o stare anterioară a aplicației.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Da, înțeleg și doresc să restaurez
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=Proposal type
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=My vote
+dao.proposal.table.header.remove=Înlătură
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=Trimite fondurile BSQ
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=Confirmă solicitarea retragerii
 dao.wallet.send.sendFunds.details=Trimitem: {0}\nCătre adresa de primire: {1}.\nComisionul de tranzacție necesar: {2} ({3} Satoshi/octet)\nMărimea tranzacției: {4} Kb\n\nDestinatarul va primi: {5}\n\nEști sigur că dorești să retragi suma specificată?
-dao.wallet.chainHeightSynced=Sincronizat până la blocul:{0} (ultimul bloc: {1})
-dao.wallet.chainHeightSyncing=Sincronizare bloc: {0} (ultimul bloc: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Tip
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Verficare eșuată.\nTe rugăm descarc
 displayUpdateDownloadWindow.success=Noua versiune a fost descărcată cu succes iar semnătura a fost verificată.\n\nDeschide directorul de descărcare, închide aplicația și instalează noua versiune.
 displayUpdateDownloadWindow.download.openDir=Deschide directorul descărcărilor
 
-disputeSummaryWindow.title=Rezumat
+disputeRezumatWindow.title=Rezumat
 disputeSummaryWindow.openDate=Ticket opening date
 disputeSummaryWindow.role=Trader's role
 disputeSummaryWindow.evidence=Evidence
@@ -1741,7 +1746,7 @@ popup.headline.error=Eroare
 popup.doNotShowAgain=Nu arăta din nou
 popup.reportError.log=Deschide fișierul jurnal
 popup.reportError.gitHub=Reclamare către Github
-popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click the below buttons.\nIt will make debugging easier if you can attach the bisq.log file as well.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Încearcă să repornești aplicația și să verifici conexiunea la rețea pentru a vedea dacă poți remedia astfel problema.
 popup.error.takeOfferRequestFailed=A intervenit o eroare când cineva a încercat să îți preia una din oferte:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=Unul dintre nodurile {0} a fost interzise. Te rugăm s
 popup.warning.priceRelay=preț releu
 popup.warning.seed=nucleu
 
-popup.info.securityDepositInfo=Pentru a asigura că ambii comercianți respectă protocolul de tranzacționare, ambii trebuie să plătească un depozit de securitate.\n\nDepozitul va rămâne în portofelul tău local de tranzacționare până când oferta ajunge acceptată de un alt comerciant.\nAceasta va fi returnată după ce tranzacția a fost finalizată cu succes.\n\nReține că trebuie să păstrezi aplicația deschisă dacă ai o ofertă deschisă. Atunci când un alt comerciant dorește să îți accepte oferta, este necesar ca aplicația ta să fie online pentru executarea protocolului de tranzacționare.\nAsigură-te că ai modul în așteptare dezactivat, deoarece acesta ar deconecta rețeaua (starea în așteptare a monitorului nu reprezintă o problemă).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\nThe bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
 popup.info.cashDepositInfo.confirm=I confirm that I can make the deposit

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

@@ -158,9 +158,9 @@ shared.tradeAmount=Сумма сделки
 shared.tradeVolume=Объём сделки
 shared.invalidKey=Введён неправильный ключ.
 shared.enterPrivKey=Введите личный ключ для разблокировки
-shared.makerFeeTxId=Идент. транзакции взноса создателя
-shared.takerFeeTxId=Идент. транзакции взноса получателя
-shared.payoutTxId=Идент. транзакции выплаты
+shared.makerFeeTxId=Идентификатор транзакции взноса создателя
+shared.takerFeeTxId=Идентификатор транзакции взноса получателя
+shared.payoutTxId=Идентификатор транзакции выплаты
 shared.contractAsJson=Контракт в формате JSON
 shared.viewContractAsJson=Просмотреть контракт в формате JSON
 shared.contract.title=Контракт сделки с идентификатором: {0}
@@ -178,21 +178,24 @@ shared.btcAmount=Количество ВТС
 shared.yourLanguage=Ваши языки
 shared.addLanguage=Добавить язык
 shared.total=Всего
-shared.totalsNeeded=Нужно средств
+shared.totalsNeeded=Нужны средства
 shared.tradeWalletAddress=Адрес кошелька сделки
 shared.tradeWalletBalance=Баланс кошелька сделки
 shared.makerTxFee=Создатель: {0}
-shared.takerTxFee=Принимающий: {0}
+shared.takerTxFee=Получатель: {0}
 shared.securityDepositBox.description=Залоговый депозит для BTC {0}
 shared.iConfirm=Подтверждаю
 shared.tradingFeeInBsqInfo=эквивалент {0}, в качестве комиссии майнера
-shared.openURL=Перейти на {0}
+shared.openURL=Открыть {0}
 shared.fiat=Нац. валюта
 shared.crypto=Криптовалюта
 shared.all=Все
 shared.edit=Отредактировать
 shared.advancedOptions=Дополнительные настройки
 shared.interval=Интервал
+shared.actions=Действия
+shared.buyerUpperCase=Покупатель
+shared.sellerUpperCase=Продавец
 
 ####################################################################
 # UI views
@@ -212,7 +215,7 @@ mainView.menu.settings=Настройки
 mainView.menu.account=Счёт
 mainView.menu.dao=DAO
 
-mainView.marketPrice.provider=Курс предостален
+mainView.marketPrice.provider=Курс предоставлен
 mainView.marketPrice.label=Рыночный курс
 mainView.marketPriceWithProvider.label=Рыночный курс предоставлен {0}
 mainView.marketPrice.bisqInternalPrice=Курс последней сделки Bisq
@@ -222,7 +225,7 @@ mainView.marketPrice.tooltip.altcoinExtra=Если алткойн недосту
 mainView.balance.available=Доступный баланс
 mainView.balance.reserved=Выделено на предложения
 mainView.balance.locked=Заперто в сделках
-mainView.balance.reserved.short=Выделено
+mainView.balance.reserved.short=Зарезервировано
 mainView.balance.locked.short=Заперто
 
 mainView.footer.usingTor=(используется Tor)
@@ -300,10 +303,10 @@ offerbook.trader=Трейдер
 offerbook.offerersBankId=Идентификатор(BIC/SWIFT) банка создателя предложения: {0}
 offerbook.offerersBankName=Название банка создателя предложения: {0}
 offerbook.offerersBankSeat=Местоположение банка создателя предложения: {0}
-offerbook.offerersAcceptedBankSeatsEuro=Приемлемые банки стран (получатель): Все страны Еврозоны
-offerbook.offerersAcceptedBankSeats=Приемлемые банки стран (получатель):\n {0}
+offerbook.offerersAcceptedBankSeatsEuro=Признанные страны банков (получателя): Все страны Еврозоны
+offerbook.offerersAcceptedBankSeats=Признанные страны банков (получателя):\n {0}
 offerbook.availableOffers=Доступные предложения
-offerbook.filterByCurrency=Фильтр по валюте
+offerbook.filterByCurrency=Фильтровать по валюте
 offerbook.filterByPaymentMethod=Фильтр по способу оплаты
 
 offerbook.nrOffers=Кол-во предложений: {0}
@@ -382,7 +385,7 @@ createOffer.alreadyFunded=Вы уже обеспечили это предлож
 createOffer.createOfferFundWalletInfo.headline=Обеспечить своё предложение
 # suppress inspection "TrailingSpacesInProperty"
 createOffer.createOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n
-createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства выделяются в Вашем локальном кошельке, и будут заперты в депозитном адресе multisig, когда кто-то примет Ваше предложение.\n\nСумма состоит из:\n{1}\n- Вашего залогового депозита: {2}\n- Торгового сбора: {3}\n- Общей комиссии майнера: {4}\n\n\nВы можете выбрать один из двух вариантов обеспечения сделки:\n - Использовать свой Bisq кошелёк (удобо, но связь между сделками может быть вычислена посторонними) ИЛИ\n - Перевод с внешнего кошелька (потенциально более анонимно)\n\nВы увидите все варианты обеспечения и подробности после закрытия этого окна.
+createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства выделяются в Вашем локальном кошельке, и будут заперты в депозитном адресе multisig, когда кто-то примет Ваше предложение.\n\nСумма состоит из:\n{1}- Вашего залогового депозита: {2}\n- Торгового сбора: {3}\n- Общей комиссии майнера: {4}\n\n\nВы можете выбрать один из двух вариантов обеспечения сделки:\n - Использовать свой Bisq кошелёк (удобо, но связь между сделками может быть вычислена посторонними) ИЛИ\n - Перевод с внешнего кошелька (потенциально более анонимно)\n\nВы увидите все варианты обеспечения и подробности после закрытия этого окна.
 
 # only first part "An error occurred when placing the offer:" has been used before. We added now the rest (need update in existing translations!)
 createOffer.amountPriceBox.error.message=Сбой создания предложения:\n\n{0}\n\nВаши средства остались в кошельке.\nПросьба перезагрузить приложение и проверить связь с интернет.
@@ -511,9 +514,9 @@ portfolio.pending.step2_buyer.postal=Просьба послать {0} \"Пла
 portfolio.pending.step2_buyer.bank=Просьба заплатить {0} продавцу BTC, через интернет сервис вашего банка.\n\n
 portfolio.pending.step2_buyer.f2f=Просьба связаться с продавцом BTC по указанному контакту и договориться о встрече, чтобы заплатить {0}.\n\n
 portfolio.pending.step2_buyer.startPaymentUsing=Начать оплату, используя {0}
-portfolio.pending.step2_buyer.amountToTransfer=Сумма перевода
+portfolio.pending.step2_buyer.amountToTransfer=Сумма для перевода
 portfolio.pending.step2_buyer.sellersAddress={0} адрес продавца
-portfolio.pending.step2_buyer.buyerAccount=Использовать Ваш платёжный счет 
+portfolio.pending.step2_buyer.buyerAccount=Ваш платёжный счет для использования
 portfolio.pending.step2_buyer.paymentStarted=Платёж начат
 portfolio.pending.step2_buyer.warn=Вы ещё не оплатили {0}!\nУчтите, что сделка должна быть завершена до {1}, иначе   арбитр начнёт расследование.
 portfolio.pending.step2_buyer.openForDispute=Вы не завершили оплату!\nМаксимальный срок отведенный для сделки истек.\n\nПросьба обратиться к арбитру, и начать спор.
@@ -525,7 +528,7 @@ portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Отправить M
 portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=Вам необходимо отправить по э-почте продавцу BTC MTCN (номер отслеживания) и фотографию квитанции.\nВ квитанции должно быть четко указано полное имя продавца, город, страна и сумма. Адрес э-почты продавца: {0}. \n\nВы отправили MTCN и контракт продавцу?
 portfolio.pending.step2_buyer.halCashInfo.headline=Послать код HalCash
 portfolio.pending.step2_buyer.halCashInfo.msg=Отклонение в процентах от рыночной цены (например, 2.50%, -0.50% и т. д.)
-portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Некоторые банки требуют имя получателя. Код сортировки Великобритании и номер счета достаточно для перевода Faster Payment, и имя получателя не проверяется ни одним из банков.
+portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo=Некоторые банки требуют имя получателя. Код сортировки Великобритании и номер счета достаточны для перевода Faster Payment, и имя получателя не проверяется ни одним из банков.
 portfolio.pending.step2_buyer.confirmStart.headline=Подтвердите начало платежа
 portfolio.pending.step2_buyer.confirmStart.msg=Вы начали {0} оплату Вашему контрагенту?
 portfolio.pending.step2_buyer.confirmStart.yes=Да, я начал оплату
@@ -566,14 +569,14 @@ portfolio.pending.step3_seller.bank=Ваш контрагент подтверд
 portfolio.pending.step3_seller.cash=Так как оплата осуществляется наличными на счёт, покупатель BTC должен написать \"НЕ ПОДЛЕЖИТ ВОЗВРАТУ\" на квитанции, разорвать на 2 части, и послать Вам фото квитанции по э-почте.\n\nЧтоб исключить возвратный платёж, подтверждайте его только  получив это фото, и если Вы уверенны, что квитанция действительна.\nЕсли Вы не уверенны, {0}
 portfolio.pending.step3_seller.moneyGram=Покупатель обязан отправить Вам по электронной почте номер авторизации и фотографию квитанции.\nВ квитанции должно быть четко указано Ваше полное имя, страна, штат и сумма. Пожалуйста, проверьте свою электронную почту, и получение номера авторизации. \n\nПосле закрытия этого всплывающего окна Вы увидите имя и адрес покупателя BTC для получения денег от MoneyGram.\n\nПодтверждайте получение только после того как Вы успешно забрали деньги!
 portfolio.pending.step3_seller.westernUnion=Покупатель обязан отправить Вам по электронной почте MTCN (номер отслеживания) и фотографию квитанции.\nВ квитанции должно быть четко указано Ваше полное имя, город, страна и сумма. Пожалуйста, проверьте свою электронную почту, и получение MTCN.\n\nПосле закрытия этого всплывающего окна Вы увидите имя и адрес покупателя BTC для получения денег от Western Union. \n\nПодтверждайте получение только после того как Вы успешно забрали деньги!
-portfolio.pending.step3_seller.halCash=Покупатель должен отправить Вам код HalCash в виде SMS. Кроме того, Вы получите сообщение от HalCash с информацией, необходимой для снятия EUR в банкомате, поддерживающем HalCash.\n\nПосле того, как Вы забрали деньги из банкомата, просьба подтвердить здесь квитанцию об оплате!
+portfolio.pending.step3_seller.halCash=Покупатель должен отправить Вам код HalCash в текстовом сообщении. Кроме этого, Вы получите сообщение от HalCash с информацией, необходимой для снятия EUR в банкомате, поддерживающем HalCash.\n\nПосле того, как Вы забрали деньги из банкомата, просьба подтвердить здесь квитанцию об оплате!
 
 portfolio.pending.step3_seller.bankCheck=\n\nПросьба удостовериться, что имя отправителя в Вашем банковском отчете соответствует имени Вашего контрагента:\nИмя отправителя: {0}\n\nЕсли имя не соответствует показанному здесь, {1}
 portfolio.pending.step3_seller.openDispute=просьба не подтверждать, а открыть спор, нажав \"alt + o\" или \"option + o\".
 portfolio.pending.step3_seller.confirmPaymentReceipt=Подтвердите квитанцию оплаты
 portfolio.pending.step3_seller.amountToReceive=Сумма поступления
 portfolio.pending.step3_seller.yourAddress=Ваш адрес {0}
-portfolio.pending.step3_seller.buyersAddress= {0} адрес покупателя
+portfolio.pending.step3_seller.buyersAddress=Адрес {0} покупателя
 portfolio.pending.step3_seller.yourAccount=Ваш торговый счёт
 portfolio.pending.step3_seller.buyersAccount=Торговый счёт покупателя
 portfolio.pending.step3_seller.confirmReceipt=Подтвердить получение платежа
@@ -600,7 +603,7 @@ portfolio.pending.step5_buyer.makersMiningFee=Комиссия майнера
 portfolio.pending.step5_buyer.takersMiningFee=Итого комиссия майнера
 portfolio.pending.step5_buyer.refunded=Возмещённый залоговый депозит
 portfolio.pending.step5_buyer.withdrawBTC=Вывести Ваш биткойн
-portfolio.pending.step5_buyer.amount=Сумма вывода
+portfolio.pending.step5_buyer.amount=Сумма для вывода
 portfolio.pending.step5_buyer.withdrawToAddress=Вывести на адрес
 portfolio.pending.step5_buyer.moveToBisqWallet=Перевести средства в Bisq кошелёк
 portfolio.pending.step5_buyer.withdrawExternal=Вывести на внешний кошелёк
@@ -702,8 +705,8 @@ funds.locked.locked=Заперто в адрес multisig для сделки с
 
 funds.tx.direction.sentTo=Отправлено:
 funds.tx.direction.receivedWith=Получено:
-funds.tx.direction.genesisTx=От исходной транзакции:
-funds.tx.txFeePaymentForBsqTx=Комиссия майнера за транзакцию BSQ
+funds.tx.direction.genesisTx=От исходной трансакции:
+funds.tx.txFeePaymentForBsqTx=Комиссия майнера за трансакцию BSQ
 funds.tx.createOfferFee=Взнос создателя и за транзакцию: {0}
 funds.tx.takeOfferFee=Взнос получателя и за транзакцию: {0}
 funds.tx.multiSigDeposit=Вклад на адрес multisig: {0}
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Транзакции недоступны
 funds.tx.revert=Возврат
 funds.tx.txSent=Транзакция успешно отправлена на новый адрес локального кошелька Bisq.
 funds.tx.direction.self=Транзакция внутри кошелька
-funds.tx.proposalTxFee=Комиссия майнера за предложение
+funds.tx.daoTxFee=Комиссия майнера за трансакцию DAO
 funds.tx.reimbursementRequestTxFee=Запрос возмещения
 funds.tx.compensationRequestTxFee=Запрос компенсации
 
@@ -762,9 +765,9 @@ support.buyerOfferer=Покупатель ВТС/Создатель
 support.sellerOfferer=Продавец ВТС/Создатель
 support.buyerTaker=Покупатель ВТС/Получатель
 support.sellerTaker=Продавец BTC/Получатель
-support.backgroundInfo=Bisq не компания и не предоставляет какой либо техпомощи клиентам.\n\n\nВ случае спора в процессе сделки (напр. один участник не следует протоколу сделок), приложение покажет кнопку \"Открыть спор\"  после истечения срока сделки, и арбитр станет доступен.\nВ случаях сбоев приложения или других проблем обнаруженных программой, возникнет кнопка \"Открыть билет поддержки\", арбитр станет доступен и передаст сведения о проблеме разработчикам.\n\nВ случаях когда пользователь столкнулся с проблемой, но не появилась кнопка \"Открыть билет поддержки\", можно вызвать поддержку вручную, выбрав сделку, которая вызывает проблему, в разделе \"Папка/Текущие сделки\" и введя комбинацию клавиш \"alt + o\" или \"option + o\". Просьба использовать это только если уверены, что программа не работает как ожидалось. Если у Вас возникли проблемы или вопросы, просьба пересмотреть Часто Задаваемые Вопросы на странице bisq.network, или разместить вопрос на Bisq форуме в разделе поддержки.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=Учтите основные правила процесса рассмотрения спора:\n1. Вы обязаны ответитть на запросы арбитра в течении 2 дней.\n2. Максимальный срок отведенный на спор 14 дней.\n3. Вы обязаны предоставить арбитру запрашиваемые доказательства по Вашему делу.\n4. Вы согласились с правилами указанными в wiki в соглашении пользователя, когда первый раз запускали приложение.\n\nПросьба прочесть детали процесса спора в нашем wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
+support.initialInfo=Учтите основные правила процесса рассмотрения спора:\n1. Вы обязаны ответитть на запросы арбитра в течении 2 дней.\n2. Максимальный срок отведенный на спор 14 дней.\n3. Вы обязаны содействовать арбитру, и предоставлять запрашиваемую информацию по Вашему делу.\n4. Вы согласились с правилами указанными в wiki в соглашении пользователя, когда первый раз запускали приложение.\n\nПросьба прочесть детали процесса спора в нашем wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Системное сообщение: {0}
 support.youOpenedTicket=Вы открыли запрос поддержки.
 support.youOpenedDispute=Вы запросили начать спор.\n\n{0}
@@ -782,7 +785,7 @@ settings.tab.about=О проекте
 setting.preferences.general=Основные настройки
 setting.preferences.explorer=Обозреватель блоков Биткойн
 setting.preferences.deviation=Макс. отклонение от рыночного курса
-setting.preferences.avoidStandbyMode=Избежать режима ожидания
+setting.preferences.avoidStandbyMode=Избегать режима ожидания
 setting.preferences.deviationToLarge=Значения выше 30 % не разрешены.
 setting.preferences.txFee=Комиссия за снятие средств (сатоши/байт)
 setting.preferences.useCustomValue=Задать своё значение
@@ -812,13 +815,13 @@ settings.preferences.selectCurrencyNetwork=Выбрать сеть
 setting.preferences.daoOptions=Настройки DAO
 setting.preferences.dao.resync.label=Перестроить состояние DAO от исходной транзакции
 setting.preferences.dao.resync.button=Повторная синхронизация
-setting.preferences.dao.resync.popup=После перезапуска приложения согласованное состояние BSQ будет восстановлено из исходных транзакции.
-setting.preferences.dao.isDaoFullNode=Запустить Bisq в режиме полноценный узел DAO
+setting.preferences.dao.resync.popup=После перезапуска приложения, согласованное состояние BSQ будет восстановлено из исходных транзакции.
+setting.preferences.dao.isDaoFullNode=Запустить Bisq в режиме полноценного узла DAO
 setting.preferences.dao.rpcUser=Логин RPC
 setting.preferences.dao.rpcPw=Пароль RPC
 setting.preferences.dao.fullNodeInfo=Для запуска Bisq в качестве полноценного узла DAO, Вам необходим локальный узел Bitcoin Core, настроенный с RPC и другими требованиями описанными в " {0}".
 setting.preferences.dao.fullNodeInfo.ok=Открыть страницу описаний
-setting.preferences.dao.fullNodeInfo.cancel=Нет, останусь в режиме легкий узел 
+setting.preferences.dao.fullNodeInfo.cancel=Нет, останусь в режиме легкого узла
 
 settings.net.btcHeader=Сеть Биткойн
 settings.net.p2pHeader=Сеть Р2Р
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Использовать особые узлы
 settings.net.warn.usePublicNodes=Если Вы используете общедоступную сеть Bitcoin, Вы подвергаетесь серьезной угрозе конфиденциальности, вызванной несовершенным дизайном и реализацией фильтра bloom, который используется в кошельках SPV, таких как BitcoinJ (который используется в Bisq). Любой самостоятельный узел, к которому Вы подключены, может вычислить, что все Ваши адреса кошельков принадлежат одному лицу.\n\nПросьба осведомиться о подробностях на: https://bisq.network/blog/privacy-in-bitsquare.\n\nИспользовать общедоступные узлы?
 settings.net.warn.usePublicNodes.useProvided=Нет, использовать предусмотренные узлы
 settings.net.warn.usePublicNodes.usePublic=Да, использовать общедоступную сеть
-settings.net.warn.useCustomNodes.B2XWarning=Просьба убедиться, что Ваш Биткойн узел является доверенным  Bitcoin Core узлом! \n\nПодключение к узлам, которые не следуют правилам консенсуса Bitcoin Core, может повредить Ваш кошелек и вызвать проблемы в процессе торговли.\n\nПользователи, которые подключаются к узлам, нарушающим правила консенсуса, несут ответственность за любой ущерб, причиненный этим. Споры, вызванные этим, будут решаться в пользу контрагента. Никакая техническая поддержка не будет предоставлена пользователям, которые игнорируют наши механизмы предупреждения и защиты!
-settings.net.localhostBtcNodeInfo=(Справка: если Вы используете локальный узел Биткойн (localhost), Вы подключаетесь исключительно к нему.)
+settings.net.warn.useCustomNodes.B2XWarning=Просьба убедиться, что Ваш Биткойн узел является доверенным  Bitcoin Core узлом! \n\nПодключение к узлам не следующим правилам консенсуса Bitcoin Core, может повредить Ваш кошелек и вызвать проблемы в процессе торговли.\n\nПользователи подключающиеся к узлам, нарушающим правила консенсуса, несут ответственность за любой причиненный ущерб. Вытекающие споры будут решаться в пользу контрагента. Никакая техническая поддержка не будет предоставлена пользователям, которые игнорируют это предупреждения и механизмы защиты!
+settings.net.localhostBtcNodeInfo=(Справка: если Вы используете локальный узел Биткойн (localhost), Вы можете подключаться исключительно к нему.)
 settings.net.p2PPeersLabel=Подключенные пэры
 settings.net.onionAddressColumn=Onion/Tor адрес
 settings.net.creationDateColumn=Создано
@@ -857,17 +860,17 @@ settings.net.inbound=входящий
 settings.net.outbound=выходящий
 settings.net.reSyncSPVChainLabel=Синхронизировать цепь SPV заново
 settings.net.reSyncSPVChainButton=Удалить файл SPV и синхронизировать повторно 
-settings.net.reSyncSPVSuccess=Файл цепочки SPV удалится при перезагрузке. Необходимо перезапустить приложение.\n\nПосле перезагрузки, потребуется некоторое время для повторной синхронизации с сетью и Вы увидите все транзакции только после её завершения.\n\nПросьба повторить перезагрузку после завершения повторной синхронизации, поскольку иногда возникают несоответствия, ведущие к неверному балансу.
-settings.net.reSyncSPVAfterRestart=Файл цепочки SPV удален. Просьба проявлять терпение; повторная синхронизации с сетью может занять некоторое время.
+settings.net.reSyncSPVSuccess=Файл цепи SPV удалится при перезагрузке. Необходимо перезапустить приложение.\n\nПосле перезагрузки, потребуется некоторое время для повторной синхронизации с сетью и Вы увидите все транзакции только после её завершения.\n\nПросьба повторить перезагрузку после завершения повторной синхронизации, поскольку иногда возникают несоответствия, ведущие к неверному балансу.
+settings.net.reSyncSPVAfterRestart=Файл цепи SPV удален. Просьба потерпеть. Повторная синхронизации с сетью может занять некоторое время.
 settings.net.reSyncSPVAfterRestartCompleted=Повторная синхронизация завершена. Просьба перезагрузить приложение.
 settings.net.reSyncSPVFailed=Не удалось удалить файл цепи SPV.\nСбой: {0}
 setting.about.aboutBisq=О Bisq
-setting.about.about=Bisq - проект с открытым исходным кодом и децентрализованной сетью пользователей, которые желают обменивать биткойн на национальные валюты или криптовалюты, с защитой конфиденциальности. Узнайте больше о Bisq на веб-странице нашего проекта.
+setting.about.about=Bisq - проект с открытым исходным кодом, предназначенный для обмена биткойн на национальные валюты (и другие криптовалюты), через децентрализованную Р2Р сеть пользователей, с прочной защитой конфиденциальности. Узнайте больше о Bisq на веб-странице нашего проекта.
 setting.about.web=Веб страница Bisq
 setting.about.code=Исходный код
 setting.about.agpl=Лицензия AGPL
 setting.about.support=Поддержать Bisq
-setting.about.def=Bisq не компания, а общественный проект, открытый для участия. Если вы желаете участвовать или поддержать Bisq, просьба следовать по ссылке ниже.
+setting.about.def=Bisq не компания, а общественный проект, открытый для участия. Если Вы желаете участвовать или поддержать Bisq, просьба следовать по ссылкам ниже.
 setting.about.contribute=Способствовать
 setting.about.donate=Пожертвовать
 setting.about.providers=Источники данных
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Версия сети: {0}; Версия P2P соо
 account.tab.arbitratorRegistration=Регистрация арбитра
 account.tab.account=Счёт
 account.info.headline=Добро пожаловать в Ваш Bisq Счёт
-account.info.msg=Здесь можно добавить свои торговые счета для нац. валют и алткойнов, выбрать арбитров, создать резервные копии своего кошелька и данных счетов.\n\nПустой кошелёк Биткойн был создан, когда Вы впервые запустили Bisq.\nСоветуем записать кодовые слова для восстановления кошелька (см. вкладку вверху) и добавить пароль до ввода средств. Ввод и вывод биткойнов проводят в разделе \"Средства\".\n\nБезопасность и конфиденциальность:\nBisq - децентрализованный обменник. Ваши данные хранятся только на Вашем компьютере. Серверов нет, и нам не доступы Ваши личные данные, средства и даже IP адрес. Данные, как номера банковских счетов, адреса электронных кошельков, итп, сообщаются только Вашему контрагенту для обеспечения Ваших сделок (в случае спора, арбитр увидит те же данные, что и контрагент).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Счета в нац. валюте
 account.menu.altCoinsAccountView=Алткойн-счета
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Публичный ключ
 
 account.arbitratorRegistration.register=Зарегистрировать арбитра
 account.arbitratorRegistration.revoke=Отозвать регистрацию
-account.arbitratorRegistration.info.msg=Учтите, что Вы обязанч быть доступны в течение 15 дней после отзыва, поскольку могут быть сделки, в которых Вы задействованы как арбитр. Макс. допустимый срок сделки составляет 8 дней, и спор может рассматриваться до 7 дней.
+account.arbitratorRegistration.info.msg=Учтите, что Вы обязаны быть доступны в течение 15 дней после отзыва, поскольку могут быть сделки, в которых Вы задействованы как арбитр. Макс. допустимый срок сделки составляет 8 дней, и спор может рассматриваться до 7 дней.
 account.arbitratorRegistration.warn.min1Language=Необходимо указать хотя бы 1 язык.\nОдин добавлен по умолчанию.
 account.arbitratorRegistration.removedSuccess=Вы благополучно удалили Вашего арбитра из сети P2P.
 account.arbitratorRegistration.removedFailed=Не удалось удалить арбитра.{0}
@@ -921,12 +924,12 @@ account.arbitratorSelection.noLang=Можно выбирать только те
 account.arbitratorSelection.minOne=Необходимо выбрать хотя бы одного арбитра.
 
 account.altcoin.yourAltcoinAccounts=Ваши алткойн-счета
-account.altcoin.popup.wallet.msg=Убедитесь, что соблюдаете требования пользования кошельками {0}, описанных на веб-странице {1}.\nИспользование кошельков из централизованных обменников, где Ваши ключи не находятся под Вашим контролем, или несовместимого кошелька может привести к потере Ваших торговых средств!\nАрбитр не является специалистом {2} и не может помочь в таких случаях.
+account.altcoin.popup.wallet.msg=Убедитесь, что соблюдаете требования пользования кошельками {0}, описанных на веб-странице {1}.\nИспользование кошельков централизованных обменников рискованно, где (а) Ваши ключи не под Вашим контролем, или (б) используют несовместимый кошелёк; может привести к потере Ваших торговых средств!\nАрбитр не является специалистом {2} и не может помочь в таких случаях.
 account.altcoin.popup.wallet.confirm=Я понимаю и подтверждаю, что знаю какой кошелёк нужно использовать.
 account.altcoin.popup.xmr.msg=Для обмена XMR на Bisq, просьба понять и следовать следующим правилам:\n\nДля отправления XMR необходимы кошельки официальный Monero GUI или Monero CLI с включённым флажком store-tx-info  (в новейших версиях по умолчанию). Удостоверьтесь, что доступен ключ транзакций необходимый в случае спора.\nmonero-wallet-cli (используйте команду get_tx_key)\nmonero-wallet-gui (перейдите в раздел history и нажмите на кнопку (P) для подтверждения оплаты)\n\n В дополнение к инструменту проверки XMR (https://xmr.llcoins.net/checktx.html), верификация также может быть выполнена в кошельке.\nmonero-wallet-cli: используя команду (check_tx_key).\nmonero-wallet-gui: разделе Advanced > Prove/Check.\nОбычным исследователем блоков переводы не проверяются.\n\nЕсли возникнет спора, арбитру потребуются от Вас следующие данные:\n- Ключ транзакции\n- Хэш(hash) транзакции\n- Публичный адрес получателя\n\nЕсли Вы не предоставите эти данные, либо используете несоответствующие кошельки, Вы проиграете спор. Посылающий XMR ответственен перед арбитром за подтверждение перевода XMR в случае спора.\n\nИдентификатор оплаты не нужен - только нормальный публичный адрес.\nЕсли Вам не знаком этот процесс, посетите (https://www.getmonero.org/resources/user-guides/prove-payment.html) или осведомитесь на форуме Monero (https://forum.getmonero.org).
-account.altcoin.popup.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf 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.blur.msg=Если вы хотите торговать BLUR на Bisq, вам нужно понять и выполнить следующие требования:\n\nЧтобы послать BLUR, вы должны использовать кошелёк Blur Network CLI или кошелёк GUI.\n\nЕсли вы используете кошелёк CLI, хэш сделки (tx ID) будет показан после отправки перевoда. Вы должны сохранить эту информацию. Немедленно после отправки перевода, используйте команду 'get_tx_key' для получения секретного ключа сделки. Если вы не выполните этот акт, вы не сможете получить ключ позже.\n\nЕсли вы используете кошелёк Blur Network GUI, вы можете найти частный ключ и идентификацию (ID) сделки во вкладке "История". Немедленно после отправки, найдите интересуемую сделку. Нажмите на символ "?" в нижне-правом углу окна содержащего сделку. Вы должны сохранить эту информацию.\n\nВ случае необходимости арбитража, вы должны предоставить следующее арбитру: 1.) идентификацию (ID) сделки, 2.) частный ключ сделки, и 3.) адрес получателя. Арбитр затем проверит перевод BLUR пользуясь Просмотрщиком сделок Blur или Blur Transaction Viewer (https://blur.cash/#tx-viewer).\n\nЕсли вы не сможете предоставить требованную информацию арбитру, вы проиграете спор. Во всех случаях спора, отправитель несёт 100% ответственности за подтверждение сделок арбитру.\n\nЕсли вы не понимаете эти требования, не торгуйте на Bisq. Сначала, ищите помощь в Споре Сети Blur или Blur Network Discord (https://discord.gg/dMWaqVW).
 account.altcoin.popup.ccx.msg=Если Вы хотите торговать CCX на Bisq, просьба убедиться, что Вы понимаете следующие требования:\n\nДля отправки ccx вы должны использовать официальный кошелек - либо CLI, либо GUI. После отправки перевода, кошельки\nпоказывают секретный ключ транзакции. Вы должны сохранить его вместе с хэшем транзакции (ID) и общедоступным\nадресом получателя на случай возникновения спора. В таком случае Вы должны предоставить все три арбитру,\nдля проверки перевода CCX с помощью Обозревателя Скрытых Транзакций (https://explorer.скрывать.network/txviewer).\nТак как Conceal монета конфиденциальности, блок обозреватели не могут проверить переводы.\n\nЕсли Вы не сможете предоставить необходимые данные арбитру, Вы проиграете спор.\nЕсли Вы не сохраните секретный ключ транзакции сразу после передачи CCX, его нельзя будет восстановить позже.\nЕсли Вы не понимаете этих требований, обратитесь за помощью в 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\nBecause 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.\nThe TXN-Private Key is a one-time key automatically generated for every transaction that can only be accessed from within your DRGL wallet.\nEither by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\nDRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\nIn case of a dispute, you must provide the arbitrator the following data:\n- The TXN-Private key\n- The transaction hash\n- The recipient's public address\n\nVerification of payment can be made using the above data as inputs at \ (http://drgl.info/#check_txn).\n\nIf 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 arbitrator in case of a dispute. Use of PaymentID is not required.\n\nIf you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help.
+account.altcoin.popup.drgl.msg=\nЧтобы торговать Dragonglass на Bisq, вы должны понять и выполнить следующие треобования:\n\nТак как Dragonglass предоставляет конфиденциальность, сделку невозможно подтвердить в общественном блокчейне. Вам необходимо доказать вашу оплату пользуясь вашим частным ключом TXN (TXN-Private-Key).\nЧастный ключ TXN - это одноразовый ключ который автоматически создан при каждой сделке и только доступен  изнутри вашего кошелька DRGL.\nИли через GUI (графический интерфейс пользователя) кошелька DRGL (внутри диалога деталей сделок) или через Dragonglass CLI simplewallet (пользуясь командой "get_tx_key").\n\nДля обоих НЕОБХОДИМЫ версия DRGL "Oathkeeper" и новее.\n\nВ случае спора, вы должны предоставить следующую информацию арбитру: \n- Частный ключ TXN\n- Хэш сделки\n- Публичный адрес получателя\n\nПодтверждение оплаты может быть выполнено используя приведённые выше данные в качестве входных данных в (http://drgl.info/#check_txn). \n\nЕсли вы не можете предоставить приведённые выше данные или вы использовали несовместимый кошелёк, это приведёт к потере спора. Отправитель Dragonglass имеет ответственность за подтвердение перевода DRGL арбитру в случае спора. Использование PaymentID не требуется.\n\nЕсли вы не уверены в какой-либо части этого процесса, посетите Dragonglass о споре (http://discord.drgl.info) для услуг.
 account.altcoin.popup.ZEC.msg=При использовании {0} допустимо использовать только прозрачные адреса (начиная с t) а не z-адреса (личные), потому что арбитр не сможет проверить транзакцию с z-адресами.
 account.altcoin.popup.XZC.msg=При использовании {0} можно использовать только прозрачные (отслеживаемые) адреса, а не неотслеживаемые адреса, поскольку арбитр не сможет проверить транзакцию с неотслеживаемыми адресами в обозревателе блоков цепи / вlockchain.
 account.altcoin.popup.bch=Bitcoin Cash и Bitcoin Classic страдают отсутствием защиты воспроизведения. Если вы используете эти монеты, убедитесь, что вы принимаете достаточные меры предосторожности и понимаете все последствия. Возможно понести убытки, отправив одну монету и непреднамеренно отправить те же монеты на другую  блокцепь. Поскольку эти монеты были выпущены процессом "airdrop" и разделяют исторические данные с блокчейном Биткойн, существует также риск безопасности и значительный риск потери конфиденциальности. \n\nПросьба прочесть подробнее на форуме Bisq: https://forum.bisq.io/t/airdrop-coins-information-thread-bch-btg-bchc
@@ -949,14 +952,14 @@ account.password.removePw.button=Удалить пароль
 account.password.removePw.headline=Удалить защиту паролем для кошелька
 account.password.setPw.button=Установить пароль
 account.password.setPw.headline=Установить пароль для защиты кошелька
-account.password.info=С защитой паролем, Вам необходимо ввести пароль при выводе биткойнов из своего кошелька, или если Вы хотите просмотреть или восстановить кошелёк из кодовых слов, а также при запуске приложения.
+account.password.info=С защитой паролем, Вам необходимо ввести пароль при запуске приложения, при выводе биткойнов из Вашего кошелька, и если Вы хотите восстановить кошелёк из кодовых слов.
 
 account.seed.backup.title=Сохранить кодовые слова Вашего кошелька
-account.seed.info=Просьба записать кодовые слова для восстановления кошелька и дату! Вы сможете восстановить Ваш кошелёк когда угодно, используя фразу из кодовых слов и дату.\nКодовые слова используются для обоих кошельков BTC и BSQ.\n\nВам следует записать и сохранить кодовые слова на бумаге, и не хранить их на компьютере.\n\nУчтите, что кодовые слова не заменяют резервную копию.\nВам следует сделать резервную копию всего каталога приложения в разделе \"Счёт/Резервное копирование\" для восстановления действительного состояния приложения и данных.\nИмпорт кодовых слов рекомендуется только в экстренных случаях. Приложение не будет функционировать без надлежащего резервного копирования файлов базы данных и ключей!
+account.seed.info=Просьба записать кодовые слова кошелька и дату создания! Используя эти данные, Вы сможете восстановить Ваш кошелёк когда угодно.\nОдни и те-же кодовые слова используются для обоих кошельков - BTC и BSQ.\n\nВам следует записать кодовые слова на бумаге, и не хранить их на компьютере.\n\nУчтите, что кодовые слова НЕ заменяют резервную копию.\nВам следует сделать резервную копию всего каталога приложения в разделе \"Счёт/Резервное копирование\" для восстановления действительного состояния приложения и данных.\nИмпорт кодовых слов рекомендуется только в экстренных случаях. Приложение не будет функционировать без надлежащего резервного копирования файлов базы данных и ключей!
 account.seed.warn.noPw.msg=Вы не установили пароль кошелька, защищающий его кодовые слова.\n\nЖелаете показать на экране кодовые слова?
 account.seed.warn.noPw.yes=Да, и не спрашивать снова
 account.seed.enterPw=Введите пароль, чтобы увидеть кодовые слова
-account.seed.restore.info=Учтите, что невозможно импортировать кошелек из старой версии Bisq (любая версия до 0.5.0), потому что формат кошелька изменился! \n\nЕсли вы хотите перевести средства со старой версии приложения на новую, отправьте их с помощью транзакции Биткойн. \n\nТакже помните, что восстановление кошелька предназначено только для экстренных случаев, и может вызвать проблемы с базой данных кошелька.\nЭто не способ резервного копирования! Просьба использовать резервную копию из директории приложения для восстановления предыдущего состояния приложения.
+account.seed.restore.info=Просьба создать резервную копию перед восстановлением из кодовых слов. Помните, что восстановление кошелька предназначено для экстренных случаев и может вызвать неполадки  внутренней базы данных кошелька.\nЭто не способ резервного копирования! Используйте резервную копию из каталога данных приложения для восстановления его предыдущего состояния.
 account.seed.restore.ok=Хорошо, я понимаю и хочу восстановить
 
 
@@ -968,9 +971,9 @@ account.notifications.setup.title=Установка
 account.notifications.download.label=Скачать мобильное приложение
 account.notifications.download.button=Скачать
 account.notifications.waitingForWebCam=Ожидание веб-камеры...
-account.notifications.webCamWindow.headline=Сканировать код QR телефоном
+account.notifications.webCamWindow.headline=Сканировать код QR с телефона
 account.notifications.webcam.label=Применить веб-камеру
-account.notifications.webcam.button=Сканировать код
+account.notifications.webcam.button=Сканировать код QR
 account.notifications.noWebcam.button=Нет веб-камеры
 account.notifications.testMsg.label=Отправить тестовое уведомление
 account.notifications.testMsg.title=Проверка
@@ -979,13 +982,13 @@ account.notifications.erase.title=Очистить уведомления
 account.notifications.email.label=Токен спаривания
 account.notifications.email.prompt=Введите токен спаривания полученный по э-почте
 account.notifications.settings.title=Настройки
-account.notifications.useSound.label=Озвучить уведомление
+account.notifications.useSound.label=Озвучить уведомление на телефоне
 account.notifications.trade.label=Получать сообщения сделки
 account.notifications.market.label=Получать оповещения о предложении
 account.notifications.price.label=Получать оповещения о ценах
 account.notifications.priceAlert.title=Оповещения о ценах
-account.notifications.priceAlert.high.label=Уведомлять, если цена BTC выше
-account.notifications.priceAlert.low.label=Уведомлять, если цена BTC ниже
+account.notifications.priceAlert.high.label=Уведомить, если цена BTC выше
+account.notifications.priceAlert.low.label=Уведомить, если цена BTC ниже
 account.notifications.priceAlert.setButton=Установить оповещение о цене
 account.notifications.priceAlert.removeButton=Удалить оповещение о цене
 account.notifications.trade.message.title=Состояние сделки изменилось
@@ -1021,7 +1024,7 @@ account.notifications.priceAlert.message.title=Оповещение о цене
 account.notifications.priceAlert.message.msg=Ваше оповещение о цене сработало. Текущая цена {0} {1} {2}
 account.notifications.noWebCamFound.warning=Веб-камера не найдена.\n\nПросьба применить э-почту для отправки токена и ключа шифрования с Вашего мобильного телефона на  приложение Bisq.
 account.notifications.priceAlert.warning.highPriceTooLow=Более высокая цена должна быть больше чем более низкая цена.
-account.notifications.priceAlert.warning.lowerPriceTooHigh=Нижняя цена должна быть ниже, чем более высокая цена.
+account.notifications.priceAlert.warning.lowerPriceTooHigh=Нижняя цена должна быть ниже чем более высокая цена.
 
 
 
@@ -1040,7 +1043,7 @@ dao.availableBsqBalance=Доступно
 dao.availableNonBsqBalance=Доступный баланс (ВТС) исключая BSQ
 dao.unverifiedBsqBalance=Непроверенно (ожидает подтверждения блока)
 dao.lockedForVoteBalance=Использовано для голосования
-dao.lockedInBonds=Заперто в облигациях
+dao.lockedInBonds=Заперто в гарантийных депозитах
 dao.totalBsqBalance=Общий баланс BSQ
 
 dao.tx.published.success=Ваша транзакция опубликована.
@@ -1112,34 +1115,34 @@ dao.param.REIMBURSEMENT_MIN_AMOUNT=Мин. сумма запроса BSQ воз
 dao.param.REIMBURSEMENT_MAX_AMOUNT=Макс. сумма запроса BSQ возмещения
 
 # suppress inspection "UnusedProperty"
-dao.param.QUORUM_GENERIC=Необходимый кворум BSQ для обычного предложения
+dao.param.QUORUM_GENERIC=Требуемый кворум в BSQ для обычного предложения
 # suppress inspection "UnusedProperty"
-dao.param.QUORUM_COMP_REQUEST=Необходимый кворум BSQ для запроса компенсации
+dao.param.QUORUM_COMP_REQUEST=Требуемый кворум в BSQ для запроса компенсации
 # suppress inspection "UnusedProperty"
-dao.param.QUORUM_REIMBURSEMENT=Необходимый кворум BSQ для запроса возмещения
+dao.param.QUORUM_REIMBURSEMENT=Требуемый кворум в BSQ для запроса возмещения
 # suppress inspection "UnusedProperty"
-dao.param.QUORUM_CHANGE_PARAM=Необходимый кворум BSQ для изменения параметра
+dao.param.QUORUM_CHANGE_PARAM=Требуемый кворум в BSQ для изменения параметра
 # suppress inspection "UnusedProperty"
 dao.param.QUORUM_REMOVE_ASSET=Необходимый кворум BSQ для удаления актива
 # suppress inspection "UnusedProperty"
 dao.param.QUORUM_CONFISCATION=Необходимый кворум BSQ для запроса конфискации
 # suppress inspection "UnusedProperty"
-dao.param.QUORUM_ROLE=Необходимый кворум в BSQ для запросов обеспеченной роли
+dao.param.QUORUM_ROLE=Требуемый кворум в BSQ для запросов роли требующей залога
 
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_GENERIC=Необходимый порог в % для обычного предложения
+dao.param.THRESHOLD_GENERIC=Требуемый порог в % для обычного предложения
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_COMP_REQUEST=Необходимый порог в % для запроса компенсации
+dao.param.THRESHOLD_COMP_REQUEST=Требуемый порог в % для запроса компенсации
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_REIMBURSEMENT=Необходимый порог в % для запроса возмещения
+dao.param.THRESHOLD_REIMBURSEMENT=Требуемый порог в % для запроса возмещения
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_CHANGE_PARAM=Необходимый порог в % для изменения параметра
+dao.param.THRESHOLD_CHANGE_PARAM=Требуемый порог в % для изменения параметра
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_REMOVE_ASSET=Необходимый порог в % для удаления актива
+dao.param.THRESHOLD_REMOVE_ASSET=Требуемый порог в % для удаления актива
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_CONFISCATION=Необходимый порог в % для запроса конфискации
+dao.param.THRESHOLD_CONFISCATION=Требуемый порог в % для запроса конфискации
 # suppress inspection "UnusedProperty"
-dao.param.THRESHOLD_ROLE=Необходимый порог в % для запросов обеспеченной роли
+dao.param.THRESHOLD_ROLE=Требуемый порог в % для запросов обеспеченной роли
 
 # suppress inspection "UnusedProperty"
 dao.param.RECIPIENT_BTC_ADDRESS=BTC адрес получателя
@@ -1211,7 +1214,7 @@ dao.bond.bondedRoles=Обеспеченные роли
 
 dao.bond.details.header=Подробности роли
 dao.bond.details.role=Роль
-dao.bond.details.requiredBond=Необходимый гарантийный депозит BSQ
+dao.bond.details.requiredBond=Требуемый гарантийный депозит BSQ
 dao.bond.details.unlockTime=Срок разблокировки в блоках
 dao.bond.details.link=Ссылка на подробности роли
 dao.bond.details.isSingleton=Может быть принято несколькими держателями роли
@@ -1319,7 +1322,7 @@ dao.assetState.REMOVED_BY_VOTING=Удалён голосованием
 dao.proofOfBurn.header=Proof of burn
 dao.proofOfBurn.amount=Количество
 dao.proofOfBurn.preImage=Pre-image
-dao.proofOfBurn.burn=Сжечь
+dao.proofOfСжечь.burn=Сжечь
 dao.proofOfBurn.allTxs=Все транзакции proof of burn
 dao.proofOfBurn.myItems=Мои транзакции proof of burn
 dao.proofOfBurn.date=Дата
@@ -1407,14 +1410,14 @@ dao.proposal.myVote.merit=Вес голоса от заслуженного BSQ
 dao.proposal.myVote.stake=Вес голоса от доли
 dao.proposal.myVote.blindVoteTxId=Транз. идент. слепого голосования
 dao.proposal.myVote.revealTxId=Транз. идент.  выявления голоса
-dao.proposal.myVote.stake.prompt=Доступный баланс для голосования: {0}
+dao.proposal.myVote.stake.prompt=Макс. доступный баланс для голосования: {0}
 dao.proposal.votes.header=Голосование по всем предложениям
 dao.proposal.votes.header.voted=Мой голос
 dao.proposal.myVote.button=Голосование по всем предложениям
 dao.proposal.create.selectProposalType=Выберите тип предложения
 dao.proposal.create.proposalType=Тип предложения
-dao.proposal.create.createNew=Создать новый запрос компенсации
-dao.proposal.create.create.button=Создать запрос компенсации
+dao.proposal.create.createNew=Создать новое предложение
+dao.proposal.create.create.button=Создать предложение
 dao.proposal=предложение
 dao.proposal.display.type=Тип предложения
 dao.proposal.display.name=Имя/ник
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Параметр
 
 dao.proposal.table.header.proposalType=Тип предложения
 dao.proposal.table.header.link=Ссылка
+dao.proposal.table.header.myVote=Мой голос
+dao.proposal.table.header.remove=Удалить
 dao.proposal.table.icon.tooltip.removeProposal=Удалить моё предложение
 dao.proposal.table.icon.tooltip.changeVote=Текущий голос: "{0}". Изменить голос на: "{1}"
 
@@ -1489,7 +1494,7 @@ dao.wallet.receive.fundYourWallet=Ввести средства на Ваш BSQ
 dao.wallet.receive.bsqAddress=Адрес кошелька BSQ
 
 dao.wallet.send.sendFunds=Послать средства
-dao.wallet.send.sendBtcFunds=Отправить средства исключая BSQ (BTC)
+dao.wallet.send.sendBtcFunds=Отправить средства (BTC), исключая BSQ
 dao.wallet.send.amount=Сумма в BSQ
 dao.wallet.send.btcAmount=Сумма в ВТС (исключая BSQ)
 dao.wallet.send.setAmount=Установленная сумма для снятия (мин. сумма равна {0})
@@ -1500,21 +1505,21 @@ dao.wallet.send.setDestinationAddress=Заполните ваш адрес на
 dao.wallet.send.send=Отправить BSQ средства
 dao.wallet.send.sendBtc=Отправить BTC средства
 dao.wallet.send.sendFunds.headline=Подтвердите запрос снять средства
-dao.wallet.send.sendFunds.details=Отправка: {0}\nНа принимающий адрес: {1}.\nНеобходимая комиссия за транзакцию: {2} ({3} satoshis/byte)\nРазмер транзакции: {4} Кб\n\nПолучатель получит: {5}\n\nВы уверены, что желаете снять эту сумму?
-dao.wallet.chainHeightSynced=Синхронизация до блока: {0} (Последний блок: {1})
-dao.wallet.chainHeightSyncing=Синхронизирующий блок: {0} (Последний блок: {1})
+dao.wallet.send.sendFunds.details=Отправка: {0}\nНа принимающий адрес: {1}.\nТребуемая комиссия за транзакцию: {2} ({3} сатоши/байт)\nРазмер транзакции: {4} Кб\n\nПолучатель получит: {5}\n\nВы уверены, что желаете снять эту сумму?
+dao.wallet.chainHeightSynced=Новейший проверенный блок: {0}
+dao.wallet.chainHeightSyncing=Ожидание блоков... Проверено {0} блоков из {1}
 dao.wallet.tx.type=Тип
 
 # suppress inspection "UnusedProperty"
 dao.tx.type.enum.UNDEFINED_TX_TYPE=Не признано
 # suppress inspection "UnusedProperty"
-dao.tx.type.enum.UNVERIFIED=Неверная транзакция BSQ
+dao.tx.type.enum.UNVERIFIED=Непроверенная транзакция BSQ
 # suppress inspection "UnusedProperty"
 dao.tx.type.enum.INVALID=Недействительная транзакция BSQ
 # suppress inspection "UnusedProperty"
-dao.tx.type.enum.GENESIS=Genesis транзакция
+dao.tx.type.enum.GENESIS=Исходная транзакция
 # suppress inspection "UnusedProperty"
-dao.tx.type.enum.TRANSFER_BSQ=Передача BSQ
+dao.tx.type.enum.TRANSFER_BSQ=Перевести BSQ
 # suppress inspection "UnusedProperty"
 dao.tx.type.enum.received.TRANSFER_BSQ=Полученный BSQ
 # suppress inspection "UnusedProperty"
@@ -1564,7 +1569,7 @@ displayAlertMessageWindow.headline=Важная информация!
 displayAlertMessageWindow.update.headline=Информация о важном обновлении!
 displayAlertMessageWindow.update.download=Загрузить:
 displayUpdateDownloadWindow.downloadedFiles=Файлы:
-displayUpdateDownloadWindow.downloadingFile=Загрузить:  {0}
+displayUpdateDownloadWindow.downloadingFile=Загрузka:  {0}
 displayUpdateDownloadWindow.verifiedSigs=Подпись, подтвержденная ключами:
 displayUpdateDownloadWindow.status.downloading=Файлы загружаются...
 displayUpdateDownloadWindow.status.verifying=Проверка подписи...
@@ -1579,18 +1584,18 @@ displayUpdateDownloadWindow.verify.failed=Проверка не удалась.\
 displayUpdateDownloadWindow.success=Новая версия успешно скачалась  и подпись проверена.\n\nПожалуйста, откройте директорию загрузки, закройте приложение и установите новую версию.
 displayUpdateDownloadWindow.download.openDir=Открыть директорию для загрузки 
 
-disputeSummaryWindow.title=Сводка
+disputeСводкаWindow.title=Сводка
 disputeSummaryWindow.openDate=Дата открытия билета поддержки
 disputeSummaryWindow.role=Роль трейдера
 disputeSummaryWindow.evidence=Доказательство
 disputeSummaryWindow.evidence.tamperProof=Подтверждение доказательств
-disputeSummaryWindow.evidence.id=проверка идентификации
+disputeSummaryWindow.evidence.id=Проверка идентификации
 disputeSummaryWindow.evidence.video=Видео/Экранная демонстрация
 disputeSummaryWindow.payout=Выплата суммы сделки
 disputeSummaryWindow.payout.getsTradeAmount=BTC {0} получение выплаты суммы сделки
 disputeSummaryWindow.payout.getsAll=BTC {0} Получить всё
 disputeSummaryWindow.payout.custom=Пользовательская выплата
-disputeSummaryWindow.payout.adjustAmount=Введенная сумма превышает доступный размер {0}. \nМы вводим максимально возможное значение.
+disputeSummaryWindow.payout.adjustAmount=Введенная сумма превышает доступное количество {0}. \nМы введём максимально возможное значение.
 disputeSummaryWindow.payoutAmount.buyer=Сумма выплаты покупателю
 disputeSummaryWindow.payoutAmount.seller=Сумма выплаты продавцу
 disputeSummaryWindow.payoutAmount.invert=Проигравший публикует
@@ -1615,8 +1620,8 @@ emptyWalletWindow.bsq.btcBalance=Баланс в сатоши исключая B
 
 emptyWalletWindow.address=Ваш адрес назначения
 emptyWalletWindow.button=Отправить все средства
-emptyWalletWindow.openOffers.warn=У Вас открыты предложения, которые будут удалены, если вы опустошите кошелёк.\nУверены ли вы, что хотите очистить свой кошелёк?
-emptyWalletWindow.openOffers.yes=Да, я уверен
+emptyWalletWindow.openOffers.warn=У Вас есть открытые предложения, которые будут удалены если вы опустошите кошелёк.\nУверены ли Вы, что хотите опустошить свой кошелёк?
+emptyWalletWindow.openOffers.yes=Да, я уверен(а)
 emptyWalletWindow.sent.success=Баланс вашего кошелька был успешно передан.
 
 enterPrivKeyWindow.headline=Регистрация открыта только для приглашенных арбитров
@@ -1653,7 +1658,7 @@ offerDetailsWindow.creationDate=Дата создания
 offerDetailsWindow.makersOnion=Onion-адрес (Tor) создателя
 
 qRCodeWindow.headline=QR-код
-qRCodeWindow.msg=Используйте этот QR-код для пополнения своего кошелька Bisq из внешнего кошелька.
+qRCodeWindow.msg=Используйте этот QR-код для пополнения Вашего кошелька Bisq из внешнего кошелька.
 qRCodeWindow.request=Запрос платежа:\n{0}
 
 selectDepositTxWindow.headline=Выберите транзакцию ввода средств для включения в спор
@@ -1741,7 +1746,7 @@ popup.headline.error=Ошибка
 popup.doNotShowAgain=Не показывать снова
 popup.reportError.log=Открыть файл журнала
 popup.reportError.gitHub=Сообщить проблему на Github в раздел 'issues'
-popup.reportError={0}\n\nчтобы помочь нам улучшить приложение, просьба сообщить о неисправности на нашем баг-трекере на github (https://github.com/bisq-network/bisq-desktop/issues).\nСообщение о неисправности будет скопировано в буфер обмена при нажатии кнопки ниже.\nНам облегчит отладку, если Вы прикрепите также bisq.log файл.
+popup.reportError={0}\n\nчтобы помочь нам улучшить приложение, просьба сообщить о неисправности на нашем баг-трекере на GitHub  (https://github.com/bisq-network/bisq-desktop/issues).\nСообщение о неисправности будет скопировано в буфер обмена при нажатии кнопки ниже.\nНам облегчит отладку, если Вы прикрепите также bisq.log файл.
 
 popup.error.tryRestart=Пожалуйста, попробуйте перезагрузить ваше приложение и проверьте подключение к сети, чтобы узнать, можете ли вы решить проблему.
 popup.error.takeOfferRequestFailed=Произошёл сбой, когда контрагент попытался принять одно из Ваших предложений:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=Один из узлов {0} был запрещен/з
 popup.warning.priceRelay=ретранслятор курса
 popup.warning.seed=кодовые слова
 
-popup.info.securityDepositInfo=Чтобы гарантировать следование торговому протоколу трейдерами, необходим залоговый взнос.\n\nОн поступит на Ваш счёт и останется в Вашем местном кошельке до тех пор, пока предложение не будет принято другим трейдером.\nЗалог будет возвращен Вам после успешного завершения сделки.\n\nУчтите, что для принятия Ваших текущих предложений другими трейдерами, и выполнения протокола сделки, Ваше приложение должно быть подключено к сети.\nУбедитесь, что Вы отключили режим ожидания. Иначе,  это отключит сеть. (Режим ожидания монитора не является проблемой.)
+popup.info.securityDepositInfo=Чтобы гарантировать следование торговому протоколу трейдерами, необходим залоговый депозит.\n\nОн поступит на Ваш счёт и останется в Вашем торговом кошельке до успешного завершения сделки, и затем будет возвращен Вам.\n\nУчтите, что если Вы создаёте новое предложение, Bisq должно быть подключено к сети для принятия предложения другими трейдерами. Чтобы Ваши предложения были доступны в сети, компьютер и Bisq должны быть включёны и подключены к сети. (т. е. убедитесь, что компьютер не впал в режим ожидания...монитор в режиме ожидания не проблема).
 
 popup.info.cashDepositInfo=Просьба убедиться, что в Вашем районе существует отделение банка, где возможно внести депозит наличными.\nИдентификатор (BIC/SWIFT) банка продавца: {0}.
 popup.info.cashDepositInfo.confirm=Я подтверждаю, что могу внести депозит
@@ -2127,7 +2132,7 @@ MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
 WESTERN_UNION_SHORT=Western Union
 # suppress inspection "UnusedProperty"
-F2F_SHORT=F2F
+F2F_SHORT=Лицом к лицу
 
 # Do not translate brand names
 # suppress inspection "UnusedProperty"
@@ -2267,10 +2272,10 @@ validation.iban.checkSumInvalid=Контрольная сумма IBAN неде
 validation.iban.invalidLength=Номер должен быть от 15 до 34 символов.
 validation.interacETransfer.invalidAreaCode=Код не Канадского региона
 validation.interacETransfer.invalidPhone=Неверный формат номера телефона или адрес электронной почты
-validation.interacETransfer.invalidQuestion=Должно содержать только буквы, цифры, пробелы и символы ' _ , . ? -
+validation.interacETransfer.invalidQuestion=Должно содержать только буквы, цифры, пробелы и/или символы ' _ , . ? -
 validation.interacETransfer.invalidAnswer=Необходимо одно слово, содержащее только буквы, цифры и символ -
 validation.inputTooLarge=Данные должны быть не более {0}
-validation.inputTooSmall=Данные должны быть не более {0}
+validation.inputTooSmall=Данные должны быть более {0}
 validation.amountBelowDust=Сумма ниже предела ("пыли") {0} не допускается.
 validation.length=Длина должна быть между {0} и {1}
 validation.pattern=Данные должны быть в формате: {0}

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=Da, započeo sam uplatu
 portfolio.pending.step2_seller.waitPayment.headline=Sačekajte uplatu
 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 he starts the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate.
+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.\nPlease contact the arbitrator for opening a dispute.
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=Nema dostupnih transakcija
 funds.tx.revert=Vrati
 funds.tx.txSent=Transakcija uspešno poslata na novu adresu u lokalnom Bisq novčaniku
 funds.tx.direction.self=Transakcija unutar novčanika
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=Zahtev za nadoknadu
 
@@ -762,9 +765,9 @@ support.buyerOfferer=BTC kupac/Tvorac
 support.sellerOfferer=BTC prodavac/Tvorac
 support.buyerTaker=BTC kupac/Uzimalac
 support.sellerTaker=BTC prodavac/Tvorac
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo="Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrators requests in between 2 days.\n2. The maximum period for the dispute is 14 days.\n3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more in detail about the dispute process in our wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=Poruka sistema: {0}
 support.youOpenedTicket=Otvorili ste zahtev za podršku.
 support.youOpenedDispute=You opened a request for a dispute.\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=Use custom Bitcoin Core nodes
 settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at: https://bisq.network/blog/privacy-in-bitsquare.\n\nAre you sure you want to use the public nodes?
 settings.net.warn.usePublicNodes.useProvided=No, use provided nodes
 settings.net.warn.usePublicNodes.usePublic=Yes, use public network
-settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which are not following the Bitcoin Core consensus rules could screw up your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any damage created by that. Disputes caused by that would be decided in favor of the other peer. No technical support will be given to users who ignore our warning and protection mechanisms!
-settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you get connected exclusively to that.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=Onion adresa
 settings.net.creationDateColumn=Utvrđen
@@ -857,17 +860,17 @@ settings.net.inbound=dolazeći
 settings.net.outbound=koji odlazi
 settings.net.reSyncSPVChainLabel=Resinkuj SPV lanac
 settings.net.reSyncSPVChainButton=Izbriši SPV fajl i resinhronizuj
-settings.net.reSyncSPVSuccess=The SPV chain file has been deleted. You need to restart your application now.\n\nAfter the restart it can take a while for resyncing with the network and you will only see all transactions once the resync is completed.\n\nPlease make another restart after the resync has completed because there are sometimes inconsistencies leading to incorrect balance display.
-settings.net.reSyncSPVAfterRestart=SPV lanac fajl je izbrisan. Molimo imajte strpljenja, može potrajati prilikom resinhronizovanja sa mrežom.
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=Resink je sada završen. Molimo ponovo pokrenite aplikaciju.
 settings.net.reSyncSPVFailed=Nije uspelo brisanje SPV lanac fajla.
 setting.about.aboutBisq=O Bisq
-setting.about.about=Bisq je projekat otvorenog koda i decentralizovana mreža korisnika koji žele da razmenjuju Bitkoin sa nacionalnim valutama ili alternativnim kripto valutama na način koji štiti privatnost. Naučite više o bisq na veb stranici našeg projetka.
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Bisq veb stranica
 setting.about.code=Izvorni kod
 setting.about.agpl=AGPL Licenca
 setting.about.support=Podrži Bisq
-setting.about.def=Bisq nije kompanija nego zajednički projekt i otvoren za učestvovanje. Ako želite da učestvujete ili da podržite Bisq molimo pratite linkove ispod.
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Doprinesi
 setting.about.donate=Doniraj
 setting.about.providers=Provajderi podataka
@@ -889,7 +892,7 @@ setting.about.subsystems.val=Verzija mreže: {0}; Verzija P2P poruka: {1}; Verzi
 account.tab.arbitratorRegistration=Registracija arbitra
 account.tab.account=Nalog
 account.info.headline=Dobrodošli na vaš Bisq Nalog
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=Nalozi nacionalne valute
 account.menu.altCoinsAccountView=Altkoin nalozi
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=Registrujte arbitra
 account.arbitratorRegistration.revoke=Opozovite registraciju
-account.arbitratorRegistration.info.msg=Imajte na umu da je potrebno da budete dostupni 15 dana nakon opozivanja, jer možda postoje trgovine koje koriste vas kao arbitra. Maks. dozvoljen period trgovine je 8 dana i proces rasprave može da traje do 7 dana.
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=You need to set at least 1 language.\nWe added the default language for you.
 account.arbitratorRegistration.removedSuccess=Uspešno ste uklonili vašeg arbitra sa P2P mreže.
 account.arbitratorRegistration.removedFailed=Uklanjanje arbitra nije uspelo.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=Možete izabrati samo arbitre koji govore bar
 account.arbitratorSelection.minOne=Potrebno je da imate bar jednog arbitra izabranog.
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where you don''t have your keys under your control or using a not compatible wallet software 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.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=Razumem i potvrđujem da znam koji novčanik trebam da koristim.
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=Ukloni lozinku
 account.password.removePw.headline=Ukloni zaštitu lozinkom za novčanik
 account.password.setPw.button=Podesi lozinku
 account.password.setPw.headline=Podesi zaštitu lozinkom za novčanik
-account.password.info=Sa zaštitom lozinkom potrebno je da unesete lozinku kada podižete bitkoin iz vašeg novčanika ili ako želite da vidite ili da povratite novčanik iz sid reči kao i pri pokretanju aplikacije.
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=Napravi rezervu sid reči vašeg novčanika
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=You have not setup a wallet password which would protect the display of the seed words.\n\nDo you want to display the seed words?
 account.seed.warn.noPw.yes=Da, ne pitaj me ponovo
 account.seed.enterPw=Unesite lozinku da bi videli sid reči
-account.seed.restore.info=Please note that you cannot import a wallet from an old Bitsquare version (any version before 0.5.0), because the wallet format has changed!\n\nIf you want to move the funds from the old version to the new Bisq application send it with a Bitcoin transaction.\n\nAlso be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=Ok, I understand and want to restore
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=Proposal type
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=My vote
+dao.proposal.table.header.remove=Ukloni
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=Pošalji BSQ sredstva
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=Potvrdi zahtev za podizanje
 dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired transaction fee is: {2} ({3} Satoshis/byte)\nTransaction size: {4} Kb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount?
-dao.wallet.chainHeightSynced=Synchronized up to block:{0} (latest block: {1})
-dao.wallet.chainHeightSyncing=Synchronizing block: {0} (latest block: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=Tip
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=Verification failed.\nPlease download
 displayUpdateDownloadWindow.success=The new version has been successfully downloaded and the signature(s) verified.\n\nPlease open the download directory, shut down the application and install the new version.
 displayUpdateDownloadWindow.download.openDir=Open download directory
 
-disputeSummaryWindow.title=Rezime
+disputeRezimeWindow.title=Rezime
 disputeSummaryWindow.openDate=Ticket opening date
 disputeSummaryWindow.role=Trader's role
 disputeSummaryWindow.evidence=Evidence
@@ -1741,7 +1746,7 @@ popup.headline.error=Greška
 popup.doNotShowAgain=Ne prikazuj opet
 popup.reportError.log=Open log file
 popup.reportError.gitHub=Prijavi Github pratiocu problema
-popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click the below buttons.\nIt will make debugging easier if you can attach the bisq.log file as well.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=Molimo pokušajte da ponovo pokrenete vašu aplikaciju i proverite vašu mrežnu konekciju da vidite da li možete da rešite problem.
 popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. Please restart your ap
 popup.warning.priceRelay=price relay
 popup.warning.seed=seed
 
-popup.info.securityDepositInfo=To ensure that both traders follow the trade protocol they need to pay a security deposit.\n\nThe deposit will stay in your local trading wallet until the offer gets accepted by another trader.\nIt will be refunded to you after the trade has successfully completed.\n\nPlease note that you need to keep your application running if you have an open offer. When another trader wants to take your offer it requires that your application is online for executing the trade protocol.\nBe sure that you have standby mode deactivated as that would disconnect the network (standby of the monitor is not a problem).
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\nThe bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
 popup.info.cashDepositInfo.confirm=I confirm that I can make the deposit

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=ผู้ซื้อ
+shared.sellerUpperCase=ผู้ขาย
 
 ####################################################################
 # UI views
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=ไม่มีธุรกรรมใด ๆ
 funds.tx.revert=กลับสู่สภาพเดิม
 funds.tx.txSent=ธุรกรรมถูกส่งสำเร็จไปยังที่อยู่ใหม่ใน Bisq wallet ท้องถิ่นแล้ว
 funds.tx.direction.self=ส่งถึงตัวคุณเอง
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=คำขอค่าสินไหมทดแทน
 
@@ -889,7 +892,7 @@ setting.about.subsystems.val=เวอร์ชั่นของเครือ
 account.tab.arbitratorRegistration=การลงทะเบียนผู้ไกล่เกลี่ย
 account.tab.account=บัญชี
 account.info.headline=ยินดีต้อนรับสู่บัญชี Bisq ของคุณ
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=ที่นี่คุณสามารถตั้งค่าบัญชีการซื้อขายสกุลเงินประจำชาติและ altcoins (เหรียญทางเลือก) และเลือกผู้ไกล่เกลี่ย และสำรองข้อมูล wallet และบัญชีของคุณได้\n\nกระเป๋าสตางค์ Bitcoin ที่ว่างเปล่าถูกสร้างขึ้นในครั้งแรก ณ. ตอนที่คุณเริ่มต้นใช้งาน Bisq\nเราขอแนะนำให้คุณป้อนรหัสโค้ดการแบล็กอัพข้อมูลของ กระเป๋าสตางค์ Bitcoin (ดูปุ่มด้านซ้าย) และเพิ่มรหัสผ่านก่อนการป้อนเงิน   การฝากและถอนเงินของ Bitcoin จะอยู่ในส่วนของ \ "เงิน \"\n\nความเป็นส่วนตัวและความปลอดภัย: \nBisq คือการแลกเปลี่ยนแบบกระจายอำนาจซึ่งหมายความว่าข้อมูลทั้งหมดของคุณจะถูกเก็บไว้ในคอมพิวเตอร์ของคุณไม่มีเซิร์ฟเวอร์และเราไม่มีสิทธิ์เข้าถึงข้อมูลส่วนบุคคล เงินทุนหรือแม้กระทั่งที่อยู่ IP ของคุณ และข้อมูล เช่น หมายเลขบัญชีธนาคาร altcoin (เหรียญทางเลือก) และที่อยู่ Bitcoin ฯลฯ ข้อมูลนั้นจะใช้ร่วมกับคู่ค้าของคุณเพื่อตอบสนองธุรกิจการซื้อขายที่คุณดำเนินการเท่านั้น (ในกรณีที่มีข้อพิพาทผู้ไกล่เกลี่ยจะเห็นข้อมูลเช่นเดียวกับ ผู้ค้าของคุณ)
 
 account.menu.paymentAccount=บัญชีสกุลเงินของประเทศ
 account.menu.altCoinsAccountView=บัญชี Altcoin (เหรียญทางเลือก)
@@ -949,14 +952,14 @@ account.password.removePw.button=ลบรหัสผ่าน
 account.password.removePw.headline=ลบรหัสผ่านการป้องกันสำหรับ wallet
 account.password.setPw.button=ตั้งรหัสผ่าน
 account.password.setPw.headline=ตั้งรหัสผ่านการป้องกันสำหรับ wallet
-account.password.info=ด้วยการป้องกันด้วยรหัสผ่าน คุณต้องป้อนรหัสผ่านเมื่อถอนเงินออกจากกระเป๋าสตางค์ของคุณหรือถ้าคุณต้องการดูหรือเรียกคืนกระเป๋าสตางค์การสำรองข้อมูลโค้ดเป็นเช่นเดียวกับเมื่อเริ่มต้นใช้งาน
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=สำรองข้อมูล wallet โค้ดของคุณ
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=โปรดเขียนรหัสสำรองข้อมูล wallet และวันที่! คุณสามารถกู้ข้อมูล wallet ของคุณได้ทุกเมื่อด้วย รหัสสำรองข้อมูล wallet และวันที่\nรหัสสำรองข้อมูล ใช้ทั้ง BTC และ BSQ wallet\n\nคุณควรเขียนรหัสสำรองข้อมูล wallet ลงบนแผ่นกระดาษและไม่บันทึกไว้ในคอมพิวเตอร์ของคุณ\n\nโปรดทราบว่า รหัสสำรองข้อมูล wallet ไม่ได้แทนการสำรองข้อมูล\nคุณจำเป็นต้องสำรองข้อมูลสารบบแอ็พพลิเคชั่นทั้งหมดที่หน้าจอ \"บัญชี / การสำรองข้อมูล \" เพื่อกู้คืนสถานะแอ็พพลิเคชั่นและข้อมูลที่ถูกต้อง\nการนำเข้ารหัสสำรองข้อมูล wallet เป็นคำแนะนำเฉพาะสำหรับกรณีฉุกเฉินเท่านั้น แอพพลิเคชั่นจะไม่สามารถใช้งานได้หากไม่มีไฟล์สำรองฐานข้อมูลและคีย์ที่ถูกต้อง!
 account.seed.warn.noPw.msg=คุณยังไม่ได้ตั้งรหัสผ่าน wallet ซึ่งจะช่วยป้องกันการแสดงผลของรหัสสำรองข้อมูล wallet \n\nคุณต้องการแสดงรหัสสำรองข้อมูล wallet หรือไม่
 account.seed.warn.noPw.yes=ใช่  และไม่ต้องถามฉันอีก
 account.seed.enterPw=ป้อนรหัสผ่านเพื่อดูรหัสสำรองข้อมูล wallet 
-account.seed.restore.info=โปรดทราบว่าคุณไม่สามารถนำเข้า wallet จาก Bisq รุ่นเก่า (เวอร์ชันก่อนหน้า 0.5.0) เนื่องจากรูปแบบ wallet มีการเปลี่ยนแปลง! \n\nถ้าคุณต้องการจะย้ายเงินจากรุ่นเก่าไปยังแอ็พพลิเคชั่น Bisq ใหม่ให้ส่งด้วยการทำธุรกรรม bitcoin \n\nโปรดทราบว่าการเรียกคืน wallet เป็นกรณีฉุกเฉินเท่านั้นและอาจทำให้เกิดปัญหากับฐานข้อมูล wallet ภายใน\nนี่ไม่ใช่วิธีการสำรองข้อมูล! โปรดใช้ข้อมูลสำรองจากสารบบข้อมูลแอ็พพลิเคชั่นสำหรับการกู้คืนสถานะแอ็พพลิเคชั่นก่อนหน้านี้
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=ตกลง  ฉันเข้าใจและต้องการกู้คืนข้อมูล
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=ประเภทข้อเสนอ
 dao.proposal.table.header.link=ลิงค์
+dao.proposal.table.header.myVote=การลงคะแนนของฉัน
+dao.proposal.table.header.remove=ลบออก
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=ส่งเงิน BSQ
 dao.wallet.send.sendBtc=ส่งเงินทุน BTC
 dao.wallet.send.sendFunds.headline=ยืนยันคำขอถอนเงิน
 dao.wallet.send.sendFunds.details=กำลังส่ง: {0} \nไปยังที่อยู่ที่ได้รับ: {1} .\nค่าธรรมเนียมการทำธุรกรรมคือ: {2} ({3} satoshis / byte) \nขนาดการทำรายการ: {4} Kb\n\nผู้รับจะได้รับ: {5} \n\nคุณแน่ใจหรือไม่ว่าคุณต้องการถอนจำนวนเงินดังกล่าว
-dao.wallet.chainHeightSynced=ซิงโครไนซ์ไปยังบล็อก:{0} (บล็อกครั้งล่าสุด: {1})
-dao.wallet.chainHeightSyncing=ซิงโครไนซ์บล็อก:{0} (บล็อกครั้งล่าสุด: {1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=หมวด
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=การยืนยันล้ม
 displayUpdateDownloadWindow.success=ดาวน์โหลดเวอร์ชั่นใหม่เรียบร้อยแล้วและได้รับการยืนยันลายเซ็นแล้ว\n\nโปรดเปิดสารบบดาวน์โหลด  หลังจากนั้นปิดโปรแกรมและติดตั้งเวอร์ชั่นใหม่
 displayUpdateDownloadWindow.download.openDir=เปิดสารบบดาวน์โหลด
 
-disputeSummaryWindow.title=สรุป
+disputeสรุปWindow.title=สรุป
 disputeSummaryWindow.openDate=วันที่ยื่นการเปิดคำขอและความช่วยเหลือ
 disputeSummaryWindow.role=บทบาทของผู้ค้า
 disputeSummaryWindow.evidence=หลักฐาน
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=หนึ่งใน {0} โหนดถูกแบ
 popup.warning.priceRelay=ราคาผลัดเปลี่ยน
 popup.warning.seed=รหัสลับเพื่อกู้ข้อมูล
 
-popup.info.securityDepositInfo=เพื่อให้แน่ใจว่าทั้งคู่ค้าทำตามโปรโตคอลทางการค้า พวกเขาต้องจ่ายเงินประกัน\n\nเงินฝากจะอยู่ใน wallet ในประเทศของคุณจนกว่าข้อเสนอจะได้รับการยอมรับจากผู้ค้ารายอื่น\nคุณจะได้รับเงินคืนให้หลังจากการซื้อขายเสร็จสมบูรณ์แล้ว\n\nโปรดทราบว่าคุณต้องทำให้แอ็พพลิเคชั่นของคุณทำงานต่อไปถ้าคุณมีข้อเสนอแบบเปิด เมื่อผู้ค้าอื่นต้องการรับข้อเสนอของคุณ แอ็พพลิเคชั่นจำเป็นต้องออนไลน์เพื่อใช้โปรโตคอลการค้า\nตรวจสอบให้แน่ใจว่าคุณมีโหมดสแตนด์บายปิดการใช้งานอยู่เนื่องจากจะทำให้ระบบเครือข่ายหยุดชะงัก (สแตนด์บายของจอภาพไม่เป็นปัญหา)
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=โปรดตรวจสอบว่าคุณมีสาขาธนาคารในพื้นที่ของคุณเพื่อสามารถฝากเงินได้\nรหัสธนาคาร (BIC / SWIFT) ของธนาคารผู้ขายคือ: {0}
 popup.info.cashDepositInfo.confirm=ฉันยืนยันว่าฉันสามารถฝากเงินได้

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

@@ -193,6 +193,9 @@ shared.all=All
 shared.edit=Edit
 shared.advancedOptions=Advanced options
 shared.interval=Interval
+shared.actions=Actions
+shared.buyerUpperCase=Buyer
+shared.sellerUpperCase=Seller
 
 ####################################################################
 # UI views
@@ -533,7 +536,7 @@ portfolio.pending.step2_buyer.confirmStart.yes=是的,我已经开始付款
 portfolio.pending.step2_seller.waitPayment.headline=等待付款
 portfolio.pending.step2_seller.f2fInfo.headline=Buyer's contact information
 portfolio.pending.step2_seller.waitPayment.msg=存款交易至少有一个块链确认\n您需要等到BTC买家开始{0}付款。
-portfolio.pending.step2_seller.warn=BTC买家仍然没有完成{0}付款\n你需要等到他开始付款\n如果{1}交易尚未完成，仲裁员将进行调查。
+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=BTC买家尚未开始付款！\n最大 允许的交易期限已经过去了\n请联系仲裁员以争取解决纠纷。
 
 # suppress inspection "UnusedProperty"
@@ -718,7 +721,7 @@ funds.tx.noTxAvailable=没有可用交易
 funds.tx.revert=还原
 funds.tx.txSent=交易成功发送到本地Bisq钱包中的新地址。
 funds.tx.direction.self=内部钱包交易
-funds.tx.proposalTxFee=Miner fee for proposal
+funds.tx.daoTxFee=Miner fee for DAO tx
 funds.tx.reimbursementRequestTxFee=Reimbursement request
 funds.tx.compensationRequestTxFee=赔偿要求
 
@@ -762,9 +765,9 @@ support.buyerOfferer=BTC 买家/挂单者
 support.sellerOfferer=BTC 卖家/挂单者
 support.buyerTaker=BTC 买家/买单者
 support.sellerTaker=BTC 卖家/买单者
-support.backgroundInfo=Bisq is not a company and does not provide any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIf there is an issue with the application, the software will try to detect this and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade which causes the problem under \"Portfolio/Open trades\" and typing the key combination \"alt + o\" or \"option + o\". Please use that only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ at the bisq.network web page or post in the Bisq forum at the support section.
+support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display an \"Open dispute\" button after the trade period is over for contacting the arbitrator.\n\nIf there is an issue with the application, the software will try to detect it and, if possible, display an \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIf you are having an issue and did not see the \"Open support ticket\" button, you can open a support ticket manually by selecting the trade causing issues under \"Portfolio/Open trades\" and hitting \"alt + o\" or \"option + o\". Please use this method only if you are sure that the software is not working as expected. If you have problems or questions, please review the FAQ on the bisq.network web page or post in the Bisq forum in the Support section.
 
-support.initialInfo=请注意纠纷程序的基本规则：\n1.你需要在2天之内回复仲裁员的要求\n2.纠纷的最长期限为14天\n3.你需要履行仲裁员要求你提交你的案件的证据\n4.当您首次启动应用程序时，您已经在用户协议中接受了维基中列出的规则\n\n请详细阅读我们的wiki中的纠纷过程：\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
+support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrator's requests within 2 days.\n2. The maximum period for a dispute is 14 days.\n3. You need to cooperate with the arbitrator and provide the information they request to make your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
 support.systemMsg=系统消息: {0}
 support.youOpenedTicket=您创建了帮助请求
 support.youOpenedDispute=您创建了一个纠纷请求\n\n{0}
@@ -833,8 +836,8 @@ settings.net.useCustomNodesRadio=使用自定义比特币主节点
 settings.net.warn.usePublicNodes=If you use the public Bitcoin network you are exposed to a severe privacy problem caused by the broken bloom filter design and implementation which is used for SPV wallets like BitcoinJ (used in Bisq). Any full node you are connected to could find out that all your wallet addresses belong to one entity.\n\nPlease read more about the details at: https://bisq.network/blog/privacy-in-bitsquare.\n\nAre you sure you want to use the public nodes?
 settings.net.warn.usePublicNodes.useProvided=No, use provided nodes
 settings.net.warn.usePublicNodes.usePublic=使用公共网络
-settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which are not following the Bitcoin Core consensus rules could screw up your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any damage created by that. Disputes caused by that would be decided in favor of the other peer. No technical support will be given to users who ignore our warning and protection mechanisms!
-settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you get connected exclusively to that.)
+settings.net.warn.useCustomNodes.B2XWarning=Please be sure that your Bitcoin node is a trusted Bitcoin Core node!\n\nConnecting to nodes which do not follow the Bitcoin Core consensus rules could corrupt your wallet and cause problems in the trade process.\n\nUsers who connect to nodes that violate consensus rules are responsible for any resulting damage. Any resulting disputes will be decided in favor of the other peer. No technical support will be given to users who ignore this warning and protection mechanisms!
+settings.net.localhostBtcNodeInfo=(Background information: If you are running a local Bitcoin node (localhost) you can connect exclusively to it.)
 settings.net.p2PPeersLabel=Connected peers
 settings.net.onionAddressColumn=匿名地址
 settings.net.creationDateColumn=已建立连接
@@ -857,17 +860,17 @@ settings.net.inbound=数据包进入
 settings.net.outbound=数据包出口
 settings.net.reSyncSPVChainLabel=重新同步SPV链
 settings.net.reSyncSPVChainButton=删除SPV链文件并重新同步
-settings.net.reSyncSPVSuccess=SPV链文件已被删除。 您现在需要重新启动应用程序\n\n重新启动后，可能需要一段时间才能与网络重新同步，只有重新同步完成后才会看到所有的事务。\n\n请在重新同步完成后重新启动，因为有时会导致不平衡显示的不一致。
-settings.net.reSyncSPVAfterRestart=SPV链文件已被删除。 请耐心等待，与网络重新同步可能需要一段时间。
+settings.net.reSyncSPVSuccess=The SPV chain file will be deleted on the next startup. You need to restart your application now.\n\nAfter the restart it can take a while to resync with the network and you will only see all transactions once the resync is completed.\n\nPlease restart again after the resync has completed because there are sometimes inconsistencies that result in incorrect balances to display.
+settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please be patient. It can take a while to resync with the network.
 settings.net.reSyncSPVAfterRestartCompleted=重新同步刚刚完成，请重启应用程序。
 settings.net.reSyncSPVFailed=无法删除SPV链文件
 setting.about.aboutBisq=关于 Bisq
-setting.about.about=Bisq 是一个开源项目、去中心化、点对点交易、隐私保护的交易比特币与法定货币或其他数字货币。请到我们项目的网站阅读更多关于Bisq的信息。
+setting.about.about=Bisq is open-source software which facilitates the exchange of bitcoin with national currencies (and other cryptocurrencies) through a decentralized peer-to-peer network in a way that strongly protects user privacy. Learn more about Bisq on our project web page.
 setting.about.web=Bisq 网站
 setting.about.code=源代码
 setting.about.agpl=AGPL License
 setting.about.support=支持 Bisq
-setting.about.def=Bisq不是一个公司，而是一个社区项目，开放参与。 如果您想参与或支持Bisq，请点击下面连接。
+setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=贡献
 setting.about.donate=捐助
 setting.about.providers=数据提供商
@@ -889,7 +892,7 @@ setting.about.subsystems.val=网络版本: {0}; P2P 消息版本: {1}; 本地 DB
 account.tab.arbitratorRegistration=仲裁员注册
 account.tab.account=账户
 account.info.headline=欢迎来到 Bisq 账户
-account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\nAn empty Bitcoin wallet was created the first time you started Bisq.\nWe recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & Security:\nBisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
+account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators, and create a backup of your wallet & account data.\n\nA new Bitcoin wallet was created the first time you started Bisq.\n\nWe strongly recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\nPrivacy & security note: because Bisq is a decentralized exchange, all your data is kept on your computer. There are no servers, so we have no access to your personal info, your funds, or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 
 account.menu.paymentAccount=法定货币账户
 account.menu.altCoinsAccountView=数字货币账户
@@ -902,7 +905,7 @@ account.arbitratorRegistration.pubKey=Public key
 
 account.arbitratorRegistration.register=注册仲裁员
 account.arbitratorRegistration.revoke=撤销注册
-account.arbitratorRegistration.info.msg=请注意，撤销后需要保留15天，因为可能有交易正在使用你作为仲裁员。最大 允许的交易期限为8天，纠纷过程最多可能需要7天。
+account.arbitratorRegistration.info.msg=Please note that you need to stay available for 15 days after revoking as there might be trades which are using you as arbitrator. The max. allowed trade period is 8 days and the dispute process might take up to 7 days.
 account.arbitratorRegistration.warn.min1Language=您需要设置至少1种语言。\n我们已经为您添加了默认语言。
 account.arbitratorRegistration.removedSuccess=您已从 P2P 网络成功删除您的仲裁员。
 account.arbitratorRegistration.removedFailed=无法删除仲裁员:.{0}
@@ -921,7 +924,7 @@ account.arbitratorSelection.noLang=您可以选择至少说1种常规语言的
 account.arbitratorSelection.minOne=您至少需要选择一名仲裁员
 
 account.altcoin.yourAltcoinAccounts=Your altcoin accounts
-account.altcoin.popup.wallet.msg=请确保您按照{1}网页上所述使用{0}钱包的要求\n使用集中式交易所的钱包，您无法控制钥匙或使用不兼容的钱包软件可能会导致交易资金的流失！\n仲裁员不是{2}专家，在这种情况下不能帮助。
+account.altcoin.popup.wallet.msg=Please be sure that you follow the requirements for the usage of {0} wallets as described on the {1} web page.\nUsing wallets from centralized exchanges where (a) you don''t control your keys or (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=我了解并确定我知道我需要哪种钱包。
 account.altcoin.popup.xmr.msg=If you want to trade XMR on Bisq please be sure 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 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\nIf 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 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.blur.msg=If you want to trade BLUR on Bisq please be sure 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 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\nIf 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\nIf you do not understand these requirements, do not trade on Bisq. First, seek help at the Blur Network Discord (https://discord.gg/dMWaqVW).
@@ -949,14 +952,14 @@ account.password.removePw.button=移除密码
 account.password.removePw.headline=移除钱包的密码保护
 account.password.setPw.button=设置密码
 account.password.setPw.headline=设置钱包的密码保护
-account.password.info=使用密码保护，您需要在将比特币从钱包中取出时输入密码，或者要从还原密钥和应用程序启动时查看或恢复钱包。
+account.password.info=With password protection you'll need to enter your password at application startup, when withdrawing bitcoin out of your wallet, and when restoring your wallet from seed words.
 
 account.seed.backup.title=备份您的钱包还原密钥
-account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with those seed words and the date.\nThe seed words are used for both the BTC and the BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory at the \"Account/Backup\" screen to recover the valid application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
+account.seed.info=Please write down both wallet seed words and the date! You can recover your wallet any time with seed words and the date.\nThe same seed words are used for the BTC and BSQ wallet.\n\nYou should write down the seed words on a sheet of paper. Do not save them on your computer.\n\nPlease note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!
 account.seed.warn.noPw.msg=您还没有设置一个可以保护还原密钥显示的钱包密码\n\n要显示还原密钥吗？
 account.seed.warn.noPw.yes=是的,不要再问我
 account.seed.enterPw=输入密码查看还原密钥
-account.seed.restore.info=请注意，您不能从旧的 Bitsq 版本（0.5.0之前的任何版本）导入钱包，因为钱包格式已更改！\n\n如果您想将资金从旧版本转移到新的Bisq应用程序，请使用比特币交易发送\n\n还要注意，钱包还原仅适用于紧急情况，可能会导致内部钱包数据库出现问题。
+account.seed.restore.info=Please make a backup before applying restore from seed words. Be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\nIt is not a way for applying a backup! Please use a backup from the application data directory for restoring a previous application state.
 account.seed.restore.ok=好的,我了解并想要恢复
 
 
@@ -1433,6 +1436,8 @@ dao.proposal.display.option=Option
 
 dao.proposal.table.header.proposalType=提议类型
 dao.proposal.table.header.link=Link
+dao.proposal.table.header.myVote=My vote
+dao.proposal.table.header.remove=移除
 dao.proposal.table.icon.tooltip.removeProposal=Remove my proposal
 dao.proposal.table.icon.tooltip.changeVote=Current vote: ''{0}''. Change vote to: ''{1}''
 
@@ -1501,8 +1506,8 @@ dao.wallet.send.send=发送 BSQ 资金
 dao.wallet.send.sendBtc=Send BTC funds
 dao.wallet.send.sendFunds.headline=确定提现请求
 dao.wallet.send.sendFunds.details=发送: {0}\n来自: {1}\n要求的交易费: {2} ({3} 聪/byte)\n交易大小: {4} Kb\n\n收件人将收到: {5}\n\n您确定您想要提现这些数量吗？
-dao.wallet.chainHeightSynced=同步至块:{0}(最新块:{1})
-dao.wallet.chainHeightSyncing=同步块:{0}(最新块:{1})
+dao.wallet.chainHeightSynced=Latest verified block: {0}
+dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1}
 dao.wallet.tx.type=类型
 
 # suppress inspection "UnusedProperty"
@@ -1579,7 +1584,7 @@ displayUpdateDownloadWindow.verify.failed=验证失败。\n请到 https://bisq.i
 displayUpdateDownloadWindow.success=新版本成功下载并验证签名(s) 。\n\n请打开下载目录,关闭应用程序并安装最新版本。
 displayUpdateDownloadWindow.download.openDir=打开下载目录
 
-disputeSummaryWindow.title=概要
+dispute概要Window.title=概要
 disputeSummaryWindow.openDate=Ticket opening date
 disputeSummaryWindow.role=Trader's role
 disputeSummaryWindow.evidence=Evidence
@@ -1741,7 +1746,7 @@ popup.headline.error=错误
 popup.doNotShowAgain=不要再显示
 popup.reportError.log=打开日志文件
 popup.reportError.gitHub=报告至Github issue tracker
-popup.reportError={0}\n\nTo help us to improve the software please report the bug at our issue tracker at GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click the below buttons.\nIt will make debugging easier if you can attach the bisq.log file as well.
+popup.reportError={0}\n\nTo help us to improve the software please report the bug on our issue tracker on GitHub (https://github.com/bisq-network/bisq-desktop/issues).\nThe error message will be copied to the clipboard when you click a button below.\nIt will make debugging easier if you can attach the bisq.log file as well.
 
 popup.error.tryRestart=请尝试重启您的应用程序或者检查您的网络连接。
 popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
@@ -1778,7 +1783,7 @@ popup.warning.nodeBanned=One of the {0} nodes got banned. Please restart your ap
 popup.warning.priceRelay=price relay
 popup.warning.seed=种子
 
-popup.info.securityDepositInfo=为了确保两个交易者都遵守交易协议，他们需要支付保证金\n\n存款将留在您当地的交易钱包中，直到委托被另一个交易者下单\n交易成功完成后，您将退还给您\n\n请注意，如果您有未完成委托，您需要保持应用程序的运行。 当另一个交易者想要接受您的委托时，需要您的应用程序在线执行交易协议\n确保您的待机模式被取消，因为这将断开网络(显示器的待机状态不是问题)。
+popup.info.securityDepositInfo=To ensure both traders follow the trade protocol, both traders need to pay a security deposit.\n\nThis deposit is kept in your trade wallet until your trade has been successfully completed, and then it's refunded to you.\n\nPlease note: if you're creating a new offer, Bisq needs to be running for another trader to take it. To keep your offers online, keep Bisq running and make sure this computer remains online too (i.e., make sure it doesn't switch to standby mode...monitor standby is fine).
 
 popup.info.cashDepositInfo=Please be sure that you have a bank branch in your area to be able to make the cash deposit.\nThe bank ID (BIC/SWIFT) of the seller''s bank is: {0}.
 popup.info.cashDepositInfo.confirm=I confirm that I can make the deposit

core/src/test/java/bisq/core/dao/state/DaoStateSnapshotServiceTest.java

@@ -17,6 +17,8 @@
 
 package bisq.core.dao.state;
 
+import bisq.core.dao.governance.period.CycleService;
+
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -31,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 import static org.powermock.api.mockito.PowerMockito.mock;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({DaoStateService.class, GenesisTxInfo.class, DaoStateStorageService.class})
+@PrepareForTest({DaoStateService.class, GenesisTxInfo.class, CycleService.class, DaoStateStorageService.class})
 @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class DaoStateSnapshotServiceTest {
 
@@ -41,6 +43,7 @@ public class DaoStateSnapshotServiceTest {
     public void setup() {
         daoStateSnapshotService = new DaoStateSnapshotService(mock(DaoStateService.class),
                 mock(GenesisTxInfo.class),
+                mock(CycleService.class),
                 mock(DaoStateStorageService.class));
     }
 

core/update_translations.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 cd $(dirname $0)
-tx pull -l de,el_GR,es,hu_HU,pt_BR,ro,ru,sr,zh_CN,vi,th_TH,fa
+tx pull -l de,el_GR,es,hu_HU,pt_BR,ro,ru,sr,zh_CN,vi,th_TH,fa,fr
 
 translations="translations/bisq-desktop.displaystringsproperties"
 i18n="src/main/resources/i18n"
@@ -18,5 +18,6 @@ mv "$translations/zh_CN.properties" "$i18n/displayStrings_zh.properties"
 mv "$translations/vi.properties" "$i18n/displayStrings_vi.properties"
 mv "$translations/th_TH.properties" "$i18n/displayStrings_th.properties"
 mv "$translations/fa.properties" "$i18n/displayStrings_fa.properties"
+mv "$translations/fr.properties" "$i18n/displayStrings_fr.properties"
 
 rm -rf $translations

desktop/package/linux/64bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 set -e
 
 # Edit version
-version=0.9.0
+version=0.9.1
 
 sharedDir="/media/sf_vm_shared_ubuntu"
 

desktop/package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.9.0
+ENV version 0.9.1
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

desktop/package/linux/rpm.sh

@@ -2,7 +2,7 @@
 
 ## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261
 
-version=0.9.0
+version=0.9.1
 
 alien -r -g /home/$USER/Desktop/Bisq-64bit-$version.deb
 find bisq-$version -type f | while read LIB; do LDDOUT=$(ldd $LIB 2>&1); LDDRETVAL=$?;if [ \( -z "${LDDOUT%%*you do not have execution permission for*}" \) -a \( $LDDRETVAL -eq 0 \) ]; then chmod -v +x $LIB;fi;done

desktop/package/macosx/Info.plist

@@ -5,10 +5,10 @@
         <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
 
         <key>CFBundleVersion</key>
-        <string>0.9.0</string>
+        <string>0.9.1</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>0.9.0</string>
+        <string>0.9.1</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>

desktop/package/macosx/create_app.sh

@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="0.9.0"
+version="0.9.1"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar

desktop/package/macosx/finalize.sh

@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="0.9.0"
+version="0.9.1"
 
 target_dir="releases/$version"
 
@@ -36,7 +36,7 @@ cp "$macOS/$dmg" "$target_dir/"
 deb64="Bisq-64bit-$version.deb"
 cp "$linux64/$deb64" "$target_dir/"
 
-exe="Bisq-$version.exe"
+exe="Bisq.exe"
 exe64="Bisq-64bit-$version.exe"
 cp "$win64/$exe" "$target_dir/$exe64"
 
@@ -52,7 +52,6 @@ gpg --digest-algo SHA256 --verify $dmg{.asc*,}
 gpg --digest-algo SHA256 --verify $deb64{.asc*,}
 gpg --digest-algo SHA256 --verify $exe64{.asc*,}
 
-#mkdir ../../build/vm/vm_shared_windows_32bit/$version
 cp -r . $win64/$version
 
 open "."

desktop/package/windows/64bitBuild.bat

@@ -5,12 +5,14 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.9.0
+cd ../../
+
+SET version=0.9.1
 
 :: Private setup
-SET outdir=\\VBOXSVR\vm_shared_windows
+::SET outdir=\\VBOXSVR\vm_shared_windows
 :: Others might use the following
-:: SET outdir=.
+SET outdir=.
 
 call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^
 -BappVersion="%version%" ^

desktop/package/windows/Bisq.iss

@@ -1,13 +1,14 @@
 ;This file will be executed next to the application bundle image
 ;I.e. current directory will contain folder Bisq with application files
 [Setup]
+
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.9.0
+AppVersion=0.9.1
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq
-AppCopyright=Copyright (C) 2016
+AppCopyright=Copyright (C) 2018
 AppPublisherURL=https://bisq.network
 AppSupportURL=https://bisq.network
 ;AppUpdatesURL=http://java.com/
@@ -29,7 +30,7 @@ SolidCompression=yes
 PrivilegesRequired=lowest
 SetupIconFile=Bisq\Bisq.ico
 UninstallDisplayIcon={app}\Bisq.ico
-UninstallDisplayName=Bisq
+UninstallDisplayName=Bisq
 WizardImageStretch=No
 WizardSmallImageFile=Bisq-setup-icon.bmp
 ArchitecturesInstallIn64BitMode=x64
@@ -64,6 +65,96 @@ begin
   Result := False;
 end;
 
+procedure DirectoryCopy(SourcePath, DestPath: string);
+var
+  FindRec: TFindRec;
+  SourceFilePath: string;
+  DestFilePath: string;
+begin
+  if FindFirst(SourcePath + '\*', FindRec) then
+  begin
+    try
+      repeat
+        if (FindRec.Name <> '.') and (FindRec.Name <> '..') then
+        begin
+          SourceFilePath := SourcePath + '\' + FindRec.Name;
+          DestFilePath := DestPath + '\' + FindRec.Name;
+          if FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY = 0 then
+          begin
+            if FileCopy(SourceFilePath, DestFilePath, False) then
+            begin
+              Log(Format('Copied %s to %s', [SourceFilePath, DestFilePath]));
+            end
+              else
+            begin
+              Log(Format('Failed to copy %s to %s', [SourceFilePath, DestFilePath]));
+            end;
+          end
+            else
+          begin
+            if DirExists(DestFilePath) or CreateDir(DestFilePath) then
+            begin
+              Log(Format('Created %s', [DestFilePath]));
+              DirectoryCopy(SourceFilePath, DestFilePath);
+            end
+              else
+            begin
+              Log(Format('Failed to create %s', [DestFilePath]));
+            end;
+          end;
+        end;
+      until not FindNext(FindRec);
+    finally
+      FindClose(FindRec);
+    end;
+  end
+    else
+  begin
+    Log(Format('Failed to list %s', [SourcePath]));
+  end;
+end;
+
+//Delete old app directory to prevent issues during update
+procedure DeleteOldAppDataDirectory;
+var
+  entry: String;
+begin
+  entry := ExpandConstant('{localappdata}') + '\Bisq\';
+  if DirExists(entry) then begin
+    DelTree(entry, true, true, true);
+  end
+end;
+
+procedure DeleteTorFiles;
+var
+  mainnetDir: String;
+  torDir: String;
+  hiddenServiceDir: String;
+  hiddenServiceBackupDir : String;
+begin
+  mainnetDir := ExpandConstant('{userappdata}') + '\Bisq\btc_mainnet';
+  torDir := mainnetDir + '\tor\*';
+  hiddenServiceDir := mainnetDir + '\tor\hiddenservice';
+  hiddenServiceBackupDir := mainnetDir + '\hiddenservice_backup';
+  if DirExists(hiddenServiceDir) then begin
+   if DirExists(hiddenServiceBackupDir) then begin
+     DelTree(hiddenServiceBackupDir, true, true, true);
+   end
+   CreateDir(hiddenServiceBackupDir);
+   DirectoryCopy(hiddenServiceDir, hiddenServiceBackupDir);
+   DelTree(torDir, false, true, true);
+   CreateDir(hiddenServiceDir);
+   DirectoryCopy(hiddenServiceBackupDir, hiddenServiceDir);
+  end
+end;
+
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+begin
+  DeleteOldAppDataDirectory;
+  DeleteTorFiles;
+  Result := '';
+end;
+
 function InitializeSetup(): Boolean;
 begin
 // Possible future improvements:

desktop/src/main/java/bisq/desktop/components/MenuItem.java

@@ -130,7 +130,7 @@ public class MenuItem extends JFXButton implements Toggle {
     }
 
     public void setLabelText(String value) {
-        setText(value);
+        setText(value.toUpperCase());
     }
 
 

desktop/src/main/java/bisq/desktop/main/account/AccountView.java

@@ -100,6 +100,8 @@ public class AccountView extends ActivatableView<TabPane, Void> {
                     navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
                 else
                     loadView(viewPath.tip());
+            } else {
+                resetSelectedTab();
             }
         };
 
@@ -115,22 +117,20 @@ public class AccountView extends ActivatableView<TabPane, Void> {
         };
 
         tabChangeListener = (ov, oldValue, newValue) -> {
-            if (arbitratorRegistrationTab != null) {
+            if (arbitratorRegistrationTab != null && selectedTab != arbitratorRegistrationTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class);
-            } else if (newValue == fiatAccountsTab) {
+            } else if (newValue == fiatAccountsTab && selectedTab != fiatAccountsTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
-            } else if (newValue == altcoinAccountsTab) {
+            } else if (newValue == altcoinAccountsTab && selectedTab != altcoinAccountsTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, AltCoinAccountsView.class);
-            } else if (newValue == notificationTab) {
+            } else if (newValue == notificationTab && selectedTab != notificationTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, MobileNotificationsView.class);
-            } else if (newValue == passwordTab) {
+            } else if (newValue == passwordTab && selectedTab != passwordTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, PasswordView.class);
-            } else if (newValue == seedwordsTab) {
+            } else if (newValue == seedwordsTab && selectedTab != seedwordsTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, SeedWordsView.class);
-            } else if (newValue == backupTab) {
+            } else if (newValue == backupTab && selectedTab != backupTab) {
                 navigation.navigateTo(MainView.class, AccountView.class, BackupView.class);
-            } else {
-                navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
             }
         };
 
@@ -202,13 +202,7 @@ public class AccountView extends ActivatableView<TabPane, Void> {
     private void loadView(Class<? extends View> viewClass) {
         View view = viewLoader.load(viewClass);
 
-        if (selectedTab != null && selectedTab.getContent() != null) {
-            if (selectedTab.getContent() instanceof ScrollPane) {
-                ((ScrollPane) selectedTab.getContent()).setContent(null);
-            } else {
-                selectedTab.setContent(null);
-            }
-        }
+        resetSelectedTab();
 
         if (view instanceof ArbitratorRegistrationView) {
             if (arbitratorRegistrationTab != null) {
@@ -239,4 +233,14 @@ public class AccountView extends ActivatableView<TabPane, Void> {
         }
         root.getSelectionModel().select(selectedTab);
     }
+
+    private void resetSelectedTab() {
+        if (selectedTab != null && selectedTab.getContent() != null) {
+            if (selectedTab.getContent() instanceof ScrollPane) {
+                ((ScrollPane) selectedTab.getContent()).setContent(null);
+            } else {
+                selectedTab.setContent(null);
+            }
+        }
+    }
 }

desktop/src/main/java/bisq/desktop/main/dao/DaoView.java

@@ -40,6 +40,7 @@ import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 
@@ -136,6 +137,15 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
     }
 
     private void loadView(Class<? extends View> viewClass) {
+
+        if (selectedTab != null && selectedTab.getContent() != null) {
+            if (selectedTab.getContent() instanceof ScrollPane) {
+                ((ScrollPane) selectedTab.getContent()).setContent(null);
+            } else {
+                selectedTab.setContent(null);
+            }
+        }
+
         View view = viewLoader.load(viewClass);
         if (view instanceof BsqWalletView) {
             selectedTab = bsqWalletTab;

desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java

@@ -701,21 +701,14 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements D
             public TableCell<ProposalListItem, ProposalListItem> call(TableColumn<ProposalListItem,
                     ProposalListItem> column) {
                 return new TableCell<>() {
-                    Label myVoteIcon;
-
                     @Override
                     public void updateItem(final ProposalListItem item, boolean empty) {
                         super.updateItem(item, empty);
 
                         if (item != null && !empty) {
-                            if (myVoteIcon == null) {
-                                myVoteIcon = item.getMyVoteIcon();
-                                setGraphic(myVoteIcon);
-                            }
+                            setGraphic(item.getMyVoteIcon());
                         } else {
                             setGraphic(null);
-                            if (myVoteIcon != null)
-                                myVoteIcon = null;
                         }
                     }
                 };
@@ -734,21 +727,17 @@ public class VoteResultView extends ActivatableView<GridPane, Void> implements D
             public TableCell<ProposalListItem, ProposalListItem> call(TableColumn<ProposalListItem,
                     ProposalListItem> column) {
                 return new TableCell<>() {
-                    Label icon;
-
                     @Override
                     public void updateItem(final ProposalListItem item, boolean empty) {
                         super.updateItem(item, empty);
 
                         if (item != null && !empty) {
-                            icon = new Label();
+                            Label icon = new Label();
                             AwesomeDude.setIcon(icon, item.getIcon());
                             icon.getStyleClass().add(item.getColorStyleClass());
                             setGraphic(icon);
                         } else {
                             setGraphic(null);
-                            if (icon != null)
-                                icon = null;
                         }
                     }
                 };

desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java

@@ -797,6 +797,11 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
                 inputIsMarketBasedPrice = true;
             }
         marketPriceMargin.set(btcFormatter.formatRoundedDoubleWithPrecision(dataModel.getMarketPriceMargin() * 100, 2));
+
+        // We want to trigger a recalculation of the volume
+        UserThread.execute(() -> {
+            onFocusOutVolumeTextField(true, false);
+        });
     }
 
     void onFocusOutVolumeTextField(boolean oldValue, boolean newValue) {

desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java

@@ -133,7 +133,7 @@ public class ContractWindow extends Overlay<ContractWindow> {
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.tradeAmount"),
                 formatter.formatCoinWithCode(contract.getTradeAmount()));
         addConfirmationLabelLabel(gridPane, ++rowIndex, formatter.formatVolumeLabel(currencyCode, ":"),
-                formatter.formatVolumeWithCode(contract.getTradePrice().getVolumeByAmount(contract.getTradeAmount())));
+                formatter.formatVolumeWithCode(contract.getTradeVolume()));
         String securityDeposit = Res.getWithColAndCap("shared.buyer") +
                 " " +
                 formatter.formatCoinWithCode(offer.getBuyerSecurityDeposit()) +

desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java

@@ -267,7 +267,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.tradePrice"),
                 formatter.formatPrice(contract.getTradePrice()));
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.tradeVolume"),
-                formatter.formatVolumeWithCode(contract.getTradePrice().getVolumeByAmount(contract.getTradeAmount())));
+                formatter.formatVolumeWithCode(contract.getTradeVolume()));
     }
 
     private void addCheckboxes() {

desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java

@@ -77,7 +77,7 @@ public class TacWindow extends Overlay<TacWindow> {
                 "3. The " + Res.getBaseCurrencyName() + " market price is delivered by 3rd parties (BitcoinAverage, Poloniex, Coinmarketcap). " +
                 "It is your responsibility to verify the price with other sources for correctness.\n\n" +
 
-                "4. Any Fiat payment method carries a potential risk for bank chargeback. By accepting the \"User Agreement\" the users confirms " +
+                "4. Any Fiat payment method carries a potential risk for bank chargeback. By accepting the \"User Agreement\" the user confirms " +
                 "to be aware of those risks and in no case will claim legal responsibility to the authors or copyright holders of the software.\n\n" +
 
                 "5. Any dispute, controversy or claim arising out of or relating to the use of the software shall be settled by arbitration in " +
@@ -87,7 +87,7 @@ public class TacWindow extends Overlay<TacWindow> {
                 "6. The user confirms that he has 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" +
+                "    - If the bank of the fiat sender charges fees, the sender (" + Res.getBaseCurrencyCode() + " buyer) has to cover the fees.\n" +
                 "    - You must cooperate with the arbitrator during the arbitration process.\n" +
                 "    - You must reply within 48 hours to each arbitrator inquiry.\n" +
                 "    - Failure to follow the above requirements may result in loss of your security deposit.\n\n" +

desktop/src/main/java/bisq/desktop/util/GUIUtil.java

@@ -813,10 +813,18 @@ public class GUIUtil {
         int maxHeight = rowHeight * maxNumRows + headerHeight;
         checkArgument(maxHeight >= minHeight, "maxHeight cannot be smaller as minHeight");
         int height = Math.min(maxHeight, Math.max(minHeight, size * rowHeight + headerHeight));
-        tableView.setMaxHeight(-1);
-        tableView.setMinHeight(-1);
-        tableView.setMaxHeight(height);
-        tableView.setMinHeight(height);
+
+        tableView.setPrefHeight(-1);
+        tableView.setVisible(false);
+        // We need to delay the setter to the next render frame as otherwise views don' get updated in some cases
+        // Not 100% clear what causes that issue, but seems the requestLayout method is not called otherwise.
+        // We still need to set the height immediately, otherwise some views render a incorrect layout.
+        tableView.setPrefHeight(height);
+
+        UserThread.execute(() -> {
+            tableView.setPrefHeight(height);
+            tableView.setVisible(true);
+        });
     }
 
     public static Tuple2<ComboBox<TradeCurrency>, Integer> addRegionCountryTradeCurrencyComboBoxes(GridPane gridPane,

desktop/src/test/java/bisq/desktop/MarketsPrintTool.java

@@ -0,0 +1,79 @@
+/*
+ * 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.desktop;
+
+import bisq.core.locale.CryptoCurrency;
+import bisq.core.locale.CurrencyUtil;
+import bisq.core.locale.FiatCurrency;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+public class MarketsPrintTool {
+
+    public static void main(String[] args) {
+        // Prints out all coins in the format used in the market_currency_selector.html.
+        // Run that and copy paste the result to the market_currency_selector.html at new releases.
+        StringBuilder sb = new StringBuilder();
+        Locale.setDefault(new Locale("en", "US"));
+
+        // <option value="onion_btc">DeepOnion (ONION)</option>
+        // <option value="btc_bhd">Bahraini Dinar (BHD)</option>
+
+        final List<FiatCurrency> allSortedFiatCurrencies = CurrencyUtil.getAllSortedFiatCurrencies();
+        final Stream<MarketCurrency> fiatStream = allSortedFiatCurrencies.stream()
+                .filter(e -> !e.getCurrency().getCurrencyCode().equals("BSQ"))
+                .filter(e -> !e.getCurrency().getCurrencyCode().equals("BTC"))
+                .map(e -> new MarketCurrency("btc_" + e.getCode().toLowerCase(), e.getName(), e.getCode()))
+                .distinct();
+
+        final List<CryptoCurrency> allSortedCryptoCurrencies = CurrencyUtil.getAllSortedCryptoCurrencies();
+        final Stream<MarketCurrency> cryptoStream = allSortedCryptoCurrencies.stream()
+                .filter(e -> !e.getCode().equals("BSQ"))
+                .filter(e -> !e.getCode().equals("BTC"))
+                .map(e -> new MarketCurrency(e.getCode().toLowerCase() + "_btc", e.getName(), e.getCode()))
+                .distinct();
+
+        Stream.concat(fiatStream, cryptoStream)
+                .sorted(Comparator.comparing(o -> o.currencyName.toLowerCase()))
+                .distinct()
+                .forEach(e -> sb.append("<option value=\"")
+                        .append(e.marketSelector)
+                        .append("\">")
+                        .append(e.currencyName)
+                        .append(" (")
+                        .append(e.currencyCode)
+                        .append(")</option>")
+                        .append("\n"));
+        System.out.println(sb.toString());
+    }
+
+    private static class MarketCurrency {
+        final String marketSelector;
+        final String currencyName;
+        final String currencyCode;
+
+        MarketCurrency(String marketSelector, String currencyName, String currencyCode) {
+            this.marketSelector = marketSelector;
+            this.currencyName = currencyName;
+            this.currencyCode = currencyCode;
+        }
+    }
+}

desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java

@@ -405,6 +405,7 @@ public class OfferBookViewModelTest {
         assertEquals(10, model.maxPlacesForMarketPriceMargin.intValue()); //" (-10.00%)"
     }
 
+    @Ignore
     @Test
     public void testGetPrice() {
         OfferBook offerBook = mock(OfferBook.class);

desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java

@@ -34,6 +34,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -179,6 +180,7 @@ public class BSFormatterTest {
         assertEquals("0.1000 - 0.2000", formatter.formatAmount(offer, 4, true, 15));
     }
 
+    @Ignore
     @Test
     public void testFormatAmountWithAlignmenWithDecimalsNoRange() {
         OfferPayload offerPayload = mock(OfferPayload.class);

gradle/witness/gradle-witness.gradle

@@ -10,6 +10,7 @@
 // 4. Commit the changes
 //
 // See https://github.com/signalapp/gradle-witness#using-witness for further details.
+
 dependencyVerification {
     verify = [
         'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',
@@ -21,8 +22,8 @@ dependencyVerification {
         'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2',
         'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
         'com.jfoenix:jfoenix:4739e37a05e67c3bc9d5b391a1b93717b5a48fa872992616b0964d3f827f8fe6',
-        'com.github.JesusMcCloud.netlayer:tor.native:f1bf0096f9eb6020645a65d91aa530d15aef97e69cc5a79d7b2405421f74700a',
-        'com.github.JesusMcCloud.netlayer:tor.external:cfba681398c191a1906d6d023a3be28a8fa9b1f4eee52e966daf7b1ae630414f',
+        'com.github.JesusMcCloud.netlayer:tor.native:1f44272868c8123f918f7cdc7c9a6e14cb4c11b19437058ad3d1164c03954e0a',
+        'com.github.JesusMcCloud.netlayer:tor.external:a01707144f3ffdb62faacec8263cda0a6e2ecfb241b6b1b54626bed7cd161a4a',
         'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
         'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
         'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
@@ -43,7 +44,7 @@ dependencyVerification {
         'com.google.code.findbugs:jsr305:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
         'com.google.guava:guava:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8',
         'com.google.inject:guice:9b9df27a5b8c7864112b4137fd92b36c3f1395bfe57be42fedf2f520ead1a93e',
-        'com.github.JesusMcCloud.netlayer:tor:ac8465b7dda30ea920ec31a6bde42df7e88bee0282e805ce2797628938e3cf0b',
+        'com.github.JesusMcCloud.netlayer:tor:d377bd3f85a5c6d0a2123d5d9bead810ad3a6de6464775c793e8276155ec1f1d',
         'org.jetbrains.kotlin:kotlin-stdlib-jdk8:193ab7813e4d249f2ea4fc1b968fea8c2126bcbeeb5d6127050ce1b93dbaa7c2',
         'io.github.microutils:kotlin-logging:4992504fd3c6ecdf9ed10874b9508e758bb908af9e9d7af19a61e9afb6b7e27a',
         'org.jetbrains.kotlin:kotlin-stdlib-jdk7:877b59bbe466b24a88275a71fd06cd97359d2085420f6f1ac1d766afa8116001',
@@ -55,10 +56,10 @@ dependencyVerification {
         'org.bouncycastle:bcprov-jdk15on:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
         'com.google.zxing:javase:0ec23e2ec12664ddd6347c8920ad647bb3b9da290f897a88516014b56cc77eb9',
         'com.nativelibs4java:bridj:101bcd9b6637e6bc16e56deb3daefba62b1f5e8e9e37e1b3e56e3b5860d659cf',
-        'com.cedricwalter:tor-binary-macos:64dc92c6ff5c6d006583850346ffee67cff0013a8cd34a95376c1918355ee710',
-        'com.cedricwalter:tor-binary-linux32:8573a18f531e013c7162209eca81404aaf7d1d3b3ab6baeac15c7fae927edd20',
-        'com.cedricwalter:tor-binary-linux64:b61d5f9ffb2a62b20923ebed9f7558648f23eab2a1c7a805eb3cf32bc30de8d8',
-        'com.cedricwalter:tor-binary-windows:04f7a5c794c291da6335cf5b8324bf9d8ecebaaf56fbb728fa28e661fe6184fc',
+        'com.github.JesusMcCloud.tor-binary:tor-binary-macos:d143904dee93952576b12afb3c255ffce1b4eb0f8c85b0078c753b5f57fa1d07',
+        'com.github.JesusMcCloud.tor-binary:tor-binary-linux32:e863b9e37416890825a80f769ed507b203d0bcc3234aa9922d3f801bdf08987b',
+        'com.github.JesusMcCloud.tor-binary:tor-binary-linux64:936bdc1f9e145fbd625766f79d30761529303badd055e69e7bc0d27fcd771e7b',
+        'com.github.JesusMcCloud.tor-binary:tor-binary-windows:db2a7af40ded2ccaa12dad26cc301f082bb148322b15ec0155662510609fddfa',
         'com.github.ravn:jsocks:3c71600af027b2b6d4244e4ad14d98ff2352a379410daebefff5d8cd48d742a4',
         'org.apache.httpcomponents:httpcore:d7f853dee87680b07293d30855b39b9eb56c1297bd16ff1cd6f19ddb8fa745fb',
         'commons-codec:commons-codec:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
@@ -67,8 +68,8 @@ dependencyVerification {
         'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
         'com.lambdaworks:scrypt:9a82d218099fb14c10c0e86e7eefeebd8c104de920acdc47b8b4b7a686fb73b4',
         'com.google.zxing:core:11aae8fd974ab25faa8208be50468eb12349cd239e93e7c797377fa13e381729',
-        'com.cedricwalter:tor-binary-geoip:514042e5db788d9313554b61adb5994d7f5b283f0de0871d17eaf401bd78b593',
-        'com.github.JesusMcCloud:jtorctl:ba71601cbe50474ccc39a17bc6f7880c1412d8d19b94d37aee69ea2917f72046',
+        'com.github.JesusMcCloud.tor-binary:tor-binary-geoip:7340d4a0007b822b2f149e7360cd22443a5976676754bfaad0b8c48858475d5f',
+        'com.github.JesusMcCloud:jtorctl:274dfe462fa24d3e0a0f21c0a2cb87f121932378c221503c730c130734b041bb',
         'org.apache.commons:commons-compress:5f2df1e467825e4cac5996d44890c4201c000b43c0b23cffc0782d28a0beb9b0',
         'org.tukaani:xz:a594643d73cc01928cf6ca5ce100e094ea9d73af760a5d4fb6b75fa673ecec96',
         'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',

p2p/src/main/java/bisq/network/p2p/network/NewTor.java

@@ -47,21 +47,12 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class NewTor extends TorMode {
 
-    /**
-     * <code>Netlayer</code> stores its hidden service files in a custom
-     * subdirectory of <code>$torDir/hiddenservice/</code>. Note that the
-     * {@link HiddenServiceSocket} does add this part on its own, hence,
-     * {@link NewTor#getHiddenServiceDirectory()} returns only the custom
-     * subdirectory (which happens to be <code>""</code>)
-     */
-    private static final String HIDDEN_SERVICE_DIRECTORY = "hiddenservice";
-
     private final String torrcFile;
     private final String torrcOptions;
     private final Collection<String> bridgeEntries;
 
     public NewTor(File torWorkingDirectory, String torrcFile, String torrcOptions, Collection<String> bridgeEntries) {
-        super(torWorkingDirectory, HIDDEN_SERVICE_DIRECTORY);
+        super(torWorkingDirectory);
         this.torrcFile = torrcFile;
         this.torrcOptions = torrcOptions;
         this.bridgeEntries = bridgeEntries;

p2p/src/main/java/bisq/network/p2p/network/RunningTor.java

@@ -40,7 +40,6 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class RunningTor extends TorMode {
 
-    private static final String EXTERNAL_TOR_HIDDEN_SERVICE = "externalTorHiddenService";
     private final int controlPort;
     private final String password;
     private final File cookieFile;
@@ -49,7 +48,7 @@ public class RunningTor extends TorMode {
 
     public RunningTor(final File torDir, final int controlPort, final String password, final String cookieFile,
             final boolean useSafeCookieAuthentication) {
-        super(torDir, EXTERNAL_TOR_HIDDEN_SERVICE);
+        super(torDir);
         this.controlPort = controlPort;
         this.password = password;
         this.cookieFile = new File(cookieFile);
@@ -81,7 +80,7 @@ public class RunningTor extends TorMode {
 
     @Override
     public String getHiddenServiceDirectory() {
-        return new File(torDir, EXTERNAL_TOR_HIDDEN_SERVICE).getAbsolutePath();
+        return new File(torDir, HIDDEN_SERVICE_DIRECTORY).getAbsolutePath();
     }
 
 }

p2p/src/main/java/bisq/network/p2p/network/TorMode.java

@@ -35,11 +35,11 @@ import bisq.common.storage.FileUtil;
 public abstract class TorMode {
 
     /**
-     * The directory where the <code>private_key</code> file sits in. Kept private,
-     * because it is only valid for the {@link TorMode#doRollingBackup()} due to the
-     * inner workings of the <code>Netlayer</code> dependency.
+     * The sub-directory where the <code>private_key</code> file sits in. Kept
+     * private, because it only concerns implementations of {@link TorMode}.
      */
-    private final File hiddenServiceDirectory;
+    protected static final String HIDDEN_SERVICE_DIRECTORY = "hiddenservice";
+
     protected final File torDir;
 
     /**
@@ -51,9 +51,8 @@ public abstract class TorMode {
      *                         necessarily equal
      *                         {@link TorMode#getHiddenServiceDirectory()}.
      */
-    public TorMode(File torDir, String hiddenServiceDir) {
+    public TorMode(File torDir) {
         this.torDir = torDir;
-        this.hiddenServiceDirectory = new File(torDir, hiddenServiceDir);
     }
 
     /**
@@ -70,9 +69,9 @@ public abstract class TorMode {
      * other stuff to the hiddenServiceDir, thus, selecting nothing (i.e.
      * <code>""</code>) as a hidden service directory is fine. {@link ExternalTor},
      * however, does not have a Tor installation path and thus, takes the hidden
-     * service path literally. Hence, we set
-     * <code>"torDir/externalTorHiddenService"</code> as the hidden service
-     * directory.
+     * service path literally. Hence, we set <code>"torDir/hiddenservice"</code> as
+     * the hidden service directory. By doing so, we use the same
+     * <code>private_key</code> file as in {@link NewTor} mode.
      * 
      * @return <code>""</code> in {@link NewTor} Mode,
      *         <code>"torDir/externalTorHiddenService"</code> in {@link RunningTor}
@@ -84,7 +83,7 @@ public abstract class TorMode {
      * Do a rolling backup of the "private_key" file.
      */
     protected void doRollingBackup() {
-        FileUtil.rollingBackup(hiddenServiceDirectory, "private_key", 20);
+        FileUtil.rollingBackup(new File(torDir, HIDDEN_SERVICE_DIRECTORY), "private_key", 20);
     }
 
 }

relay/src/main/resources/version.txt

@@ -1 +1 @@
-0.9.0
+0.9.1

scripts/install_java.bat

@@ -1,6 +1,6 @@
 @echo off
 
-::Ensure we have administrative privileges in order to install files and set environment variables
+:: Ensure we have administrative privileges in order to install files and set environment variables
 >nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
 if '%errorlevel%' == '0' (
     ::If no error is encountered, we have administrative privileges
@@ -30,7 +30,7 @@ if exist "%PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%" (
 
 echo Downloading required files to %TEMP%
 powershell -Command "Invoke-WebRequest %jdk_url% -OutFile $env:temp\%jdk_filename%.tar.gz"
-::Download 7zip (command line version) in order to extract the tar.gz file since there is no native support in Windows
+:: Download 7zip (command line version) in order to extract the tar.gz file since there is no native support in Windows
 powershell -Command "Invoke-WebRequest https://www.7-zip.org/a/7za920.zip -OutFile $env:temp\7za920.zip"
 powershell -Command "Expand-Archive $env:temp\7za920.zip -DestinationPath $env:temp\7za920 -Force"
 
@@ -49,8 +49,9 @@ del /Q %TEMP%\%jdk_filename%.tar.gz
 
 :SetEnvVars
 echo Setting environment variables
-setx /M JAVA_HOME "%PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%"
+powershell -Command "[Environment]::SetEnvironmentVariable('JAVA_HOME', '%PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%', 'Machine')"
 set java_bin=%%JAVA_HOME%%\bin
-echo %PATH%|find /i "%java_bin%">nul  || setx /M PATH "%PATH%;%java_bin%"
+echo %PATH%|find /i "%java_bin%">nul || powershell -Command "[Environment]::SetEnvironmentVariable('PATH', '%PATH%;%java_bin%', 'Machine')"
 
+echo Done!
 pause

seednode/src/main/java/bisq/seednode/SeedNodeMain.java

@@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class SeedNodeMain extends ExecutableForAppWithP2p {
-    private static final String VERSION = "0.9.0";
+    private static final String VERSION = "0.9.1";
     private SeedNode seedNode;
 
     public SeedNodeMain() {