From 2fd5f402392a62b10e50e3ba4fa96607fdcd229e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 May 2021 17:19:38 +0200 Subject: [PATCH 01/15] Reduce the number of connected BTC nodes from 9 to 7 --- .../src/main/java/bisq/common/config/Config.java | 3 ++- .../core/btc/nodes/BtcNodesSetupPreferences.java | 9 +++++++-- .../java/bisq/core/btc/setup/WalletsSetup.java | 3 ++- .../btc/nodes/BtcNodesSetupPreferencesTest.java | 6 ++++-- .../main/settings/network/NetworkSettingsView.java | 14 +++++++++++++- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java index bc21c70a131..2ed6f26081f 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/bisq/common/config/Config.java @@ -129,7 +129,8 @@ public class Config { // Default values for certain options public static final int UNSPECIFIED_PORT = -1; public static final String DEFAULT_REGTEST_HOST = "localhost"; - public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC = 9; // down from BitcoinJ default of 12 + public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC = 7; // down from BitcoinJ default of 12 + public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC = 9; public static final boolean DEFAULT_FULL_DAO_NODE = false; static final String DEFAULT_CONFIG_FILE_NAME = "bisq.properties"; diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java b/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java index 7f5bfe27b4d..409ef5a3d07 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java +++ b/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java @@ -22,6 +22,8 @@ import bisq.common.config.Config; import bisq.common.util.Utilities; +import javax.inject.Named; + import java.util.Collections; import java.util.List; import java.util.Set; @@ -34,9 +36,12 @@ public class BtcNodesSetupPreferences { private static final Logger log = LoggerFactory.getLogger(BtcNodesSetupPreferences.class); private final Preferences preferences; + private final int numConnectionsForBtc; - public BtcNodesSetupPreferences(Preferences preferences) { + public BtcNodesSetupPreferences(Preferences preferences, + int numConnectionsForBtc) { this.preferences = preferences; + this.numConnectionsForBtc = numConnectionsForBtc; } public List selectPreferredNodes(BtcNodes nodes) { @@ -83,7 +88,7 @@ public int calculateMinBroadcastConnections(List nodes) { break; case PUBLIC: // We keep the empty nodes - result = (int) Math.floor(Config.DEFAULT_NUM_CONNECTIONS_FOR_BTC * 0.8); + result = (int) Math.floor(numConnectionsForBtc * 0.8); break; case PROVIDED: default: diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java index e6cba879a66..db7996d154d 100644 --- a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java @@ -396,7 +396,8 @@ private void configPeerNodesForRegTestServer() { } private void configPeerNodes(@Nullable Socks5Proxy proxy) { - BtcNodesSetupPreferences btcNodesSetupPreferences = new BtcNodesSetupPreferences(preferences); + BtcNodesSetupPreferences btcNodesSetupPreferences = new BtcNodesSetupPreferences(preferences, + numConnectionsForBtc); List nodes = btcNodesSetupPreferences.selectPreferredNodes(btcNodes); int minBroadcastConnections = btcNodesSetupPreferences.calculateMinBroadcastConnections(nodes); diff --git a/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java b/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java index 12ea77c41c2..8df6ebce7a0 100644 --- a/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java +++ b/core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java @@ -20,6 +20,8 @@ import bisq.core.btc.nodes.BtcNodes.BtcNode; import bisq.core.user.Preferences; +import bisq.common.config.Config; + import java.util.List; import org.junit.Test; @@ -37,7 +39,7 @@ public void testSelectPreferredNodesWhenPublicOption() { Preferences delegate = mock(Preferences.class); when(delegate.getBitcoinNodesOptionOrdinal()).thenReturn(PUBLIC.ordinal()); - BtcNodesSetupPreferences preferences = new BtcNodesSetupPreferences(delegate); + BtcNodesSetupPreferences preferences = new BtcNodesSetupPreferences(delegate, Config.DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC); List nodes = preferences.selectPreferredNodes(mock(BtcNodes.class)); assertTrue(nodes.isEmpty()); @@ -49,7 +51,7 @@ public void testSelectPreferredNodesWhenCustomOption() { when(delegate.getBitcoinNodesOptionOrdinal()).thenReturn(CUSTOM.ordinal()); when(delegate.getBitcoinNodes()).thenReturn("aaa.onion,bbb.onion"); - BtcNodesSetupPreferences preferences = new BtcNodesSetupPreferences(delegate); + BtcNodesSetupPreferences preferences = new BtcNodesSetupPreferences(delegate, Config.DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC); List nodes = preferences.selectPreferredNodes(mock(BtcNodes.class)); assertEquals(2, nodes.size()); diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java index d328a91d25d..2401851342b 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java @@ -44,6 +44,8 @@ import bisq.common.ClockWatcher; import bisq.common.UserThread; +import bisq.common.config.Config; +import bisq.common.config.ConfigFileEditor; import org.bitcoinj.core.PeerGroup; @@ -118,6 +120,7 @@ public class NetworkSettingsView extends ActivatableView { private final ClockWatcher clockWatcher; private final WalletsSetup walletsSetup; private final P2PService p2PService; + private final ConfigFileEditor configFileEditor; private final ObservableList p2pNetworkListItems = FXCollections.observableArrayList(); private final SortedList p2pSortedList = new SortedList<>(p2pNetworkListItems); @@ -144,7 +147,8 @@ public NetworkSettingsView(WalletsSetup walletsSetup, FilterManager filterManager, LocalBitcoinNode localBitcoinNode, TorNetworkSettingsWindow torNetworkSettingsWindow, - ClockWatcher clockWatcher) { + ClockWatcher clockWatcher, + Config config) { super(); this.walletsSetup = walletsSetup; this.p2PService = p2PService; @@ -154,6 +158,7 @@ public NetworkSettingsView(WalletsSetup walletsSetup, this.localBitcoinNode = localBitcoinNode; this.torNetworkSettingsWindow = torNetworkSettingsWindow; this.clockWatcher = clockWatcher; + this.configFileEditor = new ConfigFileEditor(config.configFile); } public void initialize() { @@ -413,6 +418,7 @@ private void onBitcoinPeersToggleSelected(boolean calledFromUser) { && btcNodesInputTextField.validate() && currentBitcoinNodesOption != BtcNodes.BitcoinNodesOption.CUSTOM) { preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal()); + configFileEditor.clearOption(Config.NUM_CONNECTIONS_FOR_BTC); if (calledFromUser) { if (isPreventPublicBtcNetwork()) { new Popup().warning(Res.get("settings.net.warn.useCustomNodes.B2XWarning")) @@ -428,6 +434,8 @@ private void onBitcoinPeersToggleSelected(boolean calledFromUser) { btcNodesLabel.setDisable(true); if (currentBitcoinNodesOption != BtcNodes.BitcoinNodesOption.PUBLIC) { preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal()); + configFileEditor.setOption(Config.NUM_CONNECTIONS_FOR_BTC, + String.valueOf(Config.DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC)); if (calledFromUser) { new Popup() .warning(Res.get("settings.net.warn.usePublicNodes")) @@ -435,6 +443,7 @@ private void onBitcoinPeersToggleSelected(boolean calledFromUser) { .onAction(() -> UserThread.runAfter(() -> { selectedBitcoinNodesOption = BtcNodes.BitcoinNodesOption.PROVIDED; preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal()); + configFileEditor.clearOption(Config.NUM_CONNECTIONS_FOR_BTC); selectBitcoinPeersToggle(); onBitcoinPeersToggleSelected(false); }, 300, TimeUnit.MILLISECONDS)) @@ -451,6 +460,7 @@ private void onBitcoinPeersToggleSelected(boolean calledFromUser) { btcNodesLabel.setDisable(true); if (currentBitcoinNodesOption != BtcNodes.BitcoinNodesOption.PROVIDED) { preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal()); + configFileEditor.clearOption(Config.NUM_CONNECTIONS_FOR_BTC); if (calledFromUser) { showShutDownPopup(); } @@ -458,6 +468,8 @@ private void onBitcoinPeersToggleSelected(boolean calledFromUser) { } else { selectedBitcoinNodesOption = BtcNodes.BitcoinNodesOption.PUBLIC; preferences.setBitcoinNodesOptionOrdinal(selectedBitcoinNodesOption.ordinal()); + configFileEditor.setOption(Config.NUM_CONNECTIONS_FOR_BTC, + String.valueOf(Config.DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC)); selectBitcoinPeersToggle(); onBitcoinPeersToggleSelected(false); } From 33aba27e975ebc00408b1d019b74c38a7d6b76e8 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 May 2021 17:26:01 +0200 Subject: [PATCH 02/15] Rename the BTC default value for the provided nodes option --- common/src/main/java/bisq/common/config/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/bisq/common/config/Config.java b/common/src/main/java/bisq/common/config/Config.java index 2ed6f26081f..7632f27f7f8 100644 --- a/common/src/main/java/bisq/common/config/Config.java +++ b/common/src/main/java/bisq/common/config/Config.java @@ -129,7 +129,7 @@ public class Config { // Default values for certain options public static final int UNSPECIFIED_PORT = -1; public static final String DEFAULT_REGTEST_HOST = "localhost"; - public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC = 7; // down from BitcoinJ default of 12 + public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC_PROVIDED = 7; // down from BitcoinJ default of 12 public static final int DEFAULT_NUM_CONNECTIONS_FOR_BTC_PUBLIC = 9; public static final boolean DEFAULT_FULL_DAO_NODE = false; static final String DEFAULT_CONFIG_FILE_NAME = "bisq.properties"; @@ -551,7 +551,7 @@ public Config(String defaultAppName, File defaultUserDataDir, String... args) { parser.accepts(NUM_CONNECTIONS_FOR_BTC, "Number of connections to the Bitcoin network") .withRequiredArg() .ofType(int.class) - .defaultsTo(DEFAULT_NUM_CONNECTIONS_FOR_BTC); + .defaultsTo(DEFAULT_NUM_CONNECTIONS_FOR_BTC_PROVIDED); ArgumentAcceptingOptionSpec rpcUserOpt = parser.accepts(RPC_USER, "Bitcoind rpc username") From 1fa5724b7beccc87e5f5e3ec68c4a54b29369ca2 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 May 2021 19:09:33 +0200 Subject: [PATCH 03/15] Remove unused imports --- .../java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java b/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java index 409ef5a3d07..874a06b4b00 100644 --- a/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java +++ b/core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java @@ -19,11 +19,8 @@ import bisq.core.user.Preferences; -import bisq.common.config.Config; import bisq.common.util.Utilities; -import javax.inject.Named; - import java.util.Collections; import java.util.List; import java.util.Set; From d66a858d512e75ff7db4eb9f426937c68e7f1bb6 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 May 2021 19:59:42 +0200 Subject: [PATCH 04/15] Update translations for v1.6.5 --- .../i18n/displayStrings_cs.properties | 30 ++++++++-------- .../i18n/displayStrings_de.properties | 32 ++++++++--------- .../i18n/displayStrings_es.properties | 36 +++++++++---------- .../i18n/displayStrings_fa.properties | 26 +++++++------- .../i18n/displayStrings_fr.properties | 26 +++++++------- .../i18n/displayStrings_it.properties | 26 +++++++------- .../i18n/displayStrings_ja.properties | 28 +++++++-------- .../i18n/displayStrings_pt-br.properties | 26 +++++++------- .../i18n/displayStrings_pt.properties | 26 +++++++------- .../i18n/displayStrings_ru.properties | 26 +++++++------- .../i18n/displayStrings_th.properties | 26 +++++++------- .../i18n/displayStrings_vi.properties | 26 +++++++------- .../i18n/displayStrings_zh-hans.properties | 26 +++++++------- .../i18n/displayStrings_zh-hant.properties | 26 +++++++------- 14 files changed, 193 insertions(+), 193 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index b37c8853ca4..bf7c5a7739e 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=Tato nabídka používá platební metod offerbook.warning.counterpartyTradeRestrictions=Tuto nabídku nelze přijmout z důvodu obchodních omezení protistrany -offerbook.warning.newVersionAnnouncement=S touto verzí softwaru mohou obchodní partneři navzájem ověřovat a podepisovat platební účty ostatních a vytvářet tak síť důvěryhodných platebních účtů.\n\nPo úspěšném obchodování s partnerským účtem s ověřeným platebním účtem bude váš platební účet podepsán a obchodní limity budou zrušeny po určitém časovém intervalu (délka tohoto intervalu závisí na způsobu ověření).\n\nDalší informace o podepsání účtu naleznete v dokumentaci na adrese [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=S touto verzí softwaru mohou obchodní partneři navzájem ověřovat a podepisovat platební účty ostatních a vytvářet tak síť důvěryhodných platebních účtů.\n\nPo úspěšném obchodování s partnerským účtem s ověřeným platebním účtem bude váš platební účet podepsán a obchodní limity budou zrušeny po určitém časovém intervalu (délka tohoto intervalu závisí na způsobu ověření).\n\nDalší informace o podepsání účtu naleznete v dokumentaci na adrese [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=Povolená částka obchodu je omezena na {0} z důvodu bezpečnostních omezení na základě následujících kritérií:\n- Účet kupujícího nebyl podepsán rozhodcem ani obchodním partnerem\n- Doba od podpisu účtu kupujícího není alespoň 30 dní\n- Způsob platby této nabídky je považován za riskantní pro bankovní zpětné zúčtování\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Povolená částka obchodu je omezena na {0} z důvodu bezpečnostních omezení na základě následujících kritérií:\n- Váš účet nebyl podepsán rozhodcem ani obchodním partnerem\n- Čas od podpisu vašeho účtu není alespoň 30 dní\n- Způsob platby této nabídky je považován za riskantní pro bankovní zpětné zúčtování\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Přehled: Umístěte nabídku {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Financujte svou nabídku # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Výše obchodu: {0}\n -createOffer.createOfferFundWalletInfo.msg=Do této nabídky musíte vložit {0}.\n\nTyto prostředky jsou rezervovány ve vaší lokální peněžence a budou uzamčeny na vkladové multisig adrese, jakmile někdo příjme vaši nabídku.\n\nČástka je součtem:\n{1}- Vaše kauce: {2}\n- Obchodní poplatek: {3}\n- Poplatek za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Bisq (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Přenos z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financování. +createOffer.createOfferFundWalletInfo.msg=Abyste mohli tuto nabídku vytvořit, musíte vložit {0}.\n\nTyto prostředky jsou rezervovány ve vaší lokální peněžence a budou uzamčeny na vkladové multisig adrese, jakmile někdo příjme vaši nabídku.\n\nČástka je součtem:\n{1}- Vaše kauce: {2}\n- Obchodní poplatek: {3}\n- Poplatek za těžbu: {4}\n\nPři financování obchodu si můžete vybrat ze dvou možností:\n- Použijte svou peněženku Bisq (pohodlné, ale transakce mohou být propojitelné) NEBO\n- Přenos z externí peněženky (potenciálně více soukromé)\n\nPo uzavření tohoto vyskakovacího okna se zobrazí všechny možnosti a podrobnosti financová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=Při zadávání nabídky došlo k chybě:\n\n{0}\n\nPeněženku ještě neopustily žádné finanční prostředky.\nRestartujte aplikaci a zkontrolujte síťové připojení. @@ -558,15 +558,15 @@ portfolio.tab.pendingTrades=Otevřené obchody portfolio.tab.history=Historie portfolio.tab.failed=Selhalo portfolio.tab.editOpenOffer=Upravit nabídku -portfolio.tab.duplicateOffer=Duplicate offer -portfolio.context.offerLikeThis=Create new offer like this... -portfolio.context.notYourOffer=You can only duplicate offers where you were the maker. +portfolio.tab.duplicateOffer=Duplikovat nabídku +portfolio.context.offerLikeThis=Vytvořit novou nabídku jako tato... +portfolio.context.notYourOffer=Můžete duplikovat pouze vámi vytvořené nabídky. portfolio.closedTrades.deviation.help=Procentuální odchylka od tržní ceny portfolio.pending.invalidTx=Došlo k problému s chybějící nebo neplatnou transakcí.\n\nProsím neposílejte fiat nebo altcoin platby.\n\nOtevřete úkol pro podporu, některý z mediátorů vám pomůže.\n\nChybová zpráva: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Kauční transakce k obchodu {0} je nepotvrzená i po {1} hodinách. Zkontrolujte stav této transakce v blockchain exploreru; pokud již byla potvrzena, ale v Bisq je stále zobrazena jako nepotvrzená,: \n● Zazálohujte svá data [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Proveďte resynchronizaci SPV. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nKontaktujte podporu Bisq [HYPERLINK:https://keybase.io/team/bisq] pokud si nevíte rady nebo pokud problém přetrvává. portfolio.pending.step1.waitForConf=Počkejte na potvrzení na blockchainu portfolio.pending.step2_buyer.startPayment=Zahajte platbu @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Váš obchodní partner při portfolio.pending.mediationResult.button=Zobrazit navrhované řešení portfolio.pending.mediationResult.popup.headline=Výsledek mediace obchodu s ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Váš obchodní partner přijal návrh mediátora na obchod {0} -portfolio.pending.mediationResult.popup.info=Mediátor navrhl následující výplatu:\nObdržíte: {0}\nVáš obchodní partner obdrží: {1}\n\nTuto navrhovanou výplatu můžete přijmout nebo odmítnout.\n\nPřijetím podepíšete navrhovanou výplatní transakci. Pokud váš obchodní partner také přijme a podepíše, výplata bude dokončena a obchod bude uzavřen.\n\nPokud jeden nebo oba odmítnete návrh, budete muset počkat do {2} (blok {3}), abyste zahájili spor druhého kola s rozhodcem, který případ znovu prošetří a na základě svých zjištění provede výplatu.\n\nRozhodce může jako náhradu za svou práci účtovat malý poplatek (maximální poplatek: bezpečnostní záloha obchodníka). Oba obchodníci, kteří souhlasí s návrhem zprostředkovatele, jsou na dobré cestě - žádost o arbitráž je určena pro výjimečné okolnosti, například pokud je obchodník přesvědčen, že zprostředkovatel neučinil návrh na spravedlivou výplatu (nebo pokud druhý partner nereaguje).\n\nDalší podrobnosti o novém rozhodčím modelu: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Přijali jste výplatu navrženou mediátorem, ale zdá se, že váš obchodní partner ji nepřijal.\n\nPo uplynutí doby uzamčení na {0} (blok {1}) můžete zahájit spor druhého kola s rozhodcem, který případ znovu prošetří a na základě jeho zjištění provede platbu.\n\nDalší podrobnosti o rozhodčím modelu najdete na adrese: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=Mediátor navrhl následující výplatu:\nObdržíte: {0}\nVáš obchodní partner obdrží: {1}\n\nTuto navrhovanou výplatu můžete přijmout nebo odmítnout.\n\nPřijetím podepíšete navrhovanou výplatní transakci. Pokud váš obchodní partner také přijme a podepíše, výplata bude dokončena a obchod bude uzavřen.\n\nPokud jeden nebo oba odmítnete návrh, budete muset počkat do {2} (blok {3}), abyste zahájili spor druhého kola s rozhodcem, který případ znovu prošetří a na základě svých zjištění provede výplatu.\n\nRozhodce může jako náhradu za svou práci účtovat malý poplatek (maximální poplatek: kauce obchodníka). Oba obchodníci, kteří souhlasí s návrhem zprostředkovatele, jsou na dobré cestě - žádost o arbitráž je určena pro výjimečné okolnosti, například pokud je obchodník přesvědčen, že zprostředkovatel neučinil návrh na spravedlivou výplatu (nebo pokud druhý partner nereaguje).\n\nDalší podrobnosti o novém rozhodčím modelu: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Přijali jste výplatu navrženou mediátorem, ale zdá se, že váš obchodní partner ji nepřijal.\n\nPo uplynutí doby uzamčení na {0} (blok {1}) můžete zahájit spor druhého kola s rozhodcem, který případ znovu prošetří a na základě jeho zjištění provede platbu.\n\nDalší podrobnosti o rozhodčím modelu najdete na adrese: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Odmítnout a požádat o arbitráž portfolio.pending.mediationResult.popup.alreadyAccepted=Už jste přijali @@ -982,7 +982,7 @@ support.buyerTaker=Kupující BTC/Příjemce support.sellerTaker=Prodávající BTC/Příjemce support.backgroundInfo=Bisq není společnost, takže spory řeší jinak.\n\nObchodníci mohou v rámci aplikace komunikovat prostřednictvím zabezpečeného chatu na obrazovce otevřených obchodů a zkusit řešení sporů sami. Pokud to nestačí, může jim pomoci mediátor. Mediátor vyhodnotí situaci a navrhne vyúčtování obchodních prostředků. Pokud oba obchodníci přijmou tento návrh, je výplata dokončena a obchod je uzavřen. Pokud jeden nebo oba obchodníci nesouhlasí s výplatou navrhovanou mediátorem, mohou požádat o rozhodčí řízení. Rozhodce přehodnotí situaci a v odůvodněných případech vrátí osobně prostředky obchodníkovi zpět a požádá o vrácení této platby od Bisq DAO. -support.initialInfo=Do níže uvedeného textového pole zadejte popis problému. Přidejte co nejvíce informací k urychlení doby řešení sporu.\n\nZde je kontrolní seznam informací, které byste měli poskytnout:\n\t● Pokud kupujete BTC: Provedli jste převod Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba zahájena“?\n\t● Pokud jste prodejcem BTC: Obdrželi jste platbu Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba přijata“?\n\t● Kterou verzi Bisq používáte?\n\t● Jaký operační systém používáte?\n\t● Pokud se vyskytl problém s neúspěšnými transakcemi, zvažte přechod na nový datový adresář.\n\t Někdy dojde k poškození datového adresáře a vede to k podivným chybám.\n\t  Viz: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nSeznamte se prosím se základními pravidly procesu sporu:\n\t● Musíte odpovědět na požadavky {0} do 2 dnů.\n\t● Mediátoři reagují do 2 dnů. Rozhodci odpoví do 5 pracovních dnů.\n\t● Maximální doba sporu je 14 dní.\n\t● Musíte spolupracovat s {1} a poskytnout informace, které požaduje, aby jste vyřešili váš případ.\n\t● Při prvním spuštění aplikace jste přijali pravidla uvedena v dokumentu sporu v uživatelské smlouvě.\n\nDalší informace o procesu sporu naleznete na: {2} +support.initialInfo=Do níže uvedeného textového pole zadejte popis problému. Přidejte co nejvíce informací k urychlení doby řešení sporu.\n\nZde je kontrolní seznam informací, které byste měli poskytnout:\n\t● Pokud kupujete BTC: Provedli jste převod Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba zahájena“?\n\t● Pokud jste prodejcem BTC: Obdrželi jste platbu Fiat nebo Altcoinu? Pokud ano, klikli jste v aplikaci na tlačítko „Platba přijata“?\n\t● Kterou verzi Bisq používáte?\n\t● Jaký operační systém používáte?\n\t● Pokud se vyskytl problém s neúspěšnými transakcemi, zvažte přechod na nový datový adresář.\n\t Někdy dojde k poškození datového adresáře a vede to k podivným chybám.\n\tViz: https://bisq.wiki/Switching_to_a_new_data_directory\n\nSeznamte se prosím se základními pravidly procesu sporu:\n\t● Musíte odpovědět na požadavky {0} do 2 dnů.\n\t● Mediátoři reagují do 2 dnů. Rozhodci odpoví do 5 pracovních dnů.\n\t● Maximální doba sporu je 14 dní.\n\t● Musíte spolupracovat s {1} a poskytnout informace, které požaduje, aby jste vyřešili váš případ.\n\t● Při prvním spuštění aplikace jste přijali pravidla uvedena v dokumentu sporu v uživatelské smlouvě.\n\nDalší informace o procesu sporu naleznete na: {2} support.systemMsg=Systémová zpráva: {0} support.youOpenedTicket=Otevřeli jste žádost o podporu.\n\n{0}\n\nVerze Bisq: {1} support.youOpenedDispute=Otevřeli jste žádost o spor.\n\n{0}\n\nVerze Bisq: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URL (používá setting.preferences.deviationToLarge=Hodnoty vyšší než {0} % nejsou povoleny. setting.preferences.txFee=Transakční poplatek za výběr BSQ (satoshi/vbyte) setting.preferences.useCustomValue=Použijte vlastní hodnotu +setting.preferences.txFeeMin=Transakční poplatek musí být alespoň {0} satoshi/vbyte +setting.preferences.txFeeTooLarge=Váš vstup je nad jakoukoli rozumnou hodnotou (>5000 satoshi/vbyte). Transakční poplatek se obvykle pohybuje v rozmezí 50-400 satoshi/vbyte. setting.preferences.ignorePeers=Ignorované peer uzly [onion addresa:port] setting.preferences.ignoreDustThreshold=Min. hodnota výstupu bez drobných setting.preferences.currenciesInList=Měny v seznamu zdrojů tržních cen @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=Zde jsou zobrazeny celkové zůstatky v int account.menu.walletInfo.xpub.headLine=Veřejné klíče (xpub) account.menu.walletInfo.walletSelector={0} {1} peněženka account.menu.walletInfo.path.headLine=HD identifikátory klíčů -account.menu.walletInfo.path.info=Pokud importujete vaše seed slova do jiné peněženky (např. Electrum), budete muset nastavit také identifikátor klíčů (BIP32 path). Toto provádějte pouze ve výjimečných případech, např. pokud úplně ztratíte kontrolu nad Bisq peněženkou.\nMějte na paměti, že provádění transakcí pomocí jiných softwarových peněženek může snadno poškodit interní datové struktury systému Bisq, a znemožnit tak provádění obchodů.\n\nNIKDY neposílejte BSQ pomocí jiných softwarových peněženek než Bisq, protože byste tím velmi pravděpodobně vytvořili neplatnou BSQ transakci, a ztratili tak své BSQ. - +account.menu.walletInfo.path.info=Pokud importujete vaše seed slova do jiné peněženky (např. Electrum), budete muset nastavit také identifikátor klíčů (BIP32 path). Toto provádějte pouze ve výjimečných případech, např. pokud úplně ztratíte kontrolu nad Bisq peněženkou.\nMějte na paměti, že provádění transakcí pomocí jiných softwarových peněženek může snadno poškodit interní datové struktury systému Bisq, a znemožnit tak provádění obchodů.\n\nNIKDY neposílejte BSQ pomocí jiných softwarových peněženek než Bisq, protože byste tím velmi pravděpodobně vytvořili neplatnou BSQ transakci, a ztratili tak své BSQ.\n\n account.menu.walletInfo.openDetails=Zobrazit detailní data peněženky a soukromé klíče ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=Vkladová transakce uzavřeného obcho error.closedTradeWithNoDepositTx=Vkladová transakce uzavřeného obchodu s obchodním ID {0} je nulová.\n\nChcete-li vyčistit seznam uzavřených obchodů, restartujte aplikaci. popup.warning.walletNotInitialized=Peněženka ještě není inicializována -popup.warning.osxKeyLoggerWarning=V souladu s přísnějšími bezpečnostními opatřeními v systému macOS 10.14 a novějších způsobí spuštění aplikace Java (Bisq používá Javu) upozornění na vyskakovací okno v systému MacOS („Bisq by chtěl přijímat stisknutí kláves z jakékoli aplikace“).\n\nChcete-li se tomuto problému vyhnout, otevřete své Nastavení macOS a přejděte do části "Zabezpečení a soukromí" -> "Soukromí" -> "Sledování vstupu" a ze seznamu na pravé straně odeberte „Bisq“.\n\nBisq upgraduje na novější verzi Java, aby se tomuto problému vyhnul, jakmile budou vyřešena technická omezení (balíček Java Packager pro požadovanou verzi Java ještě není dodán). popup.warning.wrongVersion=Pravděpodobně máte nesprávnou verzi Bisq pro tento počítač.\nArchitektura vašeho počítače je: {0}.\nBinární kód Bisq, který jste nainstalovali, je: {1}.\nVypněte prosím a znovu nainstalujte správnou verzi ({2}). popup.warning.incompatibleDB=Zjistili jsme nekompatibilní soubory databáze!\n\nTyto databázové soubory nejsou kompatibilní s naší aktuální kódovou základnou:\n{0}\n\nVytvořili jsme zálohu poškozených souborů a aplikovali jsme výchozí hodnoty na novou verzi databáze.\n\nZáloha se nachází na adrese:\n{1}/db/backup_of_corrupted_data.\n\nZkontrolujte, zda máte nainstalovanou nejnovější verzi Bisq.\nMůžete si jej stáhnout na adrese: [HYPERLINK:https://bisq.network/downloads].\n\nRestartujte aplikaci. popup.warning.startupFailed.twoInstances=Bisq již běží. Nemůžete spustit dvě instance Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Probíhá vypínání popup.shutDownInProgress.msg=Vypnutí aplikace může trvat několik sekund.\nProsím, nepřerušujte tento proces. popup.attention.forTradeWithId=Je třeba věnovat pozornost obchodu s ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Verze 1.6.3 přináší novou funkci umožňující snadné opětovné zadávání nabídek; klikněte pravým tlačítkem na existující nabídku nebo obchod v sekci Portfolio a zvolte `Vytvořit novou nabídku jako tato`. Tato funkce je užitečná pro obchodníky, kteří často vytvářejí stejnou nabídku. popup.info.multiplePaymentAccounts.headline=K dispozici jsou účty a více platebními metodami popup.info.multiplePaymentAccounts.msg=Pro tuto nabídku máte k dispozici více platebních účtů. Ujistěte se, že jste vybrali ten správný. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Špatný ECKey rozhodce popup.accountSigning.success.headline=Gratulujeme popup.accountSigning.success.description=Všechny {0} platební účty byly úspěšně podepsány! -popup.accountSigning.generalInformation=Podpisový stav všech vašich účtů najdete v sekci účtu.\n\nDalší informace naleznete na adrese [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=Podpisový stav všech vašich účtů najdete v sekci účtu.\n\nDalší informace naleznete na adrese [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Jeden z vašich platebních účtů byl ověřen a podepsán rozhodcem. Obchodování s tímto účtem po úspěšném obchodování automaticky podepíše účet vašeho obchodního partnera.\n\n{0} popup.accountSigning.signedByPeer=Jeden z vašich platebních účtů byl ověřen a podepsán obchodním partnerem. Váš počáteční obchodní limit bude zrušen a do {0} dnů budete moci podepsat další účty.\n\n{1} popup.accountSigning.peerLimitLifted=Počáteční limit pro jeden z vašich účtů byl zrušen.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Dodatečné informace payment.shared.extraInfo.prompt=Uveďte jakékoli speciální požadavky, podmínky a detaily, které chcete zobrazit u vašich nabídek s tímto platebním účtem. (Uživatelé uvidí tyto informace předtím, než akceptují vaši nabídku.) payment.cashByMail.extraInfo.prompt=Uveďte prosím ve svých nabídkách:\n\nZemi, ve které se nacházíte (např. Francie);\nZemě / regiony protistran, se kterými jste ochotni obchodovat (např. Francie, EU nebo jakákoli evropská země);\nJakékoli zvláštní podmínky;\nJakékoli další podrobnosti. payment.cashByMail.tradingRestrictions=Přečtěte si prosím podmínky tvůrce nabídky.\nPokud tyto požadavky nesplňujete, neakceptujte tento obchod. -payment.f2f.info=Obchody „tváří v tvář“ mají různá pravidla a přicházejí s jinými riziky než online transakce.\n\nHlavní rozdíly jsou:\n● Obchodní partneři si musí vyměňovat informace o místě a čase schůzky pomocí poskytnutých kontaktních údajů.\n● Obchodní partneři musí přinést své notebooky a na místě setkání potvrdit „platba odeslána“ a „platba přijata“.\n● Pokud má tvůrce speciální „podmínky“, musí uvést podmínky v textovém poli „Další informace“ na účtu.\n● Přijetím nabídky zadavatel souhlasí s uvedenými „podmínkami a podmínkami“ tvůrce.\n● V případě sporu nemůže být mediátor nebo rozhodce příliš nápomocný, protože je obvykle obtížné získat důkazy o tom, co se na schůzce stalo. V takových případech mohou být prostředky BTC uzamčeny na dobu neurčitou nebo dokud se obchodní partneři nedohodnou.\n\nAbyste si byli jisti, že plně rozumíte rozdílům v obchodech „tváří v tvář“, přečtěte si pokyny a doporučení na adrese: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info=Obchody „tváří v tvář“ mají různá pravidla a přicházejí s jinými riziky než online transakce.\n\nHlavní rozdíly jsou:\n● Obchodní partneři si musí vyměňovat informace o místě a čase schůzky pomocí poskytnutých kontaktních údajů.\n● Obchodní partneři musí přinést své notebooky a na místě setkání potvrdit „platba odeslána“ a „platba přijata“.\n● Pokud má tvůrce speciální „podmínky“, musí uvést podmínky v textovém poli „Další informace“ na účtu.\n● Přijetím nabídky zadavatel souhlasí s uvedenými „podmínkami a podmínkami“ tvůrce.\n● V případě sporu nemůže být mediátor nebo rozhodce příliš nápomocný, protože je obvykle obtížné získat důkazy o tom, co se na schůzce stalo. V takových případech mohou být prostředky BTC uzamčeny na dobu neurčitou nebo dokud se obchodní partneři nedohodnou.\n\nAbyste si byli jisti, že plně rozumíte rozdílům v obchodech „tváří v tvář“, přečtěte si pokyny a doporučení na adrese: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Otevřít webovou stránku payment.f2f.offerbook.tooltip.countryAndCity=Země a město: {0} / {1} payment.f2f.offerbook.tooltip.extra=Další informace: {0} diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index b5a4d19862f..a30027a9cfe 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=Dieses Angebot verwendet eine Zahlungsme offerbook.warning.counterpartyTradeRestrictions=Dieses Angebot kann aufgrund von Handelsbeschränkungen der Gegenpartei nicht angenommen werden -offerbook.warning.newVersionAnnouncement=Mit dieser Version der Software können Handelspartner gegenseitig Zahlungskonten verifizieren und unterzeichnen, um ein Netzwerk vertrauenswürdiger Zahlungskonten aufzubauen.\n\nNach dem erfolgreichen Handel mit einem verifizierten Handelspartner, wird auch Ihr Zahlungskonto unterzeichnet und Ihre Handels-Beschränkungen werden nach einer gewissen Zeit aufgehoben (die Länge kann je nach Zahlungsmethode unterschiedlich sein).\n\nWeitere Informationen zur Unterzeichnung von Konten finden Sie hier in der Dokumentation: [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=Mit dieser Version der Software können Handelspartner ihre Zahlungskonten gegenseitig verifizieren und unterzeichnen, um ein Netzwerk vertrauenswürdiger Zahlungskonten aufzubauen.\n\nNach dem erfolgreichen Handel mit einem verifizierten Handelspartner, wird auch Ihr Zahlungskonto unterzeichnet und Ihre Handels-Beschränkungen werden nach einer gewissen Zeit aufgehoben (die Länge kann je nach Zahlungsmethode unterschiedlich sein).\n\nWeitere Informationen zur Unterzeichnung von Konten finden Sie hier in der Dokumentation: [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=Der zulässige Trade-Betrag ist aufgrund von Sicherheitseinschränkungen, die auf den folgenden Kriterien basieren, auf {0} begrenzt:\n- Das Konto des Käufers wurde nicht von einem Vermittler oder einem Partner unterzeichnet\n- Die Zeit seit der Unterzeichnung des Kontos des Käufers beträgt nicht mindestens 30 Tage\n- Die Zahlungsmethode für dieses Angebot gilt als riskant für Bankrückbuchungen\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Der zulässige Trade-Betrag ist aufgrund von Sicherheitseinschränkungen, die auf den folgenden Kriterien basieren, auf {0} begrenzt:\n- Ihr Konto wurde nicht von einem Vermittler oder einem Partner unterzeichnet\n- Die Zeit seit der Unterzeichnung Ihres Kontos beträgt nicht mindestens 30 Tage\n- Die Zahlungsmethode für dieses Angebot gilt als riskant für Bankrückbuchungen\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Überprüfung: Anbieten Bitcoins zu {0} createOffer.createOfferFundWalletInfo.headline=Ihr Angebot finanzieren # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Handelsbetrag: {0} \n -createOffer.createOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDiese Gelder werden in Ihrer lokalen Wallet reserviert und in die MultiSig-Kautionsadresse eingesperrt, wenn jemand Ihr Angebot annimmt.\n\nDer Betrag ist die Summe aus:\n{1}- Kaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten, Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen können nachverfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. +createOffer.createOfferFundWalletInfo.msg=Sie müssen für dieses Angebot {0} einzahlen.\n\nDiese Funds werden in Ihrer lokalen Wallet reserviert und in die MultiSig-Kautionsadresse eingesperrt, sobald jemand Ihr Angebot annimmt.\n\nDer Betrag ist die Summe aus:\n{1}- Sicherheitskaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühr: {4}\n\nSie können zwischen zwei Methoden wählen um Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen könnten nachverfolgbar sein) ODER\n- Überweisen Sie von einer externen Wallet (möglicherweise mehr Privatsphäre)\n\nSie werden alle Einzahlungsmöglichkeiten und Details nach dem Schließen dieses Dialogs sehen. # 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=Es gab einen Fehler beim Erstellen des Angebots:\n\n{0}\n\nEs haben noch keine Gelder Ihre Wallet verlassen.\nBitte starten Sie Ihre Anwendung neu und überprüfen Sie Ihre Netzwerkverbindung. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Sie können dieses Angebot nicht annehmen, da es takeOffer.takeOfferFundWalletInfo.headline=Ihren Handel finanzieren # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Handelsbetrag: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=Sie müssen zum Annehmen dieses Angebots {0} einzahlen.\n\nDer Betrag ist die Summe aus:\n{1}- Ihre Kaution: {2}\n- Handelsgebühr: {3}\n- Gesamte Mining-Gebühr: {4}\n\nSie haben zwei Möglichkeiten Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen können nach verfolgbar sein) ODER\n- Von einer externen Wallet überweisen (möglicherweise vertraulicher)\n\nSie werden nach dem Schließen dieses Dialogs alle Finanzierungsmöglichkeiten und Details sehen. +takeOffer.takeOfferFundWalletInfo.msg=Um dieses Angebot anzunehmen müssen Sie {0} einzahlen.\n\nDer Betrag ist die Summe aus:\n{1}- Ihre Sicherheitskaution: {2}\n- Handelsgebühr: {3}\n- Mining-Gebühren: {4}\n\nSie können zwischen zwei Methoden wählen um Ihren Handel zu finanzieren:\n- Nutzen Sie Ihre Bisq-Wallet (bequem, aber Transaktionen könnten nachverfolgbar sein) ODER\n- Überweisen Sie von einer externen Wallet (möglicherweise mehr Privatsphäre)\n\nSie werden alle Einzahlungsmöglichkeiten und Details nach dem Schließen dieses Dialogs sehen. takeOffer.alreadyPaidInFunds=Wenn Sie bereits Gelder gezahlt haben, können Sie diese unter \"Gelder/Gelder senden\" abheben. takeOffer.paymentInfo=Zahlungsinformationen takeOffer.setAmountPrice=Betrag festlegen @@ -558,15 +558,15 @@ portfolio.tab.pendingTrades=Offene Trades portfolio.tab.history=Verlauf portfolio.tab.failed=Fehlgeschlagen portfolio.tab.editOpenOffer=Angebot bearbeiten -portfolio.tab.duplicateOffer=Duplicate offer -portfolio.context.offerLikeThis=Create new offer like this... -portfolio.context.notYourOffer=You can only duplicate offers where you were the maker. +portfolio.tab.duplicateOffer=Angebot kopieren +portfolio.context.offerLikeThis=Erstelle ein gleiches Angebot... +portfolio.context.notYourOffer=Sie können Angebote, die Sie erstellt haben, duplizieren. portfolio.closedTrades.deviation.help=Prozentuale Preisabweichung vom Markt portfolio.pending.invalidTx=Es gibt ein Problem mit einer fehlenden oder ungültigen Transaktion.\n\nBitte schicken Sie KEINE Geld (Fiat) oder Altcoin Zahlung.\n\nErstellen Sie ein Support-Ticket um Hilfe durch einen Vermittler zu erhalten.\n\nFehlermeldung:{0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Die Sicherheitskaution für Trade {0} ist nach {1} noch immer nicht bestätigt. Überprüfe die Einzahlungstransaktion in einem Blockchain Explorer; Wenn Sie bereits bestätigt wurde aber bei Bisq noch nicht als bestätigt angezeigt wird:\n● Machen Sie ein Backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Machen Sie einen SPV Resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nWenn Sie Zweifel haben oder das Problem weiterhin bestehen bleibt, kontaktieren Sie den Bisq Support [HYPERLINK:https://keybase.io/team/bisq]. portfolio.pending.step1.waitForConf=Auf Blockchain-Bestätigung warten portfolio.pending.step2_buyer.startPayment=Zahlung beginnen @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Ihr Trade-Partner hat den Vo portfolio.pending.mediationResult.button=Lösungsvorschlag ansehen portfolio.pending.mediationResult.popup.headline=Mediationsergebnis für Trade mit ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Ihr Trade-Partner hat den Vorschlag des Mediators akzeptiert für Trade {0} -portfolio.pending.mediationResult.popup.info=Der Vermittler hat folgende Auszahlung vorgeschlagen: \nSie erhalten: {0}\nIhr Handelspartner erhält: {1}\n\nSie können die vorgeschlagene Auszahlung akzeptieren oder ablehnen.\n\nAkzeptieren Sie, unterzeichnen Sie die vorgeschlagene Transaktion. Wenn Ihr Handelspartner auch akzeptiert und unterzeichnet, wird die Auszahlung getätigt und der Handel abgeschlossen.\n\nWenn einer oder beide den Vorschlag ablehnen, müssen Sie bis {2} (block {3}) warten, um eine zweite Konfliktrunde mit einer Schiedsperson zu starten, die den Handel erneut untersuchen wird und je nach eigenem Ergebnis eine Auszahlung veranlassen wird.\n\nDie Schiedsperson kann eine kleine Gebühr für ihre Arbeit berechnen (maximale Gebühr: Sicherheitskaution des Händlers). Im Idealfall akzeptieren beide Händler den Vorschlag des Vermittlers — eine Schiedsperson hinzuzuziehen ist nur für außergewöhnliche Fälle vorgesehen. Ein solcher Fall wäre, wenn ein Händler sich sicher ist, dass der Auszahlungsvorschlag nicht fair ist, oder der Handelspartner nicht antwortet.\n\nWeitere Informationen über das Schlichtungssystem finden Sie unter [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Sie haben die vom Vermittler vorgeschlagene Auszahlung akzeptiert, aber es scheint so, als hätte Ihr Handelspartner sie noch nicht akzeptiert.\n\nSobald die Sperre bei {0} (block {1})) aufgehoben ist, können Sie eine zweite Runde des Konflikts eröffnen. Eine Schiedsperson wird dann den Konflikt erneut untersuchen und je nach eigenem Ergebnis eine Auszahlung veranlassen.\n\nHier können Sie mehr Informationen über das Schiedsverfahren finden:\n[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=Der Vermittler hat folgende Auszahlung vorgeschlagen: \nSie erhalten: {0}\nIhr Handelspartner erhält: {1}\n\nSie können die vorgeschlagene Auszahlung akzeptieren oder ablehnen.\n\nAkzeptieren Sie, unterzeichnen Sie damit die vorgeschlagene Transaktion. Wenn Ihr Handelspartner auch akzeptiert und unterzeichnet, wird ausgezahlt und der Handel abgeschlossen.\n\nWenn einer oder beide den Vorschlag ablehnen, müssen Sie bis {2} (block {3}) warten, um eine zweite Runde mit einer Schiedsperson zu starten, die den Handel erneut untersuchen wird und je nach eigenem Ergebnis eine Auszahlung veranlassen wird.\n\nDie Schiedsperson kann eine kleine Gebühr für ihre Arbeit berechnen (maximale Gebühr: Sicherheitskaution des Händlers). Im Idealfall akzeptieren beide Händler den Vorschlag des Vermittlers — eine Schiedsperson hinzuzuziehen ist nur für außergewöhnliche Fälle vorgesehen. Ein solcher Fall wäre, wenn ein Händler sich sicher ist, dass der Auszahlungsvorschlag nicht fair ist, oder der Handelspartner nicht antwortet.\n\nWeitere Informationen über das Schlichtungssystem finden Sie unter [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Sie haben die vom Vermittler vorgeschlagene Auszahlung akzeptiert, aber es scheint so, als hätte Ihr Handelspartner sie noch nicht akzeptiert.\n\nSobald die Sperre bei {0} (block {1})) aufgehoben ist, können Sie eine zweite Runde des Konflikts eröffnen. Eine Schiedsperson wird dann den Konflikt erneut untersuchen und je nach eigenem Ergebnis eine Auszahlung veranlassen.\n\nHier können Sie mehr Informationen über das Schiedsverfahren finden:\n[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Ablehnen und Vermittler hinzuziehen portfolio.pending.mediationResult.popup.alreadyAccepted=Sie haben bereits akzeptiert @@ -982,7 +982,7 @@ support.buyerTaker=BTC-Käufer/Abnehmer support.sellerTaker=BTC-Verkäufer/Abnehmer support.backgroundInfo=Bisq ist kein Unternehmen, daher behandelt es Konflikte unterschiedlich.\n\nTrader können innerhalb der Anwendung über einen sicheren Chat auf dem Bildschirm für offene Trades kommunizieren, um zu versuchen, Konflikte selbst zu lösen. Wenn das nicht ausreicht, kann ein Mediator einschreiten und helfen. Der Mediator wird die Situation bewerten und eine Auszahlung von Trade Funds vorschlagen. Wenn beide Trader diesen Vorschlag annehmen, ist die Auszahlungstransaktion abgeschlossen und der Trade geschlossen. Wenn ein oder beide Trader mit der vom Mediator vorgeschlagenen Auszahlung nicht einverstanden sind, können sie ein Vermittlungsverfahren beantragen, bei dem der Vermittler die Situation neu bewertet und, falls gerechtfertigt, dem Trader persönlich eine Rückerstattung leistet und die Rückerstattung dieser Zahlung vom Bisq DAO verlangt. -support.initialInfo=Bitte geben Sie eine Beschreibung Ihres Problems in das untenstehende Textfeld ein. Fügen Sie so viele Informationen wie möglich hinzu, um die Zeit für die Konfliktlösung zu verkürzen.\n\nHier ist eine Checkliste für Informationen, die Sie angeben sollten:\n\t● Wenn Sie der BTC-Käufer sind: Haben Sie die Fiat- oder Altcoin-Überweisung gemacht? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung gestartet" geklickt?\n\t● Wenn Sie der BTC-Verkäufer sind: Haben Sie die Fiat- oder Altcoin-Zahlung erhalten? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung erhalten" geklickt?\n\t● Welche Version von Bisq verwenden Sie?\n\t● Welches Betriebssystem verwenden Sie?\n\t● Wenn Sie ein Problem mit fehlgeschlagenen Transaktionen hatten, überlegen Sie bitte, in ein neues Datenverzeichnis zu wechseln.\n\t Manchmal wird das Datenverzeichnis beschädigt und führt zu seltsamen Fehlern. \n\t Siehe: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nBitte machen Sie sich mit den Grundregeln für den Konfliktprozess vertraut:\n\t● Sie müssen auf die Anfragen der {0}'' innerhalb von 2 Tagen antworten.\n\t● Mediatoren antworten innerhalb von 2 Tagen. Die Vermittler antworten innerhalb von 5 Werktagen.\n\t● Die maximale Frist für einen Konflikt beträgt 14 Tage.\n\t● Sie müssen mit den {1} zusammenarbeiten und die Informationen zur Verfügung stellen, die sie anfordern, um Ihren Fall zu bearbeiten.\n\t● Mit dem ersten Start der Anwendung haben Sie die Regeln des Konfliktdokuments in der Nutzervereinbarung akzeptiert.\n\nSie können mehr über den Konfliktprozess erfahren unter: {2} +support.initialInfo=Bitte geben Sie eine Beschreibung Ihres Problems in das untenstehende Textfeld ein. Fügen Sie so viele Informationen wie möglich hinzu, um die Zeit für die Konfliktlösung zu verkürzen.\n\nHier ist eine Checkliste der Informationen die Sie angeben sollten:\n\t● Wenn Sie der BTC-Käufer sind: Haben Sie die Geld- (Fiat-) oder Altcoin-Überweisung vorgenommen? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung gestartet" geklickt?\n\t● Wenn Sie der BTC-Verkäufer sind: Haben Sie die Geld- (Fiat-) oder Altcoin-Zahlung erhalten? Wenn ja, haben Sie in der Anwendung auf die Schaltfläche "Zahlung erhalten" geklickt?\n\t● Welche Version von Bisq verwenden Sie?\n\t● Welches Betriebssystem verwenden Sie?\n\t● Wenn Sie ein Problem mit fehlgeschlagenen Transaktionen hatten, erwägen Sie bitte zu einem neuen Data-Verzeichnis zu wechseln.\n\t Manchmal wird das Data-Verzeichnis beschädigt was zu seltsamen Fehlern führt. \n\t Siehe: https://bisq.wiki/Switching_to_a_new_data_directory\n\nBitte machen Sie sich mit den Grundregeln der Streitbeilegung vertraut:\n\t● Sie müssen auf die Anfragen der {0} innerhalb von 2 Tagen antworten.\n\t● Vermittler antworten innerhalb von 2 Tagen. Schiedspersonen antworten innerhalb von 5 Werktagen.\n\t● Die maximale Zeitspanne für eine Konfliktlösung beträgt 14 Tage.\n\t● Sie müssen mit dem/der {1} zusammenarbeiten und die Informationen zur Verfügung stellen, die sie anfordern, um Ihren Fall zu bearbeiten.\n\t● Sie haben die in der Benutzervereinbarung aufgeführten Regeln zur Streitbeilegung akzeptiert, als Sie die Anwendung zum ersten Mal gestartet haben.\n\nSie können mehr über die Streitbeilegung erfahren auf: {2} support.systemMsg=Systemnachricht: {0} support.youOpenedTicket=Sie haben eine Anfrage auf Support geöffnet.\n\n{0}\n\nBisq-Version: {1} support.youOpenedDispute=Sie haben eine Anfrage für einen Konflikt geöffnet.\n\n{0}\n\nBisq-version: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (verwendet setting.preferences.deviationToLarge=Werte größer als {0}% sind nicht erlaubt. setting.preferences.txFee=Transaktionsgebühr der BSQ-Auszahlung (satoshis/vbyte) setting.preferences.useCustomValue=Spezifischen Wert nutzen +setting.preferences.txFeeMin=Die Transaktionsgebühr muss mindestens {0} satoshis/vbyte betragen +setting.preferences.txFeeTooLarge=Ihre Eingabe ist höher als jeder sinnvolle Wert (>5000 satoshis/vbyte). Transaktionsgebühren sind normalerweise zwischen 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Ignorierte Peers [Onion Adresse:Port] setting.preferences.ignoreDustThreshold=Min. nicht-dust Ausgabewert setting.preferences.currenciesInList=Währungen in Liste der Marktpreise @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=Hier wird das Wallet-Guthaben einschließli account.menu.walletInfo.xpub.headLine=Watch Keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} Wallet account.menu.walletInfo.path.headLine=HD Keychain Pfade -account.menu.walletInfo.path.info=Wenn Sie Seed Wörter in eine andere Wallet (wie Electrum) importieren, müssen Sie den Pfad angeben. Dies sollte nur in Notfällen gemacht werden, wenn Sie den Zugriff auf die Bisq-Wallet und das Data-Verzeichnis verloren haben.\nDenken Sie daran, dass die Ausgabe von Geldern aus einer Nicht-Bisq-Wallet die internen Bisq-Datenstrukturen, die mit den Wallet-Daten verbunden sind, durcheinander bringen kann, was zu fehlgeschlagenen Trades führen kann.\n\nSenden Sie NIEMALS BSQ von einer Nicht-Bisq-Wallet, da dies wahrscheinlich zu einer ungültigen BSQ-Transaktion und dem Verlust Ihrer BSQ führen wird. - +account.menu.walletInfo.path.info=Wenn Sie Seed Wörter in eine andere Wallet (wie Electrum) importieren, müssen Sie den Pfad definieren. Dies sollte nur in Notfällen geschehen, wenn Sie den Zugriff auf die Bisq-Wallet und das Datenverzeichnis verlieren.\nDenken Sie daran, dass die Ausgabe von Geldern aus einer Nicht-Bisq-Wallet die internen Bisq-Datenstrukturen, die mit den Wallet-Daten verbunden sind, durcheinander bringen kann, was zu fehlgeschlagenen Trades führen kann.\n\nSenden Sie NIEMALS BSQ von einer Nicht-Bisq-Wallet, da dies wahrscheinlich zu einer ungültigen BSQ-Transaktion und dem Verlust Ihrer BSQ führen wird.\n\n account.menu.walletInfo.openDetails=Wallet-Rohdaten und Private Schlüssel anzeigen ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=Die Einzahlungstransaktion des geschlo error.closedTradeWithNoDepositTx=Die Einzahlungstransaktion des geschlossenen Trades mit der Trade-ID {0} ist null.\n\nBitte starten Sie die Anwendung neu, um die Liste der geschlossenen Trades zu bereinigen. popup.warning.walletNotInitialized=Die Wallet ist noch nicht initialisiert -popup.warning.osxKeyLoggerWarning=Aufgrund strengerer Sicherheitsmaßnahmen ab MacOS 10.14 führt der Start einer Java-Anwendung (Bisq verwendet Java) zu einer Popup-Warnung in MacOS ("Bisq möchte Tastenanschläge von einer Anwendung empfangen").\n\nUm dieses Problem zu vermeiden, öffnen Sie bitte Ihre 'macOS-Einstellungen' und gehen Sie zu 'Sicherheit & Datenschutz' -> 'Datenschutz' -> 'Eingabe-Überwachung' und entfernen Sie 'Bisq' aus der Liste auf der rechten Seite.\n\nBisq wird auf eine neuere Java-Version upgraden, um dieses Problem zu vermeiden, sobald die technischen Einschränkungen (Java-Packager für die benötigte Java-Version wird noch nicht ausgeliefert) behoben sind. popup.warning.wrongVersion=Sie verwenden vermutlich die falsche Bisq-Version für diesen Computer.\nDie Architektur Ihres Computers ist: {0}.\nDie installierten Bisq-Binärdateien sind: {1}.\nBitte fahren Sie Bisq herunter und installieren die korrekte Version ({2}). popup.warning.incompatibleDB=Wir haben inkompatible Datenbankdateien entdeckt!\n\nDiese Datenbankdatei(en) ist (sind) nicht kompatibel mit unserer aktuellen Code-Basis:\n{0}\n\nWir haben ein Backup der beschädigten Datei(en) erstellt und die Standardwerte auf eine neue Datenbankversion angewendet.\n\nDas Backup befindet sich unter:\n{1}/db/backup_of_corrupted_data.\n\nBitte prüfen Sie, ob Sie die neueste Version von Bisq installiert haben.\nSie können sie herunterladen unter: [HYPERLINK:https://bisq.network/downloads].\n\nBitte starten Sie die Anwendung neu. popup.warning.startupFailed.twoInstances=Bisq läuft bereits. Sie können nicht zwei Instanzen von Bisq laufen lassen. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Anwendung wird heruntergefahren popup.shutDownInProgress.msg=Das Herunterfahren der Anwendung kann einige Sekunden dauern.\nBitte unterbrechen Sie diesen Vorgang nicht. popup.attention.forTradeWithId=Der Handel mit der ID {0} benötigt Ihre Aufmerksamkeit -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 bringt ein neues Feature mit sich: Man kann ganz einfach bestehende Angebote kopieren indem man per Rechtsklick auf das Angebot geht oder im Portfolio Menü handelt und "Erstelle ein gleiches Angebot..." auswählt. Das ist nützlich für Trader die oft das gleiche Angebot erstellen. popup.info.multiplePaymentAccounts.headline=Mehrere Zahlungskonten verfügbar popup.info.multiplePaymentAccounts.msg=Für dieses Angebot stehen Ihnen mehrere Zahlungskonten zur Verfügung. Bitte stellen Sie sicher, dass Sie das richtige ausgewählt haben. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Ungültiger Vermittler ECKey popup.accountSigning.success.headline=Glückwunsch popup.accountSigning.success.description=Alle {0} Zahlungskonten wurden erfolgreich unterzeichnet! -popup.accountSigning.generalInformation=Den Unterzeichnungsstand all Ihrer Konten finden Sie im Abschnitt Konto.\n\nFür weitere Informationen besuchen Sie bitte [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=Den Unterzeichnungsstand all Ihrer Konten finden Sie im Abschnitt Konto.\n\nFür weitere Informationen besuchen Sie bitte [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Eines Ihrer Zahlungskonten wurde von einem Vermittler verifiziert und unterzeichnet. Wenn Sie mit diesem Konto traden, wird das Konto Ihres Trade-Partners nach einem erfolgreichen Trade automatisch unterzeichnet.\n\n{0} popup.accountSigning.signedByPeer=Eines Ihrer Zahlungskonten wurde von einem Trade-Partner verifiziert und unterzeichnet. Ihr anfängliches Trade-Limit wird aufgehoben und Sie können in {0} Tagen andere Konten unterzeichnen.\n\n{1} popup.accountSigning.peerLimitLifted=Das anfängliche Limit für eines Ihrer Konten wurde aufgehoben.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Zusätzliche Informationen payment.shared.extraInfo.prompt=Gib spezielle Bedingungen, Abmachungen oder Details die bei ihren Angeboten unter diesem Zahlungskonto angezeigt werden sollen an. Nutzer werden diese Informationen vor der Annahme des Angebots sehen. payment.cashByMail.extraInfo.prompt=Bitte geben Sie bei Ihren Angeboten folgendes an (möglichst in Englisch):\n\nLand, in dem Sie sich befinden (z. B. France); \nLänder / Regionen, aus denen Sie Händel akzeptieren würden (z. B. France, EU, oder any European country); \nAlle besonderen Bedingungen/Konditionen;\nSonstige Details. payment.cashByMail.tradingRestrictions=Überprüfen Sie die Bedingungen und Konditionen des Erstellers.\nWenn Sie die Anforderungen nicht erfüllen, nehmen Sie diesen Handel nicht an. -payment.f2f.info=Persönliche 'Face to Face' Trades haben unterschiedliche Regeln und sind mit anderen Risiken verbunden als gewöhnliche Online-Trades.\n\nDie Hauptunterschiede sind:\n● Die Trading Partner müssen die Kontaktdaten und Informationen über den Ort und die Uhrzeit des Treffens austauschen.\n● Die Trading Partner müssen ihre Laptops mitbringen und die Bestätigung der "gesendeten Zahlung" und der "erhaltenen Zahlung" am Treffpunkt vornehmen.\n● Wenn ein Ersteller eines Angebots spezielle "Allgemeine Geschäftsbedingungen" hat, muss er diese im Textfeld "Zusatzinformationen" des Kontos angeben.\n● Mit der Annahme eines Angebots erklärt sich der Käufer mit den vom Anbieter angegebenen "Allgemeinen Geschäftsbedingungen" einverstanden.\n● Im Konfliktfall kann der Mediator oder Arbitrator nicht viel tun, da es in der Regel schwierig ist zu bestimmen, was beim Treffen passiert ist. In solchen Fällen können die Bitcoin auf unbestimmte Zeit oder bis zu einer Einigung der Trading Peers gesperrt werden.\n\nUm sicherzustellen, dass Sie die Besonderheiten der persönlichen 'Face to Face' Trades vollständig verstehen, lesen Sie bitte die Anweisungen und Empfehlungen unter: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info=Persönliche Händel "von Angesicht zu Angesicht" ('Face to Face') haben andere Regeln und andere Risiken als Online-Händel.\n\nDie Hauptunterschiede sind:\n● Die Handelspartner müssen Informationen über den Ort und die Uhrzeit des Treffens unter Verwendung ihrer angegebenen Kontaktdaten austauschen.\n● Die Handelspartner müssen ihre Laptops mitbringen und die Bestätigung "Zahlung gesendet" und "Zahlung erhalten" am Treffpunkt vornehmen.\n● Wenn der Ersteller eines Angebots spezielle "Geschäftsbedingungen" hat, muss er diese in seinem Konto unter dem Textfeld "Zusatzinformationen" angeben.\n● Mit der Annahme eines Angebots erklärt sich der Käufer mit den vom Ersteller angegebenen "Geschäftsbedingungen" einverstanden.\n● Im Konfliktfall kann der Vermittler oder die Schiedsperson nicht viel tun, da es in der Regel schwierig ist herauszubekommen, was bei dem Treffen wirklich passiert ist. In solchen Fällen bleiben die BTC auf unbestimmte Zeit gesperrt, oder bis die Handelspartner zu einer Einigung kommen.\n\nUm sicherzustellen, dass Sie die Besonderheiten der persönlichen "von Angesicht zu Angesicht" ('Face to Face') Händel vollständig verstehen, lesen Sie bitte die Anweisungen und Empfehlungen unter: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Webseite öffnen payment.f2f.offerbook.tooltip.countryAndCity=Land und Stadt: {0} / {1} payment.f2f.offerbook.tooltip.extra=Zusätzliche Informationen: {0} diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 7a4089bfd7a..39cf99b21fe 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=Esta oferta usa un método de pago que n offerbook.warning.counterpartyTradeRestrictions=Esta oferta no puede tomarse debido a restricciones de intercambio de la contraparte -offerbook.warning.newVersionAnnouncement=Con esta versión de software, los pares de intercambio pueden verificar y firmar entre sí sus cuentas de pago para crear una red de cuentas de pago de confianza.\n\nDespués de intercambiar con éxito con un par con una cuenta de pago verificada, su cuenta de pago será firmada y los límites de intercambio se elevarán después de un cierto intervalo de tiempo (la duración de este intervalo depende del método de verificación).\n\nPara más información acerca del firmado de cuentas, por favor vea la documentación en [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=Con esta versión de software, los pares de intercambio pueden verificar y firmar entre sí sus cuentas de pago para crear una red de cuentas de pago de confianza.\n\nDespués de intercambiar con éxito con un par con una cuenta de pago verificada, su cuenta de pago será firmada y los límites de intercambio se elevarán después de un cierto intervalo de tiempo (la duración de este intervalo depende del método de verificación).\n\nPara más información acerca del firmado de cuentas, por favor vea la documentación en [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=El monto de intercambio permitido está limitado a {0} debido a restricciones de seguridad basadas en los siguientes criterios:\n- La cuenta del comprador no ha sido firmada por un árbitro o par\n- El tiempo desde el firmado de la cuenta del comprador no es de al menos 30 días.\n- el método de pago para esta oferta se considera riesgoso para devoluciones de cargo\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=El monto de intercambio permitido está limitado a {0} debido a restricciones de seguridad basadas en los siguientes criterios:\n- Su cuenta de pago no ha sido firmada por un árbitro o par\n- El tiempo desde el firmado de su cuenta no es de al menos 30 días\n- El método de pago para esta oferta se considera riesgoso para devoluciones de cargo\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Revisar: Poner oferta para {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Dote de fondos su trato. # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Cantidad a intercambiar: {0}\n -createOffer.createOfferFundWalletInfo.msg=Necesita depositar {0} para completar esta oferta.\n\nEsos fondos son reservados en su cartera local y se bloquearán en la dirección de depósito multifirma una vez que alguien tome su oferta.\nLa cantidad es la suma de:\n{1}- Su depósito de seguridad: {2}\n- Comisión de intercambio: {3}\n- Comisión de minado: {4}\n\nPuede elegir entre dos opciones a la hora de depositar fondos para realizar su intercambio:\n- Usar su cartera Bisq (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente con mayor privacidad)\n\nConocerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. +createOffer.createOfferFundWalletInfo.msg=Necesita depositar {0} para crear esta oferta.\n\nLos fondos son reservados en su cartera local y se bloquearán en la dirección de depósito multifirma una vez que alguien tome su oferta.\nLa cantidad es la suma de:\n{1}- Su depósito de seguridad: {2}\n- Tasa de intercambio: {3}\n- Tasa de minado: {4}\n\nPuede elegir entre dos opciones a la hora de depositar fondos para realizar su intercambio:\n- Usar su cartera Bisq (conveniente, pero las transacciones pueden ser trazables) O también\n- Transferir desde una cartera externa (potencialmente más privado)\n\nConocerá todos los detalles y opciones para depositar fondos al cerrar esta ventana. # 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=Ocurrió un error al colocar la oferta:\n\n{0}\n\nNingún importe de su cartera ha sido deducido aún.\nPor favor, reinicie su aplicación y compruebe su conexión a la red. @@ -558,15 +558,15 @@ portfolio.tab.pendingTrades=Intercambios abiertos portfolio.tab.history=Historial portfolio.tab.failed=Fallidas portfolio.tab.editOpenOffer=Editar oferta -portfolio.tab.duplicateOffer=Duplicate offer -portfolio.context.offerLikeThis=Create new offer like this... -portfolio.context.notYourOffer=You can only duplicate offers where you were the maker. +portfolio.tab.duplicateOffer=Duplicar oferta +portfolio.context.offerLikeThis=Crear nueva oferta como esta... +portfolio.context.notYourOffer=Solo puede duplicar las ofertas en que fue el creador. portfolio.closedTrades.deviation.help=Desviación porcentual de precio de mercado portfolio.pending.invalidTx=Hay un problema con una transacción inválida o no encontrada.\n\nPor faovr NO envíe el pago de fiat o altcoins.\n\nAbra un ticket de soporte para obtener asistencia de un mediador.\n\nMensaje de error: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=El depósito de seguridad en el intercambio{0} aún no se ha confirmado después de {1} horas. Compruebe la transacción de depósito en un explorador de bloques; si ha sido confirmado pero Bisq no lo muestra como tal: \n● Haga una copia de seguridad [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Resincronice el archivo SPV. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContacte con el soporte de Bisq [HYPERLINK:https://keybase.io/team/bisq] si tiene dudas o el problema persiste. portfolio.pending.step1.waitForConf=Esperar a la confirmación en la cadena de bloques portfolio.pending.step2_buyer.startPayment=Comenzar pago @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=El par de intercambio ha ace portfolio.pending.mediationResult.button=Ver resolución propuesta portfolio.pending.mediationResult.popup.headline=Resultado de mediación para el intercambio con ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=El par de intercambio ha aceptado la sugerencia del mediador para el intercmabio {0} -portfolio.pending.mediationResult.popup.info=El mediador ha sugerido el siguiente pago:\nUsted recibe: {0}\nEl par de intercambio recibe: {1}\n\nUsted puede aceptar o rechazar esta sugerencia de pago.\n\nAceptándola, usted firma el pago propuesto. Si su par de intercambio también acepta y firma, el pago se completará y el intercambio se cerrará.\n\nSi una o ambas partes rechaza la sugerencia, tendrá que esperar hasta {2} (bloque {3}) para abrir una segunda ronda de disputa con un árbitro que investigará el caso de nuevo y realizará el pago de acuerdo a sus hallazgos.\n\nEl árbitro puede cobrar una tasa pequeña (tasa máxima: el depósito de seguridad del comerciante) como compensación por su trabajo. Que las dos partes estén de acuerdo es el buen camino, ya que requerir arbitraje se reserva para circunstancias excepcionales, como que un comerciante esté seguro de que el mediador hizo una sugerencia de pago injusta (o que la otra parte no responda).\n\nMás detalles acerca del nuevo modelo de arbitraje:\n[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Ha aceptado el pago sugerido por el mediador, pero parece que su par de intercambio no lo ha aceptado.\n\nUna vez que finaliza el tiempo de bloqueo en el {0} (bloque {1}), puede abrir una segunda ronda de disputa con un árbitro que investigará el caso nuevamente y realizará un pago en función de sus hallazgos.\n\nPuede encontrar más detalles sobre el modelo de arbitraje en:\n[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=El mediador ha sugerido el siguiente pago:\nUsted recibe: {0}\nEl par de intercambio recibe: {1}\n\nUsted puede aceptar o rechazar esta sugerencia de pago.\n\nAceptándola, usted firma el pago propuesto. Si su par de intercambio también acepta y firma, el pago se completará y el intercambio se cerrará.\n\nSi una o ambas partes rechaza la sugerencia, tendrá que esperar hasta {2} (bloque {3}) para abrir una segunda ronda de disputa con un árbitro que investigará el caso de nuevo y realizará el pago de acuerdo a sus hallazgos.\n\nEl árbitro puede cobrar una tasa pequeña (tasa máxima: el depósito de seguridad del comerciante) como compensación por su trabajo. Que las dos partes estén de acuerdo es el buen camino, ya que requerir arbitraje se reserva para circunstancias excepcionales, como que un comerciante esté seguro de que el mediador hizo una sugerencia de pago injusta (o que la otra parte no responda).\n\nMás detalles acerca del nuevo modelo de arbitraje:\n[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Ha aceptado el pago sugerido por el mediador, pero parece que su par de intercambio no lo ha aceptado.\n\nUna vez que finaliza el tiempo de bloqueo en el {0} (bloque {1}), puede abrir una segunda ronda de disputa con un árbitro que investigará el caso nuevamente y realizará un pago en función de sus hallazgos.\n\nPuede encontrar más detalles sobre el modelo de arbitraje en:\n[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Rechazar y solicitar arbitraje portfolio.pending.mediationResult.popup.alreadyAccepted=Ya ha aceptado @@ -879,7 +879,7 @@ funds.withdrawal.fillDestAddress=Introduzca su dirección de destino funds.withdrawal.warn.noSourceAddressSelected=Necesita seleccionar una fuente de direcciones en la tabla superior. funds.withdrawal.warn.amountExceeds=No tiene suficientes fondos disponibles en la dirección seleccionada.\nConsidere seleccionar múltiples direcciones en la tabla superior o cambien el selector de comisión para incluir una comisión de minería. funds.withdrawal.txFee=Tasa de transacción de retiro (satoshis/vbyte) -funds.withdrawal.useCustomFeeValueInfo=Insert a custom transaction fee value +funds.withdrawal.useCustomFeeValueInfo=Introduzca un valor personalizado de tasa de transacción funds.withdrawal.useCustomFeeValue=Usar valor personalizado funds.withdrawal.txFeeMin=La tasa de transacción debe ser al menos de {0} sat/vbyte funds.withdrawal.txFeeTooLarge=El valor introducido está muy por encima de lo razonable (>5000 satoshis/vbyte). La tasa de transacción normalmente está en el rango de 50-400 satoshis/vbyte. @@ -982,7 +982,7 @@ support.buyerTaker=comprador/Tomador BTC support.sellerTaker=vendedor/Tomador BTC support.backgroundInfo=Bisq no es una compañía, por ello maneja las disputas de una forma diferente.\n\nLos compradores y vendedores pueden comunicarse a través de la aplicación por un chat seguro en la pantalla de intercambios abiertos para intentar resolver una disputa por su cuenta. Si eso no es suficiente, un mediador puede intervenir para ayudar. El mediador evaluará la situación y dará una recomendación para el pago de los fondos de la transacción. Si ambos aceptan esta sugerencia, la transacción del pago se completa y el intercambio se cierra. Si uno o ambos no están de acuerdo con el pago recomendado por el mediador, pueden solicitar arbitraje. El árbitro re-evaluará la situación y, si es necesario, hará el pago personalmente y solicitará un reembolso de este pago a la DAO de Bisq. -support.initialInfo=Por favor, introduzca una descripción de su problema en el campo de texto de abajo. Añada tanta información como sea posible para agilizar la resolución de la disputa.\n\nEsta es una lista de la información que usted debe proveer:\n\t● Si es el comprador de BTC: ¿Hizo la transferencia Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago iniciado' en la aplicación?\n\t● Si es el vendedor de BTC: ¿Recibió el pago Fiat o Altcoin? Si es así, ¿Pulsó el botón 'pago recibido' en la aplicación?\n\t● ¿Qué versión de Bisq está usando?\n\t● ¿Qué sistema operativo está usando?\n\t● Si tiene problemas con transacciones fallidas, por favor considere cambiar a un nuevo directorio de datos.\n\tA veces el directorio de datos se corrompe y causa errores extraños.\n\tVer: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarícese con las reglas básicas del proceso de disputa:\n\t● Tiene que responder a los requerimientos de {0} en 2 días.\n\t● Los mediadores responden en 2 días. Los árbitros responden en 5 días laborables.\n\t● El periodo máximo para una disputa es de 14 días.\n\t● Tiene que cooperar con {1} y proveer la información necesaria que soliciten.\n\t● Aceptó la reglas esbozadas en el documento de disputa en el acuerdo de usuario cuando inició por primera ver la aplicación.\n\nPuede leer más sobre el proceso de disputa en: {2} +support.initialInfo=Por favor, introduzca una descripción de su problema en el campo de texto inferior. Añada tanta información como sea posible para acelerar el tiempo de resolución de la disputa.\n\nAquí tiene una lista de la información que debería proveer:\n● Si es comprador de BTC: ¿Realizó la transferencia de FIAT o de altcoins? Si es así, ¿hizo clic en el botón "pago iniciado" de la aplicación?\n● Si es el vendedor BTC: ¿Recibió el pago FIAT o de altcoin? Si es así, ¿hizo clic en el botón "pago recibido" de la aplicación?\n● ¿Qué versión de Bisq está usando?\n● ¿Qué sistema operativo está usando?\n● Si ha encontrado algún problema con transacciones fallidas por favor considere cambiar a un nuevo directorio de datos.\nA veces el directorio de datos se corrompe y provoca fallas extrañas.\nVer: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPor favor familiarícese con las reglas básicas del proceso de disputa:\n● Tiene que responder a el requerimiento del árbitro en 2 días.\n● El periodo máximo de una disputa es de 14 días.\n● Necesita cooperar con el árbitro y proveer la información que le soliciten para resolver su caso.\n● Ha aceptado las reglas descritas en el documento de disputa en el acuerdo de usuario la primera vez que inició la aplicación.\n\nPuede leer más acerca del proceso de disputa en {2} support.systemMsg=Mensaje de sistema: {0} support.youOpenedTicket=Ha abierto una solicitud de soporte.\n\n{0}\n\nVersión Bisq: {1} support.youOpenedDispute=Ha abierto una solicitud de disputa.\n\n{0}\n\nVersión Bisq: {1} @@ -1017,8 +1017,10 @@ setting.preferences.autoConfirmRequiredConfirmations=Confirmaciones requeridas setting.preferences.autoConfirmMaxTradeSize=Cantidad máxima de intecambio (BTC) setting.preferences.autoConfirmServiceAddresses=Explorador de URLs Monero (usa Tor, excepto para localhost, direcciones LAN IP, y hostnames *.local) setting.preferences.deviationToLarge=No se permiten valores superiores a {0}% -setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) +setting.preferences.txFee=Tasa de transacción de retiro de BSQ (satoshis/vbyte) setting.preferences.useCustomValue=Usar valor personalizado +setting.preferences.txFeeMin=La tasa de transacción debe ser al menos de {0} sat/vbyte +setting.preferences.txFeeTooLarge=El valor introducido está muy por encima de lo razonable (>5000 satoshis/vbyte). La tasa de transacción normalmente está en el rango de 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Pares ignorados [dirección onion:puerto] setting.preferences.ignoreDustThreshold=Valor mínimo de output que no sea dust setting.preferences.currenciesInList=Monedas en lista para precio de mercado @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=Esto muestrta el balance interno del monede account.menu.walletInfo.xpub.headLine=Claves centinela (xpub keys) account.menu.walletInfo.walletSelector={0} {1} monedero account.menu.walletInfo.path.headLine=ruta HD keychain -account.menu.walletInfo.path.info=Si importa las palabras semilla en otro monedero (como Electru), tendrá que definir la ruta. Esto debería hacerse solo en casos de emergencia, cuando pierda acceso a el monedero Bisq y el directorio de datos.\nTenga en cuenta que gastar fondos desde un monedero no-Bisq puede estropear la estructura de datos interna de Bisq asociado a los datos de monedero, lo que puede llevar a intercambios fallidos.\n\nNUNCA envíe BSQ desde un monedero no-Bisq, ya que probablemente llevará a una transacción inválida de BSQ y le hará perder sus BSQ. - +account.menu.walletInfo.path.info=Si importa las palabras semilla en otro monedero (como Electrum), tendrá que definir la ruta. Esto debería hacerse solo en casos de emergencia, cuando pierda acceso a el monedero Bisq y el directorio de datos.\nTenga en cuenta que gastar fondos desde un monedero no-Bisq puede estropear la estructura de datos interna de Bisq asociado a los datos de monedero, lo que puede llevar a intercambios fallidos.\n\nNUNCA envíe BSQ desde un monedero no-Bisq, ya que probablemente llevará a una transacción inválida de BSQ y le hará perder sus BSQ. account.menu.walletInfo.openDetails=Mostrar detalles en bruto y claves privadas ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=La transacción de depósito de el int error.closedTradeWithNoDepositTx=El depósito de transacción de el intercambio cerrado con ID de intercambio {0} es inválido.\nPor favor reinicie la aplicación para limpiar la lista de intercambios cerrados. popup.warning.walletNotInitialized=La cartera aún no sea ha iniciado -popup.warning.osxKeyLoggerWarning=Debido a medidas de seguridad más estrictas en macOS 10.14 y siguientes, al iniciar una aplicación Java (Bisq usa Java) causa un popup de alarma en macOS ('Bisq would like to receive keystrokes from any application').\n\nPara evitar esto por favor abra su 'Configuración macOS' y vaya a 'Seguridad y privacidad' -> 'Privacidad¡ -> 'Monitorización de inputs' y elimine 'Bisq' de la lista a la derecha.\n\nBisq actualizara a una nueva versión de Java para evitar que este problema tan pronto como se resuelvan las limitaciones técnicas (el paquete de Java para la versión requerida de Java aún no se ha emitido). popup.warning.wrongVersion=Probablemente tenga una versión de Bisq incorrecta para este ordenador.\nLa arquitectura de su ordenador es: {0}.\nLos binarios de Bisq instalados son: {1}.\nPor favor cierre y reinstale la versión correcta ({2}). popup.warning.incompatibleDB=¡Hemos detectado archivos de base de datos incompatibles!\n\nEstos archivos de base de datos no son compatibles con nuestro actual código base:\n{0}\n\nHemos hecho una copia de seguridad de los archivos corruptos y aplicado los valores por defecto a la nueva versión de base de datos.\n\nLa copia de seguridad se localiza en:\n{1}/db/backup_of_corrupted_data.\n\nPor favor, compruebe si tiene la última versión de Bisq instalada.\nPuede descargarla en:\n[HYPERLINK:https://bisq.network/downloads]\n\nPor favor, reinicie la aplicación. popup.warning.startupFailed.twoInstances=Ya está ejecutando Bisq. No puede ejecutar dos instancias de Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Cerrando aplicación... popup.shutDownInProgress.msg=Cerrar la aplicación puede llevar unos segundos.\nPor favor no interrumpa el proceso. popup.attention.forTradeWithId=Se requiere atención para el intercambio con ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=La versión 1.6.3 introduce una nueva función que permite la re-introducción de ofertas haciendo click derecho en una oferta existente o un intercambio en el menú Portafolio eligiendo `Crear una nueva oferta como esta`. Esto es útil para los comerciantes que hacen la misma oferta de manera frecuente. popup.info.multiplePaymentAccounts.headline=Múltiples cuentas de pago disponibles popup.info.multiplePaymentAccounts.msg=Tiene múltiples cuentes de pago disponibles para esta oferta. Por favor, asegúrese de que ha elegido la correcta. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=ECKey de mal árbitro popup.accountSigning.success.headline=Felicidades popup.accountSigning.success.description=Todas las cuentas de pago {0} se firmaron con éxito! -popup.accountSigning.generalInformation=Encontrará el estado de firma de todas sus cuentas en la sección de cuentas.\n\nPara más información, por favor visite [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=Encontrará el estado de firma de todas sus cuentas en la sección de cuentas.\n\nPara más información, por favor visite [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Una de sus cuentas de pago ha sido verificada y firmada por un árbitro. Intercambiar con esta cuenta firmará automáticamente la cuenta de su par de intercambio después de un intercambio exitoso.\n\n{0} popup.accountSigning.signedByPeer=Una de sus cuentas de pago ha sido verificada y firmada por un par de intercambio. Su límite inicial de intercambio ha sido elevado y podrá firmar otras cuentas en {0} días desde ahora.\n\n{1} popup.accountSigning.peerLimitLifted=El límite inicial para una de sus cuentas se ha elevado.\n\n{0} @@ -2700,7 +2700,7 @@ payment.checking=Comprobando payment.savings=Ahorros payment.personalId=ID personal: payment.makeOfferToUnsignedAccount.warning=Tras el reciente incremento del precio de BTC, tenga en cuenta que vender 0.01BTC o menos incurre en un mayor riesgo que antes.\n\nEs altamente recomendado que:\n- haga ofertas >0.01BTC de tal modo que solo intercambie con comerciantes firmados/de confianza\n- mantenga las ofertas para vender <0.01BTC alrededor de ~100USD, ya que este valor históricamente no es atractivo para estafadores\n\nLos desarrolladores de Bisq están trabajando en mejores maneras de asegurar que el modelo de cuenta de pago para estos intercambios menores. Únase a la discusión en: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. -payment.takeOfferFromUnsignedAccount.warning=With the recent rise in BTC price, beware that selling 0.01 BTC or less incurs higher risk than before.\n\nIt is highly recommended to either:\n- take offers from signed buyers only\n- keep trades with unsigned/untrusted buyers to around ~100 USD in value, as this value has (historically) discouraged scammers\n\nBisq developers are working on better ways to secure the payment account model for such smaller trades. Join the discussion here: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. +payment.takeOfferFromUnsignedAccount.warning=Con el reciente aumento del precio de BTC, tenga en cuenta que vender 0.01BTC o menos incurre en un mayor riesgo.\n\nSe recomienda:\n- tomar ofertas solo de compradores firmados\n- hacer intercambios con pares no firmados de alrededor de 100USD de valor, ya que históricamente ha evitado a los estafadores.\n\nLos desarrolladores de Bisq están trabajando en mejorar la seguridad de los métodos de pago en estos intercambios. Únase a la discusión aquí: [HYPERLINK:https://github.com/bisq-network/bisq/discussions/5339]. payment.clearXchange.info=Zelle es un servicio de transmisión de dinero que funciona mejor *a través* de otro banco..\n\n1. Compruebe esta página para ver si (y cómo) trabaja su banco con Zelle: [HYPERLINK:https://www.zellepay.com/get-started]\n\n2. Preste atención a los límites de transferencia -límites de envío- que varían entre bancos, y que los bancos especifican a menudo diferentes límites diarios, semanales y mensuales..\n\n3. Si su banco no trabaja con Zelle, aún puede usarlo a través de la app móvil de Zelle, pero sus límites de transferencia serán mucho menores.\n\n4. El nombre especificado en su cuenta Bisq DEBE ser igual que el nombre en su cuenta de Zelle/bancaria. \n\nSi no puede completar una transacción Zelle tal como se especifica en el contrato, puede perder algo (o todo) el depósito de seguridad!\n\nDebido a que Zelle tiene cierto riesgo de reversión de pago, se aconseja que los vendedores contacten con los compradores no firmados a través de email o SMS para verificar que el comprador realmente tiene la cuenta de Zelle especificada en Bisq. payment.fasterPayments.newRequirements.info=Algunos bancos han comenzado a verificar el nombre completo del receptor para las transferencias Faster Payments. Su cuenta actual Faster Payments no especifica un nombre completo.\n\nConsidere recrear su cuenta Faster Payments en Bisq para proporcionarle a los futuros compradores {0} un nombre completo.\n\nCuando vuelva a crear la cuenta, asegúrese de copiar el UK Short Code de forma precisa , el número de cuenta y los valores salt de la cuenta anterior a su cuenta nueva para la verificación de edad. Esto asegurará que la edad de su cuenta existente y el estado de la firma se conserven. payment.moneyGram.info=Al utilizar MoneyGram, el comprador de BTC tiene que enviar el número de autorización y una foto del recibo al vendedor de BTC por correo electrónico. El recibo debe mostrar claramente el nobre completo del vendedor, país, estado y cantidad. El email del vendedor se mostrará al comprador durante el proceso de intercambio. @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Información adicional payment.shared.extraInfo.prompt=Defina cualquier término especial, condiciones o detalles que quiera mostrar junto a sus ofertas para esta cuenta de pago (otros usuarios podrán ver esta información antes de aceptar las ofertas). payment.cashByMail.extraInfo.prompt=Por favor indique en sus ofertas:\n\nEl país en el que se encuentra (p.ej. Francia);\nPaíses / regiones desde las que acepta intercambios (p.ej. Francia, EU o cualquier país europeo);\nCaulquier término o condición especial;\nCualquier otros detalles. payment.cashByMail.tradingRestrictions=Por favor revise los términos y condiciones del creador de la oferta.\nSi no cumple con los requerimientos, no la tome. -payment.f2f.info=Los intercambios 'Cara a Cara' tienen diferentes reglas y riesgos que las transacciones en línea.\n\nLas principales diferencias son:\n● Los pares de intercambio necesitan intercambiar información acerca del punto de reunión y la hora usando los detalles de contacto proporcionados.\n● Los pares de intercambio tienen que traer sus portátiles y hacer la confirmación de 'pago enviado' y 'pago recibido' en el lugar de reunión.\n● Si un creador tiene 'términos y condiciones' especiales necesita declararlos en el campo de texto 'información adicional' en la cuenta.\n● Tomando una oferta el tomador está de acuerdo con los 'términos y condiciones' declarados por el creador.\n● En caso de disputa el árbitro no puede ayudar mucho ya que normalmente es complicado obtener evidencias no manipulables de lo que ha pasado en una reunión. En estos casos los fondos BTC pueden bloquearse indefinidamente o hasta que los pares lleguen a un acuerdo.\n\nPara asegurarse de que comprende las diferencias con los intercambios 'Cara a Cara' por favor lea las instrucciones y recomendaciones en: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info=Los intercambios 'Cara a Cara' tienen diferentes reglas y riesgos que las transacciones en línea.\n\nLas principales diferencias son:\n● Los pares de intercambio necesitan intercambiar información acerca del punto de reunión y la hora usando los detalles de contacto proporcionados.\n● Los pares de intercambio tienen que traer sus portátiles y hacer la confirmación de 'pago enviado' y 'pago recibido' en el lugar de reunión.\n● Si un creador tiene 'términos y condiciones' especiales necesita declararlos en el campo de texto 'información adicional' en la cuenta.\n● Tomando una oferta el tomador está de acuerdo con los 'términos y condiciones' declarados por el creador.\n● En caso de disputa el árbitro no puede ayudar mucho ya que normalmente es complicado obtener evidencias no manipulables de lo que ha pasado en una reunión. En estos casos los fondos BTC pueden bloquearse indefinidamente o hasta que los pares lleguen a un acuerdo.\n\nPara asegurarse de que comprende las diferencias con los intercambios 'Cara a Cara' por favor lea las instrucciones y recomendaciones en: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Abrir paǵina web payment.f2f.offerbook.tooltip.countryAndCity=País y ciudad: {0} / {1} payment.f2f.offerbook.tooltip.extra=Información adicional: {0} diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index dccd9d8ca6a..ba9e5d8bba0 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=This offer cannot be taken due to counterparty trade restrictions -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- The buyer''s account has not been signed by an arbitrator or a peer\n- The time since signing of the buyer''s account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- Your account has not been signed by an arbitrator or a peer\n- The time since signing of your account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=بررسی: پیشنهاد را برای {0} بی createOffer.createOfferFundWalletInfo.headline=پیشنهاد خود را تامین وجه نمایید # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=مقدار معامله:{0}\n -createOffer.createOfferFundWalletInfo.msg=شما باید {0} برای این پیشنهاد، سپرده بگذارید.\nآن وجوه در کیف پول محلی شما ذخیره شده اند و هنگامی که کسی پیشنهاد شما را دریافت می کند، به آدرس سپرده چند امضایی قفل خواهد شد.\n\nمقدار مذکور، مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-هزینه تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Bisq خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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لطفاً برنامه را مجدداً راه اندازی کرده و ارتباط اینترنت خود را بررسی نمایید. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=امکان پذیرفتن پیشنهاد وجود takeOffer.takeOfferFundWalletInfo.headline=معامله خود را تأمین وجه نمایید # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=مقدار معامله: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=شما باید {0} برای قبول این پیشنهاد، سپرده بگذارید.\nاین مقدار مجموع موارد ذیل است:\n{1} - سپرده‌ی اطمینان شما: {2}\n-هزینه معامله: {3}\n-تمامی هزینه های تراکنش شبکه: {4}\nشما هنگام تامین مالی معامله‌ی خود، می‌توانید بین دو گزینه انتخاب کنید:\n- از کیف پول Bisq خود استفاده کنید (این روش راحت است، اما ممکن است تراکنش‌ها قابل رصد شوند)، یا\n- از کیف پول خارجی انتقال دهید (به طور بالقوه‌ای این روش ایمن‌تر و محافظ حریم خصوصی شما است)\n\nشما تمام گزینه‌ها و جزئیات تامین مالی را پس از بستن این پنجره، خواهید دید. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=اگر شما در حال حاضر در وجوه، پرداختی داشته اید، می توانید آن را در صفحه ی \"وجوه/ارسال وجوه\" برداشت کنید. takeOffer.paymentInfo=اطلاعات پرداخت takeOffer.setAmountPrice=تنظیم مقدار @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=برای تأییدیه بلاک چین منتظر باشید portfolio.pending.step2_buyer.startPayment=آغاز پرداخت @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Your trade peer has accepted portfolio.pending.mediationResult.button=View proposed resolution portfolio.pending.mediationResult.popup.headline=Mediation result for trade with ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Your trade peer has accepted the mediator''s suggestion for trade {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbitration portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted @@ -982,7 +982,7 @@ support.buyerTaker=خریدار/پذیرنده‌ی بیتکوین support.sellerTaker=فروشنده/پذیرنده‌ی بیتکوین support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=پیغام سیستم: {0} support.youOpenedTicket=شما یک درخواست برای پشتیبانی باز کردید.\n\n{0}\n\nنسخه Bisq شما: {1} support.youOpenedDispute=شما یک درخواست برای یک اختلاف باز کردید.\n\n{0}\n\nنسخه Bisq شما: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=مقادیر بزرگتر از {0}% مجاز نیست. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=استفاده از ارزش سفارشی +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Ignored peers [onion address:port] setting.preferences.ignoreDustThreshold=Min. non-dust output value setting.preferences.currenciesInList=ارزها در لیست قیمت روز بازار @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=کیف پول هنوز راه اندازی اولیه نشده است -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=شما احتمالاً نسخه اشتباه Bisq را برای این رایانه دارید.\nمعماری کامپیوتر شما این است: {0}.\nباینری Bisq که شما نصب کرده اید،عبارت است از: {1}.\nلطفاً نسخه فعلی را خاموش کرده و مجدداً نصب نمایید ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq در حال اجرا است. شما نمیتوانید دو نمونه از Bisq را اجرا کنید. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=خاموش شدن در حال انجام اس popup.shutDownInProgress.msg=خاتمه دادن به برنامه می تواند چند ثانیه طول بکشد.\n لطفا این روند را قطع نکنید. popup.attention.forTradeWithId=توجه الزامی برای معامله با شناسه {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Bad arbitrator ECKey popup.accountSigning.success.headline=Congratulations popup.accountSigning.success.description=All {0} payment accounts were successfully signed! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=One of your payment accounts has been verified and signed by an arbitrator. Trading with this account will automatically sign your trading peer''s account after a successful trade.\n\n{0} popup.accountSigning.signedByPeer=One of your payment accounts has been verified and signed by a trading peer. Your initial trading limit will be lifted and you''ll be able to sign other accounts in {0} days from now.\n\n{1} popup.accountSigning.peerLimitLifted=The initial limit for one of your accounts has been lifted.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=اطلاعات اضافی payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=باز کردن صفحه وب payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1} payment.f2f.offerbook.tooltip.extra=اطلاعات اضافی: {0} diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index ac018636f3c..d1675f1020e 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=Cette offre utilise un mode de paiement offerbook.warning.counterpartyTradeRestrictions=Cette offre ne peut être acceptée en raison de restrictions d'échange imposées par les contreparties -offerbook.warning.newVersionAnnouncement=Avec cette version du logiciel, les partenaires commerciaux peuvent confirmer et vérifier les comptes de paiement de chacun pour créer un réseau de comptes de paiement de confiance.\n\nUne fois la transaction réussie avec un pair, votre compte de paiement sera vérifié et les restrictions de transaction seront levées après une certaine période de temps (cette durée est basée sur la méthode de vérification).\n\nPour plus d'informations sur la vérification de votre compte, veuillez consulter le document sur [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=Le montant de transaction autorisé est limité à {0} en raison des restrictions de sécurité basées sur les critères suivants:\n- Le compte de l''acheteur n''a pas été signé par un arbitre ou par un pair\n- Le délai depuis la signature du compte de l''acheteur est inférieur à 30 jours\n- Le mode de paiement pour cette offre est considéré comme présentant un risque de rétrofacturation bancaire\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=Le montant de transaction autorisé est limité à {0} en raison des restrictions de sécurité basées sur les critères suivants:\n- Votre compte n''a pas été signé par un arbitre ou par un pair\n- Le délai depuis la signature de votre compte est inférieur à 30 jours\n- Le mode de paiement pour cette offre est considéré comme présentant un risque de rétrofacturation bancaire\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Review: Placer un ordre de {0} Bitcoin createOffer.createOfferFundWalletInfo.headline=Financer votre ordre # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=Montant du trade: {0}\n\n -createOffer.createOfferFundWalletInfo.msg=Vous devez déposer {0} pour cet ordre.\n\nCes fonds sont réservés dans votre portefeuille local et seront bloqués sur une adresse de dépôt multisig une fois que quelqu''un aura accepté votre ordre.\n\nLe montant correspond à la somme de:\n{1}- Votre dépôt de garantie: {2}\n- Frais de trading: {3}\n- Frais d''exploitation minière: {4}\n\nVous avez le choix entre deux options pour financer votre transaction :\n- Utilisez votre portefeuille Bisq (pratique, mais les transactions peuvent être associables) OU\n- Transfert depuis un portefeuille externe (potentiellement plus privé)\n\nVous pourrez voir toutes les options de financement et les détails après avoir fermé ce popup. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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=Une erreur s''est produite lors du placement de cet ordre:\n\n{0}\n\nAucun fonds n''a été prélevé sur votre portefeuille pour le moment.\nVeuillez redémarrer l''application et vérifier votre connexion réseau. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Vous ne pouvez pas accepter cet ordre, car celui- takeOffer.takeOfferFundWalletInfo.headline=Provisionner votre trade # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Montant du trade: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=Vous devez envoyer {0} pour cet odre.\n\nLe montant est la somme de:\n{1}--Dépôt de garantie: {2}\n- Frais de transaction: {3}\n- Frais de minage: {4}\n\nVous avez deux choix pour payer votre transaction :\n- Utiliser votre portefeuille local Bisq (pratique, mais vos transactions peuvent être tracées) OU\n- Transférer d''un portefeuille externe (potentiellement plus confidentiel)\n\nVous retrouverez toutes les options de provisionnement après fermeture de ce popup. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Si vous avez déjà provisionner des fonds vous pouvez les retirer dans l'onglet \"Fonds/Envoyer des fonds\". takeOffer.paymentInfo=Informations de paiement takeOffer.setAmountPrice=Définir le montant @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Pourcentage de déviation du prix par rapp portfolio.pending.invalidTx=Il y a un problème avec une transaction manquante ou invalide.\n\nVeuillez NE PAS envoyer le paiement Fiat ou altcoin.\n\nOuvrez un ticket de support pour obtenir l'aide d'un médiateur.\n\nMessage d'erreur: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Attendre la confirmation de la blockchain portfolio.pending.step2_buyer.startPayment=Initier le paiement @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Votre pair de trading a acce portfolio.pending.mediationResult.button=Voir la résolution proposée portfolio.pending.mediationResult.popup.headline=Résultat de la médiation pour la transaction avec l''ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Votre pair de trading a accepté la suggestion du médiateur pour la transaction {0} -portfolio.pending.mediationResult.popup.info=Le médiateur a proposé le paiement suivant:\nVous paierez: {0} \nVotre pair de trade paiera: {1} \n\nVous pouvez accepter ou refuser cette proposition de paiement.\n\nEn acceptant, vous signez la transaction de paiement proposée. Si votre homologue accepte et signe également, le paiement sera effectué et la transaction sera clôturée.\n\nSi l'un de vous ou les deux refusent la proposition, vous devrez attendre le {2} (bloc {3}) pour commencer le deuxième tour de discussion sur le différend avec l'arbitre, et ce dernier étudiera à nouveau le cas. Le paiement sera fait en fonction de ses résultats.\n \nL'arbitre peut demander une petite rémunération (maximum : le dépôt de garantie du trader) en compensation de son travail. L'accord des deux traders sur la proposition du médiateur est la résolution la plus heureuse - la demande d'arbitrage est destinée aux circonstances exceptionnelles, par exemple si un trader est certain que le médiateur n'a pas proposé un paiement équitable (ou si l'autre trader ne répond pas).\n\nPlus de détails sur le nouveau modèle d'arbitrage: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=Vous avez accepté la proposition de paiement du médiateur, mais il semble que votre contrepartie ne l'ait pas acceptée. \n\nUne fois que le temps de verrouillage atteint {0} (bloc {1}), vous pouvez ouvrir le second tour de litige pour que l'arbitre réétudie le cas et prend une nouvelle décisionsur la base de sa conclusion\n\nVous trouverez plus d'informations sur le modèle d'arbitrage sur:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Refuser et demander un arbitrage portfolio.pending.mediationResult.popup.alreadyAccepted=Vous avez déjà accepté @@ -982,7 +982,7 @@ support.buyerTaker=Acheteur BTC/Taker support.sellerTaker=Vendeur BTC/Taker support.backgroundInfo=Bisq n'est pas une entreprise, donc elle traite les litiges différemment.\n\nLes traders peuvent communiquer au sein de l'application via un chat sécurisé sur l'écran des transactions ouvertes pour essayer de résoudre les litiges par eux-mêmes. Si cela ne suffit pas, un médiateur peut intervenir pour les aider. Le médiateur évaluera la situation et suggérera un paiement des fonds de transaction. Si les deux traders acceptent cette suggestion, la transaction de paiement est réalisée et l'échange est clos. Si un ou les deux traders n'acceptent pas le paiement suggéré par le médiateur, ils peuvent demander un arbitrage. L'arbitre réévaluera la situation et, si cela est justifié, remboursera personnellement le négociateur et demandera le remboursement de ce paiement à la DAO Bisq. -support.initialInfo=Veuillez entrer une description de votre problème dans le champ texte ci-dessous. Ajoutez autant d''informations que possible pour accélérer le temps de résolution du litige.\n\nVoici une check list des informations que vous devez fournir :\n● Si vous êtes l''acheteur BTC : Avez-vous effectué le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement commencé" dans l''application ?\n● Si vous êtes le vendeur BTC : Avez-vous reçu le paiement Fiat ou Altcoin ? Si oui, avez-vous cliqué sur le bouton "paiement reçu" dans l''application ?\n● Quelle version de Bisq utilisez-vous ?\n● Quel système d''exploitation utilisez-vous ?\n● Si vous avez rencontré un problème avec des transactions qui ont échoué, veuillez envisager de passer à un nouveau répertoire de données.\nParfois, le répertoire de données est corrompu et conduit à des bogues étranges. \nVoir : https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nVeuillez vous familiariser avec les règles de base du processus de règlement des litiges :\n● Vous devez répondre aux demandes des {0} dans les 2 jours.\n● Les médiateurs répondent dans un délai de 2 jours. Les arbitres répondent dans un délai de 5 jours ouvrables.\n● Le délai maximum pour un litige est de 14 jours.\n● Vous devez coopérer avec les {1} et fournir les renseignements qu''ils demandent pour faire valoir votre cause.\n● Vous avez accepté les règles décrites dans le document de litige dans l''accord d''utilisation lorsque vous avez lancé l''application pour la première fois.\n\nVous pouvez en apprendre davantage sur le processus de litige à l''adresse suivante {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Message du système: {0} support.youOpenedTicket=Vous avez ouvert une demande de support.\n\n{0}\n\nBisq version: {1} support.youOpenedDispute=Vous avez ouvert une demande de litige.\n\n{0}\n\nBisq version: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=URLs de l'explorateur de Monero setting.preferences.deviationToLarge=Les valeurs supérieures à {0}% ne sont pas autorisées. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Utiliser une valeur personnalisée +setting.preferences.txFeeMin=Les frais de transaction doivent être d'au moins {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Votre saisie est au-delà de toute valeur raisonnable (plus de 5000 satoshis/vBit). Les frais de transaction sont habituellement de l'ordre de 50-400 satoshis/vBit. setting.preferences.ignorePeers=Pairs ignorés [adresse onion:port] setting.preferences.ignoreDustThreshold=Valeur de l'output considérée comme "non-dust" minimale setting.preferences.currenciesInList=Devises disponibles dans le flux de cotation du marché @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=Ceci montre le solde du portefeuille intern account.menu.walletInfo.xpub.headLine=Afficher les clés (clés xpub) account.menu.walletInfo.walletSelector={0} {1} portefeuille account.menu.walletInfo.path.headLine=Chemin du porte-clés HD -account.menu.walletInfo.path.info=Si vous importez vos mots de la seed dans un autre portefeuille (comme Electrum), vous aurez besoin de définir le chemin. Ceci devrait être effectué uniquement en cas d'urgence quand vous perdez l'accès du portefeuille Bisq et du répertoire de données.\nGardez à l'esprit que dépenser des fonds depuis un portefeuille autre que Bisq peut dérégler les structures de données internes de Bisq associées aux données du portefeuille, ce qui peut mener à des trades échoués.\n\nN'envoyez JAMAIS de BSQ depuis un portefeuille autre que Bisq, cela va probablement conduire à une transaction BSQ invalide, vous faisant ainsi perdre vos BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Afficher les détails bruts du portefeuille et les clés privées ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=La transaction de dépôt de l''échan error.closedTradeWithNoDepositTx=La transaction de dépôt de l'échange fermé avec l''ID d'échange {0} est nulle.\n\nVeuillez redémarrer l''application pour nettoyer la liste des transactions fermées. popup.warning.walletNotInitialized=Le portefeuille n'est pas encore initialisé -popup.warning.osxKeyLoggerWarning=En raison de mesures de sécurité plus strictes dans MacOS 10.14 et version supérieure, le lancement d'une application Java (Bisq utilise Java) provoquera un avertissement pop-up dans MacOS ('Bisq souhaite recevoir les frappes de toute application'). \n\nPour éviter ce problème, veuillez ouvrir 'Paramètres MacOS', puis allez dans 'Sécurité et confidentialité' -> 'Confidentialité' -> 'Surveillance des entrées', puis supprimez 'Bisq' de la liste de droite. \n\nBisq passera à une version plus récente de Java pour éviter ce problème dès que les limitations techniques (le packager Java pour la version Java requise n'est pas encore livré) seront résolues. popup.warning.wrongVersion=Vous avez probablement une mauvaise version de Bisq sur cet ordinateur.\nL''architecture de votre ordinateur est: {0}.\nLa binary Bisq que vous avez installé est: {1}.\nVeuillez éteindre et réinstaller une bonne version ({2}). popup.warning.incompatibleDB=Nous avons détecté un fichier de base de données incompatible!\n\nCe(s) fichier(s) de base de données ne sont pas compatibles avec notre base de code actuelle: \n{0}\n\nNous avons sauvegardé le(s) fichier(s) endommagés et appliqué les valeurs par défaut à la nouvelle version de la base de données.\n\nLa sauvegarde se trouve dans: \n\n{1}/db/backup_of_corrupted_data.\n\nVeuillez vérifier si vous avez installé la dernière version de Bisq. \nVous pouvez la télécharger à l'adresse suivante: [HYPERLINK:https://bisq.network/downloads].\n\nVeuillez redémarrer l'application. popup.warning.startupFailed.twoInstances=Bisq est déjà lancé. Vous ne pouvez pas lancer deux instances de bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Fermeture en cours popup.shutDownInProgress.msg=La fermeture de l'application nécessite quelques secondes.\nVeuillez ne pas interrompre ce processus. popup.attention.forTradeWithId=Attention requise la transaction avec l''ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Comptes de paiement multiples disponibles popup.info.multiplePaymentAccounts.msg=Vous disposez de plusieurs comptes de paiement disponibles pour cet ordre. Assurez-vous de choisir le bon. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Mauvaise ECKey de l'arbitre popup.accountSigning.success.headline=Félicitations popup.accountSigning.success.description=Tous les {0} comptes de paiement ont été signés avec succès ! -popup.accountSigning.generalInformation=Vous trouverez l'état de signature de tous vos comptes dans la section compte.\n\nPour plus d'informations, veuillez visiter [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Un de vos comptes de paiement a été vérifié et signé par un arbitre. Echanger avec ce compte signera automatiquement le compte de votre pair de trading après un échange réussi.\n\n{0} popup.accountSigning.signedByPeer=Un de vos comptes de paiement a été vérifié et signé par un pair de trading. Votre limite de trading initiale sera levée et vous pourrez signer d''autres comptes dans les {0} jours à venir.\n\n{1} popup.accountSigning.peerLimitLifted=La limite initiale pour l''un de vos comptes a été levée.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Informations complémentaires payment.shared.extraInfo.prompt=Définissez n'importe quels termes spécifiques, conditions, ou détails que vous souhaiteriez voir affichés avec vos offres pour ce compte de paiement (les utilisateurs verront ces informations avant d'accepter les offres). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info=Les transactions en 'face à face' ont des règles différentes et comportent des risques différents de ceux des transactions en ligne.\n\nLes principales différences sont les suivantes:\n● Les pairs de trading doivent échanger des informations sur le lieu et l'heure de la réunion en utilisant les coordonnées de contact qu'ils ont fournies.\n● Les pairs de trading doivent apporter leur ordinateur portable et faire la confirmation du 'paiement envoyé' et du 'paiement reçu' sur le lieu de la réunion.\n● Si un maker a des 'termes et conditions spéciaux, il doit les indiquer dans le champ 'Informations supplémentaires' dans le compte.\n● En acceptant une offre, le taker accepte les 'termes et conditions' du maker.\n● En cas de litige, le médiateur ou l'arbitre ne peut pas beaucoup aider car il est généralement difficile d'obtenir des preuves irréfutables de ce qui s'est passé lors de la réunion. Dans ce cas, les fonds en BTC peuvent être bloqués indéfiniment tant que les pairs ne parviennent pas à un accord.\n\nPour vous assurer de bien comprendre les spécificités des transactions 'face à face', veuillez lire les instructions et les recommandations sur [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Ouvrir la page web payment.f2f.offerbook.tooltip.countryAndCity=Pays et ville: {0} / {1} payment.f2f.offerbook.tooltip.extra=Informations complémentaires: {0} diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index c4e26ae0a67..e7d5bbc9a30 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=Questa offerta non può essere accettata a causa di restrizioni di scambio della controparte -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=L'importo di scambio consentito è limitato a {0} a causa delle restrizioni di sicurezza basate sui seguenti criteri:\n- L'account dell'acquirente non è stato firmato da un arbitro o da un pari\n- Il tempo trascorso dalla firma dell'account dell'acquirente non è di almeno 30 giorni\n- Il metodo di pagamento per questa offerta è considerato rischioso per le richieste di storno bancarie\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=L'importo di scambio consentito è limitato a {0} a causa delle restrizioni di sicurezza basate sui seguenti criteri:\n- Il tuo account non è stato firmato da un arbitro o da un pari\n- Il tempo trascorso dalla firma del tuo account non è di almeno 30 giorni\n- Il metodo di pagamento per questa offerta è considerato rischioso per le richieste di storno bancarie\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Revisione: piazza l'offerta a {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Finanzia la tua offerta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n -createOffer.createOfferFundWalletInfo.msg=Devi depositare {0} a questa offerta.\n\nTali fondi sono riservati nel tuo portafoglio locale e verranno bloccati nell'indirizzo di deposito multisig una volta che qualcuno accetta la tua offerta.\n\nL'importo è la somma di:\n{1} - Il tuo deposito cauzionale: {2}\n- Commissione di scambio: {3}\n- Commissione di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usa il tuo portafoglio Bisq (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Effettua il trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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=Si è verificato un errore durante l'immissione dell'offerta:\n\n{0}\n\nNon sono ancora usciti fondi dal tuo portafoglio.\nRiavvia l'applicazione e controlla la connessione di rete. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Non puoi accettare questa offerta poiché utilizz takeOffer.takeOfferFundWalletInfo.headline=Finanzia il tuo scambio # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Importo di scambio: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Devi depositare {0} per accettare questa offerta.\n\nL'importo è la somma de:\n{1} - Il tuo deposito cauzionale: {2}\n- La commissione di trading: {3}\n- I costi di mining: {4}\n\nPuoi scegliere tra due opzioni quando finanzi il tuo scambio:\n- Usare il tuo portafoglio Bisq (comodo, ma le transazioni possono essere collegabili) OPPURE\n- Trasferimento da un portafoglio esterno (potenzialmente più privato)\n\nVedrai tutte le opzioni di finanziamento e i dettagli dopo aver chiuso questo popup. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Se hai già pagato in fondi puoi effettuare il ritiro nella schermata \"Fondi/Invia fondi\". takeOffer.paymentInfo=Informazioni sul pagamento takeOffer.setAmountPrice=Importo stabilito @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Attendi la conferma della blockchain portfolio.pending.step2_buyer.startPayment=Inizia il pagamento @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Il tuo pari commerciale ha a portfolio.pending.mediationResult.button=Visualizza la risoluzione proposta portfolio.pending.mediationResult.popup.headline=Risultato della mediazione per gli scambi con ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Il tuo pari commerciale ha accettato il suggerimento del mediatore per lo scambio {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Rifiuta e richiedi l'arbitrato portfolio.pending.mediationResult.popup.alreadyAccepted=Hai già accettato @@ -982,7 +982,7 @@ support.buyerTaker=Acquirente/Taker BTC support.sellerTaker=Venditore/Taker BTC support.backgroundInfo=Bisq non è una società, quindi gestisce le controversie in modo diverso.\n\nI trader possono comunicare all'interno dell'applicazione tramite chat sicura nella schermata degli scambi aperti per provare a risolvere le controversie da soli. Se ciò non è sufficiente, un mediatore può intervenire per aiutare. Il mediatore valuterà la situazione e suggerirà un pagamento di fondi commerciali. Se entrambi i trader accettano questo suggerimento, la transazione di pagamento è completata e lo scambio è chiuso. Se uno o entrambi i trader non accettano il pagamento suggerito dal mediatore, possono richiedere l'arbitrato. L'arbitro rivaluterà la situazione e, se garantito, ripagherà personalmente il trader e chiederà il rimborso per questo pagamento dal DAO Bisq. -support.initialInfo=Inserisci una descrizione del tuo problema nel campo di testo qui sotto. Aggiungi quante più informazioni possibili per accelerare i tempi di risoluzione della disputa.\n\nEcco una lista delle informazioni che dovresti fornire:\n● Se sei l'acquirente BTC: hai effettuato il trasferimento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento avviato" nell'applicazione?\n● Se sei il venditore BTC: hai ricevuto il pagamento Fiat o Altcoin? In tal caso, hai fatto clic sul pulsante "pagamento ricevuto" nell'applicazione?\n● Quale versione di Bisq stai usando?\n● Quale sistema operativo stai usando?\n● Se si è verificato un problema con transazioni non riuscite, prendere in considerazione la possibilità di passare a una nuova directory di dati.\n  A volte la directory dei dati viene danneggiata e porta a strani bug.\n  Vedi: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nAcquisire familiarità con le regole di base per la procedura di disputa:\n● È necessario rispondere alle richieste di {0} entro 2 giorni.\n● I mediatori rispondono entro 2 giorni. Gli arbitri rispondono entro 5 giorni lavorativi.\n● Il periodo massimo per una disputa è di 14 giorni.\n● È necessario collaborare con {1} e fornire le informazioni richieste per presentare il proprio caso.\n● Hai accettato le regole delineate nel documento di contestazione nel contratto con l'utente al primo avvio dell'applicazione.\n\nPuoi leggere ulteriori informazioni sulla procedura di contestazione all'indirizzo: {2}\n  +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Messaggio di sistema: {0} support.youOpenedTicket=Hai aperto una richiesta di supporto.\n\n{0}\n\nVersione Bisq: {1} support.youOpenedDispute=Hai aperto una richiesta per una controversia.\n\n{0}\n\nVersione Bisq: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=Non sono ammessi valori superiori a {0}%. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Usa valore personalizzato +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Peer ignorati [indirizzo:porta onion] setting.preferences.ignoreDustThreshold=Valore minimo di output non-dust setting.preferences.currenciesInList=Valute nell'elenco dei feed dei prezzi di mercato @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=La transazione di deposito dello scamb error.closedTradeWithNoDepositTx=La transazione di deposito dello scambio chiuso con ID {0} è nulla.\n\nRiavvia l'applicazione per ripulire l'elenco delle transazioni chiuse. popup.warning.walletNotInitialized=Il portafoglio non è ancora inizializzato -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=Probabilmente hai la versione Bisq sbagliata per questo computer.\nL'architettura del tuo computer è: {0}.\nIl binario Bisq che hai installato è: {1}.\nChiudere e reinstallare la versione corretta ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq è già in esecuzione. Non è possibile eseguire due istanze di Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Arresto in corso popup.shutDownInProgress.msg=La chiusura dell'applicazione può richiedere un paio di secondi.\nNon interrompere il processo. popup.attention.forTradeWithId=Attenzione richiesta per gli scambi con ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Disponibili più conti di pagamento popup.info.multiplePaymentAccounts.msg=Hai più account di pagamento disponibili per questa offerta. Assicurati di aver scelto quello giusto. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=ECKey dell'arbitro errata popup.accountSigning.success.headline=Congratulazioni popup.accountSigning.success.description=Tutti gli account di pagamento {0} sono stati firmati correttamente! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Uno dei tuoi conti di pagamento è stato verificato e firmato da un arbitro. Il trading con questo account firmerà automaticamente l'account del tuo peer di trading dopo una negoziazione di successo.\n\n{0} popup.accountSigning.signedByPeer=Uno dei tuoi conti di pagamento è stato verificato e firmato da un peer di trading. Il limite di trading iniziale verrà revocato e sarai in grado di firmare altri account tra {0} giorni da adesso.\n\n{1} popup.accountSigning.peerLimitLifted=Il limite iniziale per uno dei tuoi account è stato revocato.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Informazioni aggiuntive payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Apri sito web payment.f2f.offerbook.tooltip.countryAndCity=Paese e città: {0} / {1} payment.f2f.offerbook.tooltip.extra=Ulteriori informazioni: {0} diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 25bf9f09ea4..30145c633ac 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=このオファーは、まだ設定さ offerbook.warning.counterpartyTradeRestrictions=相手方のトレード制限のせいでこのオファーを受けることができません -offerbook.warning.newVersionAnnouncement=このバージョンのソフトウェアでは、トレードするピアがお互いの支払いアカウントを署名・検証でき、信頼できる支払いアカウントのネットワークを作れるようにします。\n\n検証されたアカウントと成功にトレードしたら、自身の支払いアカウントも署名されることになり、一定の時間が過ぎたらトレード制限は解除されます（時間の長さは検証方法によって異なります）。\n\nアカウント署名について詳しくは、ドキュメンテーションを参照して下さい：[HYPERLINK:https://docs.bisq.network/payment-methods#account-signing] +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=許可されたトレード金額は以下のセキュリティ基準に基づいて {0} に制限されました：\n- 買い手のアカウントは調停人やピアに署名されていません\n- 買い手のアカウントが署名された時から30日未満がたちました\n- このオファーの支払い方法は、銀行のチャージバックのリスクが高いと考えられます\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=許可されたトレード金額は以下のセキュリティ基準に基づいて {0} に制限されました：\n- このアカウントは調停人やピアに署名されていません\n- このアカウントが署名された時から30日未満がたちました\n- このオファーの支払い方法は、銀行のチャージバックのリスクが高いと考えられます\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=再確認: ビットコインを{0}オファーを createOffer.createOfferFundWalletInfo.headline=あなたのオファーへ入金 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 取引額: {0}\n -createOffer.createOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\nこの資金はあなたのローカルウォレットに予約済として保管され、オファーが受け入れられた時にマルチシグデポジットアドレスに移動しロックされます。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Bisqウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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アプリケーションを再起動してネットワーク接続を確認してください。 @@ -513,8 +513,8 @@ takeOffer.takeOfferButton=再確認: ビットコインを{0}オファーを申 takeOffer.noPriceFeedAvailable=そのオファーは市場価格に基づくパーセント値を使用していますが、使用可能な価格フィードがないため、利用することはできません。 takeOffer.takeOfferFundWalletInfo.headline=あなたのオファーへ入金 # suppress inspection "TrailingSpacesInProperty" -takeOffer.takeOfferFundWalletInfo.tradeAmount= - 取引額: {0}\n -takeOffer.takeOfferFundWalletInfo.msg=このオファーに対して {0} のデポジットを送金する必要があります。\n\n金額の合計は以下の通りです\n{1} - セキュリティデポジット: {2}\n- 取引手数料: {3}\n- マイニング手数料: {4}\n\nこのオファーにデポジットを送金するには、以下の2つの方法があります。\n- Bisqウォレットを使う (便利ですがトランザクションが追跡される可能性があります)\nまたは\n- 外部のウォレットから送金する (機密性の高い方法です)\n\nこのポップアップを閉じると全ての送金方法について詳細な情報が表示されます。 +takeOffer.takeOfferFundWalletInfo.tradeAmount=- 取引額: {0}\n +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=あなたがすでに資金を支払っている場合は「資金/送金する」画面でそれを出金することができます。 takeOffer.paymentInfo=支払い情報 takeOffer.setAmountPrice=金額を設定 @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=市場からの割合価格偏差 portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=ブロックチェーンの承認をお待ち下さい portfolio.pending.step2_buyer.startPayment=支払い開始 @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=トレードピアは調停 portfolio.pending.mediationResult.button=提案解決法を表示する portfolio.pending.mediationResult.popup.headline=トレードID {0} の調停の結果 portfolio.pending.mediationResult.popup.headline.peerAccepted=トレードピアは、トレード {0} に関する調停者の提案を受け入れました。 -portfolio.pending.mediationResult.popup.info=調停者の資金分け提案は以下のとおり：\nあなたの分： {0}\nトレードピアの分： {1}\n\nこの支払い提案を受け取るまたは断ることができます。\n\n受け取ることで、支払い提案のトランザクションを署名します。トレードピアも同じく受け取って署名すると、支払いは完了しトレードは成立されます。\n\n片当事者もしくは両当事者が提案を断ると、2回目の係争を開始するのに{2} (ブロック {3}) まで待つ必要があります。調停人は再びに問題を検討し、調査結果に基づいて支払い提案を申し出ます。\n\n仕事に対する補償として、調停人は手数料を徴収するかもしれない（手数料の上限：取引者のセキュリティデポジット）。両当事者が提案に応じるのは最高の結果です。調停を依頼するのは異例の事態のためです、例えば取引者が調停者の支払い提案は不正だということを確信している場合（それともピアが無反応になる場合）。\n\n新しい仲裁モデルの詳しくは： [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=調停者の支払い提案に応じましたが、トレードピアは断りましたそうです。\n\n{0}のロック時間が終わったら（ブロック{1}）、2回目の係争を開始できます、そして調停人は再びに問題を検討し調査結果に基づいて支払い提案を申し出るでしょう。\n\n新しい仲裁モデルの詳しくは： [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=拒絶して仲裁を求める portfolio.pending.mediationResult.popup.alreadyAccepted=すでに受け入れています @@ -982,7 +982,7 @@ support.buyerTaker=BTC 買い手/テイカー support.sellerTaker=BTC 売り手/テイカー support.backgroundInfo=Bisqは会社ではないので、係争の扱いが異なります。\n\n取引者はアプリ内の「オープントレード」画面からセキュアチャットでお互いに紛争を解決しようと努めれる。その方法は十分でない場合、調停者は間に入って助けることもできます。調停者は状況を判断して、トレード資金の支払い配分を提案します。両当事者は提案に同意する場合、支払いトランザクションは完了され、トレードは閉じられます。片当事者もしくは両当事者は調停者の支払い提案に同意しない場合、仲裁を求めることができます。調停人は再びに問題を検討し、正当な場合は個人的に取引者に払い戻す、そしてBisqのDAOからその分の払い戻し要求を提出します。 -support.initialInfo=下のテキストフィールドに問題の説明を入力してください。係争解決の時間を短縮するために、可能な限り多くの情報を追加してください。\n\n提供する必要がある情報のチェックリストを次に示します:\n\t●BTC買い手の場合：法定通貨またはアルトコインの送金を行いましたか？その場合、アプリケーションの「支払い開始」ボタンをクリックしましたか？\n\t●BTC売り手の場合：法定通貨またはアルトコインの支払いを受け取りましたか？その場合、アプリケーションの「支払いを受け取った」ボタンをクリックしましたか？\n\t●どのバージョンのBisqを使用していますか？\n\t●どのオペレーティングシステムを使用していますか？\n\t●失敗したトランザクションで問題が発生した場合は、新しいデータディレクトリへの切り替えを検討してください。\n\t データディレクトリが破損し、不可解なバグが発生している場合があります。\n\t 参照：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n係争プロセスの基本的なルールをよく理解してください:\n\t●2日以内に{0}の要求に応答する必要があります。\n\t●調停者は2日以内に返事をするでしょう。調停人は5営業日以内に返事をするでしょう。\n\t●係争の最大期間は14日間です。\n\t●{1}と協力し、彼らがあなたの主張をするために、要求された情報を提供する必要があります\n\t●あなたは申請を最初に開始したときに、ユーザー契約の係争文書に記載されている規則を受け入れています。\n\n係争プロセスの詳細については、{2} をご覧ください。 +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=システムメッセージ: {0} support.youOpenedTicket=サポートのリクエスト開始しました。\n\n{0}\n\nBisqバージョン: {1} support.youOpenedDispute=係争のリクエスト開始しました。\n\n{0}\n\nBisqバージョン: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=モネロエクスプローラUR setting.preferences.deviationToLarge={0}%以上の値は許可されていません。 setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=任意の値を使う +setting.preferences.txFeeMin=トランザクション手数料は少なくとも{0} satoshis/vbyte でなければなりません +setting.preferences.txFeeTooLarge=あなたの入力は妥当な値（> 5000 satoshis / vbyte）を超えています。トランザクション手数料は通常 50-400 satoshis/vbyteの範囲です。 setting.preferences.ignorePeers=無視されたピア [onion アドレス:ポート] setting.preferences.ignoreDustThreshold=最小の非ダストアウトプット値 setting.preferences.currenciesInList=市場価格フィードリストの通貨 @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=非確認されたトランザクション account.menu.walletInfo.xpub.headLine=ウォッチキー（xpubキー） account.menu.walletInfo.walletSelector={0} {1} ウォレット account.menu.walletInfo.path.headLine=HDキーチェーンのパス -account.menu.walletInfo.path.info=他のウォレット（例えばElectrum）にシードワードをインポートすると、パスを設定しなければなりません。 Bisqウォレットとデータディレクトリーをアクセスできないような緊急事態の場合のみにして下さい。\nBisqでないウォレットからその資金を遣うと、ウォレットデータと繋がっているBisq内部データ構造は破損される可能性があり、失敗トレードにつながる可能性があります。\n\n絶対にBisqでないウォレットからBSQを遣わないで下さい。無効なトランザクションになる可能性が高い、そしてBSQを失うことになるでしょう。 - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=生ウォレット詳細、秘密鍵を表示する ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=トレードID{0}で識別されるト error.closedTradeWithNoDepositTx=トレードID{0}で識別されるトレードのデポジットトランザクションは無効とされました。\n\n閉じられたトレードリストを更新するため、アプリケーションを再起動して下さい。 popup.warning.walletNotInitialized=ウォレットはまだ初期化されていません -popup.warning.osxKeyLoggerWarning=macOS 10.14以上の厳しいセキュリティー対策のため、Javaアプリケーション（BisqはJavaを利用します）はmacOSで警告用のポップアップ・ウィンドウを生じます（「Bisqは他のアプリからキー操作をアクセスしたい」）。\n\nこの問題を解決するのに、macOS設定を開いて、「セキュリティとプライバシー -> プライバシー -> 入力監視」において右側のリストからBisqを外して下さい。\n\n技術的な限界は克服されたら（必要のJavaバージョンパッケージャーがまだリリースされていません）、問題を避けるためにBisqは新しいJavaバージョンにアップグレードします。 popup.warning.wrongVersion=このコンピューターのBisqバージョンが間違っている可能性があります。\nコンピューターのアーキテクチャ: {0}\nインストールしたBisqバイナリ: {1}\nシャットダウンして、次の正しいバージョンを再インストールしてください（{2}）。 popup.warning.incompatibleDB=互換性のないデータベースファイルが検出されました！\n\nこういうデータベースファイルは、現在のコードベースと互換性がありません:\n{0}\n\n破損したファイルのバックアップを作成し、デフォルト値を新しいデータベースバージョンに適用しました。\n\nバックアップは次の場所にあります。\n{1}/db/backup_of_corrupted_data.\n\nBisqの最新バージョンがインストールされているかどうかを確認してください。\n以下からダウンロードできます。\n[HYPERLINK:https://bisq.network/downloads]\n\nアプリケーションを再起動してください。 popup.warning.startupFailed.twoInstances=Bisqは既に起動中です。Bisqを2つ起動することはできません。 @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=シャットダウン中 popup.shutDownInProgress.msg=アプリケーションのシャットダウンには数秒かかることがあります。\nこのプロセスを中断しないでください。 popup.attention.forTradeWithId=ID {0}とのトレードには注意が必要です -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=複数の支払いアカウントが使用可能です popup.info.multiplePaymentAccounts.msg=このオファーに使用できる支払いアカウントが複数あります。あなたが正しいものを選んだことを確認してください。 @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=不良の調停人ECKey popup.accountSigning.success.headline=おめでとう popup.accountSigning.success.description=全{0}口の支払いアカウントは成功裏に署名されました！ -popup.accountSigning.generalInformation=全てのアカウントの署名状態はアカウント画面に表示されます。\n\n詳しくは: [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing] +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=支払いアカウントの1つは調停人に検証、署名されました。このアカウントからトレードを行ったら、トレードピアと成功にトレードする後に相手のアカウントを自動的に署名します。\n\n{0} popup.accountSigning.signedByPeer=支払いアカウントの1つはトレードピアに検証、署名されました。{0} 日後に、初期のトレード制限は解除され、他の支払いアカウントを署名できるようになります。\n\n{1} popup.accountSigning.peerLimitLifted=支払いアカウントの1つにおいて初期の制限は解除されました。\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=追加情報 payment.shared.extraInfo.prompt=この支払いアカウントのオファーと一緒に表示したい特別な契約条件または詳細を定義して下さい（オファーを受ける前に、ユーザはこの情報を見れます）。 payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info=「対面」トレードには違うルールがあり、オンライントレードとは異なるリスクを伴います。\n\n主な違いは以下の通りです。\n●取引者は、提供される連絡先の詳細を使用して、出会う場所と時間に関する情報を交換する必要があります。\n●取引者は自分のノートパソコンを持ってきて、集合場所で「送金」と「入金」の確認をする必要があります。\n●メイカーに特別な「取引条件」がある場合は、アカウントの「追加情報」テキストフィールドにその旨を記載する必要があります。\n●オファーを受けると、テイカーはメイカーの「トレード条件」に同意したものとします。\n●係争が発生した場合、集合場所で何が起きたのかについての改ざん防止証明を入手することは通常困難であるため、調停者や調停人はあまりサポートをできません。このような場合、BTCの資金は無期限に、または取引者が合意に達するまでロックされる可能性があります。\n\n「対面」トレードでの違いを完全に理解しているか確認するためには、次のURLにある手順と推奨事項をお読みください：[HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Webページを開く payment.f2f.offerbook.tooltip.countryAndCity=国と都市: {0} / {1} payment.f2f.offerbook.tooltip.extra=追加情報: {0} diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 2282ed38515..36cedf56ce9 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=Esta oferta não pode ser tomada por restrições de negociação da outra parte -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=A quantia permitida para a negociação está limitada a {0} devido a restrições de segurança baseadas nos seguintes critérios:\n- A conta do comprador não foi assinada por um árbitro ou um par\n- A conta do comprador foi assinada há menos de 30 dias\n- O meio de pagamento para essa oferta é considerado de risco para estornos bancários.\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=A quantia permitida para a negociação está limitada a {0} devido a restrições de segurança baseadas nos seguintes critérios:\n- A sua conta não foi assinada por um árbitro ou um par\n- A sua conta foi assinada há menos de 30 dias\n- O meio de pagamento para essa oferta é considerado de risco para estornos bancários.\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Revisar: Criar oferta para {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia da negociação: {0} \n -createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos ficam reservados na sua carteira local e ficarão travados no endereço de depósito multisig quando alguém aceitar a sua oferta.\n\nA quantia equivale à soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode financiar sua negociação das seguintes maneiras:\n- Usando a sua carteira Bisq (conveniente, mas transações poderão ser associadas entre si) OU\n- Usando uma carteira externa (maior privacidade)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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=Um erro ocorreu ao emitir uma oferta:\n\n{0}\n\nNenhum fundo foi retirado de sua carteira até agora.\nPor favor, reinicie o programa e verifique sua conexão de internet. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar essa oferta pois ela usa takeOffer.takeOfferFundWalletInfo.headline=Financiar sua negociação # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia a negociar: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia equivale a soma de:\n{1}- Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxas de mineração: {4}\n\nVocê pode escolher entre duas opções para financiar sua negociação:\n- Usar a sua carteira Bisq (conveniente, mas transações podem ser associadas entre si) OU\n- Transferir a partir de uma carteira externa (potencialmente mais privado)\n\nVocê verá todas as opções de financiamento e detalhes após fechar esta janela. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Se você já pagou por essa oferta, você pode retirar seus fundos na seção \"Fundos/Enviar fundos\". takeOffer.paymentInfo=Informações de pagamento takeOffer.setAmountPrice=Definir quantia @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Aguardar confirmação da blockchain portfolio.pending.step2_buyer.startPayment=Iniciar pagamento @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=O seu parceiro de negociaç portfolio.pending.mediationResult.button=Ver solução proposta portfolio.pending.mediationResult.popup.headline=Resultado da mediação para a negociação com ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=O seu parceiro de negociação aceitou a sugestão do mediador para a negociação {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Rejeitar e solicitar arbitramento portfolio.pending.mediationResult.popup.alreadyAccepted=Você já aceitou @@ -982,7 +982,7 @@ support.buyerTaker=Comprador de BTC / Aceitador da oferta support.sellerTaker=Vendedor de BTC / Aceitador da oferta support.backgroundInfo=Bisq não é uma empresa, então ela lida com disputas de uma forma diferente.\n\nComerciantes podem se comunicar dentro do aplicativo usando um chat seguro na tela de negociações em aberto para tentar resolver conflitos entre eles mesmos. Se isto não for o suficiente, um mediador pode intervir para ajudar. O mediador irá avaliar a situação e sugerir um pagamento. Se ambos comerciantes aceitarem essa sugestão, a transação de pagamento é finalizada e a negociação é fechada. Se um or ambos os comerciantes não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar arbitragem. O árbitro irá reavaliar a situação e, se justificado, pagará pessoalmente o comerciante e então solicitará reembolso deste pagamento à DAO Bisq. -support.initialInfo=Por favor, entre a descrição do seu problema no campo de texto abaixo. Informe o máximo de informações que puder para agilizar a resolução da disputa.\n\nSegue uma lista com as informações que você deve fornecer:\n\t● Se você está comprando BTC: Você fez a transferência do dinheiro ou altcoin? Caso afirmativo, você clicou no botão 'pagamento iniciado' no aplicativo?\n\t● Se você está vendendo BTC: Você recebeu o pagamento em dinheiro ou em altcoin? Caso afirmativo, você clicou no botão 'pagamento recebido' no aplicativo?\n\t● Qual versão da Bisq você está usando?\n\t● Qual sistema operacional você está usando?\n\t● Se seu problema é com falhas em transações, por favor considere usar um novo diretório de dados.\n\t Às vezes, o diretório de dados pode ficar corrompido, causando bugs estranhos.\n\t Veja mais: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPor favor, familiarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações de {0}' dentro do prazo de 2 dias.\n\t● Mediadores respondem dentro de 2 dias. Ábitros respondem dentro de 5 dias úteis.\n\t● O período máximo para uma disputa é de 14 dias.\n\t● Você deve cooperar com o {1} e providenciar as informações requisitadas para comprovar o seu caso.\n\t● Você aceitou as regras estipuladas nos termos de acordo do usuário que foi exibido na primeira vez em que você iniciou o aplicativo. \nVocê pode saber mais sobre o processo de disputa em: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Mensagem do sistema: {0} support.youOpenedTicket=Você abriu um pedido de suporte.\n\n{0}\n\nBisq versão: {1} support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nBisq versão: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=Valores acima de {0}% não são permitidos. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Usar valor personalizado +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Pares ignorados [endereço onion:porta] setting.preferences.ignoreDustThreshold=Mín. valor de output não-poeira setting.preferences.currenciesInList=Moedas na lista de preços de mercado @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=A transação de depósito da negocia error.closedTradeWithNoDepositTx=A transação de depósito da negociação já fechada com ID {0} está ausente.\n\nPor favor, reinicie o aplicativo para atualizar a lista de negociações encerradas. popup.warning.walletNotInitialized=A carteira ainda não foi inicializada -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=Você provavelmente está usando a versão incorreta do Bisq para este computador.\nA arquitetura do seu computador é: {0}.\nO binário do Bisq que você instalou é: {1}.\nPor favor, feche o programa e instale a versão correta ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=O Bisq já está sendo executado. Você não pode executar duas instâncias do Bisq ao mesmo tempo. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Desligando popup.shutDownInProgress.msg=O desligamento do programa pode levar alguns segundos.\nPor favor, não interrompa este processo. popup.attention.forTradeWithId=Atenção para a negociação com ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Múltiplas contas de pagamento disponíveis popup.info.multiplePaymentAccounts.msg=Você tem várias contas de pagamento disponíveis para esta oferta. Por favor, verifique se você escolheu a correta. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Chave ECKey de árbitro errada. popup.accountSigning.success.headline=Parabéns popup.accountSigning.success.description=Todas as {0} contas de pagamento foram assinadas com sucesso! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Uma de suas contas de pagamento foi verificada e assinada por um árbitro. Ao negociar com essa conta você automaticamente assinará a conta de seu par após uma negociação bem succedida.\n\n{0} popup.accountSigning.signedByPeer=Uma de suas contas de pagamento foi verificada e assinada por um par de negociação. Seu limite de negociação inicial será aumentado e você poderá assinar outras contas em {0} dias.\n\n{1} popup.accountSigning.peerLimitLifted=O limite inicial para uma de suas contas acaba de ser aumentado. @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Informações adicionais payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Abrir site payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1} payment.f2f.offerbook.tooltip.extra=Informações adicionais: {0} diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 9b7352103b0..751fc254b1d 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=Esta oferta não pode ser aceite devido às restrições de negócio da contraparte -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=A quantia de negócio é limitada à {0} devido à restrições de segurança baseadas nos seguinte critérios:\n- A conta do comprador não foi assinada por um árbitro ou um par\n- O tempo decorrido desde a assinatura da conta do comprador não é de pelo menos 30 dias\n- O método de pagamento para esta oferta é considerado arriscado para estornos bancários\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=A quantia de negócio é limitada à {0} devido à restrições de segurança baseadas nos seguinte critérios:\n- A sua conta não foi assinada por um árbitro ou um par\n- O tempo decorrido desde a assinatura da sua conta não é de pelo menos 30 dias\n- O método de pagamento para esta oferta é considerado arriscado para estornos bancários\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Rever: Colocar oferta para {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Financiar sua oferta # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n -createOffer.createOfferFundWalletInfo.msg=Você precisa depositar {0} para esta oferta.\n\nEsses fundos estão reservados na sua carteira local e serão bloqueados no endereço de depósito multi-assinatura assim que alguém aceitar a sua oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Taxa de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Bisq (conveniente, mas as transações podem ser conectadas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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=Ocorreu um erro ao colocar a oferta:\n\n{0}\n\nAinda nenhuns fundos saíram da sua carteira.\nPor favor, reinicie seu programa e verifique sua conexão de rede. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Você não pode aceitar aquela oferta pois ela ut takeOffer.takeOfferFundWalletInfo.headline=Financiar seu negócio # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Quantia de negócio: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Você precisa depositar {0} para aceitar esta oferta.\n\nA quantia é a soma de:\n{1} - Seu depósito de segurança: {2}\n- Taxa de negociação: {3}\n- Total das taxas de mineração: {4}\n\nVocê pode escolher entre duas opções ao financiar o seu negócio:\n- Use sua carteira Bisq (conveniente, mas as transações podem ser conectas) OU\n- Transferência de uma carteira externa (potencialmente mais privada)\n\nVocê verá todas as opções de financiamento e detalhes depois de fechar este popup. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Se você já pagou com seus fundos você pode levantá-los na janela \"Fundos/Enviar fundos\". takeOffer.paymentInfo=Informações de pagamento takeOffer.setAmountPrice=Definir quantia @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Esperando confirmação da blockchain portfolio.pending.step2_buyer.startPayment=Iniciar pagamento @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=O seu par de negócio aceito portfolio.pending.mediationResult.button=Ver a resolução proposta portfolio.pending.mediationResult.popup.headline=Resultado da mediação para o negócio com o ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=O seu par de negócio aceitou a sugestão do mediador para o negócio {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Rejeitar e solicitar arbitragem portfolio.pending.mediationResult.popup.alreadyAccepted=Você já aceitou @@ -982,7 +982,7 @@ support.buyerTaker=Comprador de BTC/Aceitador support.sellerTaker=Vendedor de BTC/Aceitador support.backgroundInfo=O Bisq não é uma empresa, por isso as disputas são tratadas diferentemente.\n\nOs negociadores podem se comunicar dentro do programa via chat seguro no ecrã de negócios abertos para tentar resolver disputas por conta própria. Se isso não for suficiente, um mediador pode ajudar. O mediador avaliará a situação e sugerirá um pagamento dos fundos de negócio. Se ambos os negociadores aceitarem essa sugestão, a transação de pagamento será concluída e o negócio será encerrado. Se um ou ambos os negociadores não concordarem com o pagamento sugerido pelo mediador, eles podem solicitar a arbitragem. O árbitro reavaliará a situação e, se justificado, pagará pessoalmente o comerciante de volta e solicitará reembolso à OAD do Bisq. -support.initialInfo=Digite uma descrição do seu problema no campo de texto abaixo. Adicione o máximo de informações possível para acelerar o tempo de resolução da disputa.\n\nAqui está uma lista do que você deve fornecer:\n● Se você é o comprador de BTC: Você fez a transferência da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento iniciado' no programa?\n● Se você é o vendedor de BTC: Você recebeu o pagamento da Fiat ou Altcoin? Se sim, você clicou no botão 'pagamento recebido' no programa?\n\t● Qual versão do Bisq você está usando?\n\t● Qual sistema operacional você está usando?\n\t ● Se você encontrou um problema com transações com falha, considere mudar para um novo diretório de dados.\n\t Às vezes, o diretório de dados é corrompido e leva a erros estranhos.\n\t Consulte: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nFamiliarize-se com as regras básicas do processo de disputa:\n\t● Você precisa responder às solicitações do {0} dentro de 2 dias.\n\t● Os mediadores respondem entre 2 dias. Os árbitros respondem dentro de 5 dias úteis.\n\t ● O período máximo para uma disputa é de 14 dias.\n\t ● Você precisa cooperar com o {1} e fornecer as informações solicitadas para justificar o seu caso.\n\t● Você aceitou as regras descritas no documento de disputa no contrato do usuário quando iniciou o programa.\n\nVocê pode ler mais sobre o processo de disputa em: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Mensagem do sistema: {0} support.youOpenedTicket=Você abriu um pedido para apoio.\n\n{0}\n\nBisq versão: {1} support.youOpenedDispute=Você abriu um pedido para uma disputa.\n\n{0}\n\nBisq versão: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=Valores acima de {0}% não são permitidos. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Usar valor personalizado +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Pares ignorados [endereço onion:porta] setting.preferences.ignoreDustThreshold=Mín. valor de output não-poeira setting.preferences.currenciesInList=Moedas na lista de feed de preço de mercado @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=A transação de depósito do negócio error.closedTradeWithNoDepositTx=A transação de depósito do negócio fechado com o ID de negócio {0} é null.\n\nPor favor reinicie o programa para limpar a lista de negócios fechados. popup.warning.walletNotInitialized=A carteira ainda não foi inicializada -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=Você provavelmente tem a versão errada do Bisq para este computador.\nA arquitetura do seu computador é: {0}.\nO binário Bisq que você instalou é: {1}.\nPor favor, desligue e reinstale a versão correta ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq já está em execução. Você não pode executar duas instâncias do Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Desligando popup.shutDownInProgress.msg=Desligar o programa pode demorar alguns segundos.\nPor favor não interrompa este processo. popup.attention.forTradeWithId=Atenção necessária para o negócio com ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Múltiplas contas de pagamento disponíveis popup.info.multiplePaymentAccounts.msg=Você tem várias contas de pagamento disponíveis para esta oferta. Por favor, verifique se você escolheu a correta. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Má ECKey do árbitro popup.accountSigning.success.headline=Parabéns popup.accountSigning.success.description=Todas as contas de pagamento de {0} foram assinadas com sucesso! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=Uma das suas contas de pagamento foi verificada e assinada por um árbitro. Fazendo negócios com esta conta assinará automaticamente a conta do seu par de negociação após um negócio bem-sucedido.\n\n{0} popup.accountSigning.signedByPeer=Uma das suas contas de pagamento foi verificada e assinada por um par de negociação. Seu limite inicial de negociação será aumentado e você poderá assinar outras contas dentro de {0} dias a partir de agora.\n\n{1} popup.accountSigning.peerLimitLifted=O limite inicial de uma das suas contas foi aumentado.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Informação adicional payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Abrir página web payment.f2f.offerbook.tooltip.countryAndCity=País e cidade: {0} / {1} payment.f2f.offerbook.tooltip.extra=Informação adicional: {0} diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 3d312f8f9e4..b46c66b9f63 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=This offer cannot be taken due to counterparty trade restrictions -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- The buyer''s account has not been signed by an arbitrator or a peer\n- The time since signing of the buyer''s account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- Your account has not been signed by an arbitrator or a peer\n- The time since signing of your account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Проверка: разместить предло createOffer.createOfferFundWalletInfo.headline=Обеспечить своё предложение # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n -createOffer.createOfferFundWalletInfo.msg=Вы должны внести {0} для обеспечения этого предложения.\n\nЭти средства будут зарезервированы в вашем локальном кошельке, а когда кто-то примет ваше предложение — заблокированы на депозитном multisig-адресе.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Bisq (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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Перезагрузите приложение и проверьте сетевое соединение. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Нельзя принять это предлож takeOffer.takeOfferFundWalletInfo.headline=Обеспечьте свою сделку # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Сумма сделки: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Вы должны внести {0} для принятия этого предложения.\n\nСумма состоит из:\n{1}- вашего залога: {2},\n- комиссии за сделку: {3},\n- общей комиссии майнера: {4}.\n\nВы можете выбрать один из двух вариантов финансирования сделки:\n - использовать свой кошелёк Bisq (удобно, но сделки можно отследить) ИЛИ\n - перевести из внешнего кошелька (потенциально более анонимно).\n\nВы увидите все варианты обеспечения предложения и их подробности после закрытия этого окна. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Если вы уже внесли средства, их можно вывести в разделе \«Средства/Отправить средства\». takeOffer.paymentInfo=Информация о платеже takeOffer.setAmountPrice=Задайте сумму @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Ожидание подтверждения в блокчейне portfolio.pending.step2_buyer.startPayment=Сделать платеж @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Your trade peer has accepted portfolio.pending.mediationResult.button=View proposed resolution portfolio.pending.mediationResult.popup.headline=Mediation result for trade with ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Your trade peer has accepted the mediator''s suggestion for trade {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbitration portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted @@ -982,7 +982,7 @@ support.buyerTaker=Покупатель ВТС/тейкер support.sellerTaker=Продавец BTC/тейкер support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Системное сообщение: {0} support.youOpenedTicket=Вы запросили поддержку.\n\n{0}\n\nВерсия Bisq: {1} support.youOpenedDispute=Вы начали спор.\n\n{0}\n\nВерсия Bisq: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=Значения выше {0}% запрещены. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Задать своё значение +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Игнорируемые пиры [onion-адрес:порт] setting.preferences.ignoreDustThreshold=Мин. значение, не являющееся «пылью» setting.preferences.currenciesInList=Валюты в перечне источника рыночного курса @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=Кошелёк ещё не инициализирован -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=Вероятно, у вас установлена не та версия Bisq.\nАрхитектура Вашего компьютера: {0}.\nУстановленная версия Bisq: {1}.\nЗакройте приложение и установите нужную версию ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq уже запущен. Нельзя запустить два экземпляра Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Завершение работы popup.shutDownInProgress.msg=Завершение работы приложения может занять несколько секунд.\nПросьба не прерывать этот процесс. popup.attention.forTradeWithId=Обратите внимание на сделку с идентификатором {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Доступно несколько платёжных счетов popup.info.multiplePaymentAccounts.msg=У вас есть несколько платёжных счетов, доступных для этого предложения. Просьба убедиться, что вы выбрали правильный счёт. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Bad arbitrator ECKey popup.accountSigning.success.headline=Congratulations popup.accountSigning.success.description=All {0} payment accounts were successfully signed! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=One of your payment accounts has been verified and signed by an arbitrator. Trading with this account will automatically sign your trading peer''s account after a successful trade.\n\n{0} popup.accountSigning.signedByPeer=One of your payment accounts has been verified and signed by a trading peer. Your initial trading limit will be lifted and you''ll be able to sign other accounts in {0} days from now.\n\n{1} popup.accountSigning.peerLimitLifted=The initial limit for one of your accounts has been lifted.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=Дополнительная информация payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Открыть веб-страницу payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1} payment.f2f.offerbook.tooltip.extra=Дополнительная информация: {0} diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 975c7c11265..25b71885882 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=This offer cannot be taken due to counterparty trade restrictions -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- The buyer''s account has not been signed by an arbitrator or a peer\n- The time since signing of the buyer''s account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- Your account has not been signed by an arbitrator or a peer\n- The time since signing of your account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=รีวิว: ใส่ข้อเสนอไ createOffer.createOfferFundWalletInfo.headline=เงินทุนสำหรับข้อเสนอของคุณ # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0} -createOffer.createOfferFundWalletInfo.msg=คุณต้องวางเงินมัดจำ {0} ข้อเสนอนี้\n\nเงินเหล่านั้นจะถูกสงวนไว้ใน wallet ภายในประเทศของคุณและจะถูกล็อคไว้ในที่อยู่ที่ฝากเงิน multisig เมื่อมีคนรับข้อเสนอของคุณ\n\nผลรวมของจำนวนของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าขุด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อมีการระดุมทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Bisq ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากเงินภายนอกเข้ามา (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการระดมทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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ยังไม่มีการโอนเงินจาก wallet ของคุณเลย\nโปรดเริ่มแอปพลิเคชันใหม่และตรวจสอบการเชื่อมต่อเครือข่ายของคุณ @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=คุณไม่สามารถรับข takeOffer.takeOfferFundWalletInfo.headline=ทุนการซื้อขายของคุณ # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- ปริมาณการซื้อขาย: {0} -takeOffer.takeOfferFundWalletInfo.msg=คุณต้องวางเงินประกัน {0} เพื่อรับข้อเสนอนี้\n\nจำนวนเงินคือผลรวมของ: \n{1} - เงินประกันของคุณ: {2} \n- ค่าธรรมเนียมการซื้อขาย: {3} \n- ค่าธรรมเนียมการขุดทั้งหมด: {4} \n\nคุณสามารถเลือกระหว่างสองตัวเลือกเมื่อลงทุนการซื้อขายของคุณ: \n- ใช้กระเป๋าสตางค์ Bisq ของคุณ (สะดวก แต่ธุรกรรมอาจเชื่อมโยงกันได้) หรือ\n- โอนเงินจากแหล่งเงินภายนอก (อาจเป็นส่วนตัวมากขึ้น) \n\nคุณจะเห็นตัวเลือกและรายละเอียดการลงทุนทั้งหมดหลังจากปิดป๊อปอัปนี้ +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=หากคุณได้ชำระเงินแล้วคุณสามารถถอนเงินออกได้ในหน้าจอ \"เงิน / ส่งเงิน \" takeOffer.paymentInfo=ข้อมูลการชำระเงิน takeOffer.setAmountPrice=ตั้งยอดจำนวน @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=รอการยืนยันของบล็อกเชน portfolio.pending.step2_buyer.startPayment=เริ่มการชำระเงิน @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Your trade peer has accepted portfolio.pending.mediationResult.button=View proposed resolution portfolio.pending.mediationResult.popup.headline=Mediation result for trade with ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Your trade peer has accepted the mediator''s suggestion for trade {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbitration portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted @@ -982,7 +982,7 @@ support.buyerTaker=BTC ผู้ซื้อ / ผู้รับ support.sellerTaker=BTC ผู้ขาย / ผู้รับ support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=ระบบข้อความ: {0} support.youOpenedTicket=You opened a request for support.\n\n{0}\n\nBisq version: {1} support.youOpenedDispute=You opened a request for a dispute.\n\n{0}\n\nBisq version: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=ค่าที่สูงกว่า {0}% ไม่ได้รับอนุญาต setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=ใช้ค่าที่กำหนดเอง +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Ignored peers [onion address:port] setting.preferences.ignoreDustThreshold=Min. non-dust output value setting.preferences.currenciesInList=สกุลเงินอยู่ในหน้ารายการราคาตลาด @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=wallet ยังไม่ได้เริ่มต้น -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=คุณอาจมีเวอร์ชั่น Bisq ไม่เหมาะสำหรับคอมพิวเตอร์นี้\nสถาปัตยกรรมคอมพิวเตอร์ของคุณคือ: {0} .\nเลขฐานสอง Bisq ที่คุณติดตั้งคือ: {1} .\nโปรดปิดตัวลงและติดตั้งรุ่นที่ถูกต้องอีกครั้ง ({2}) popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq กำลังทำงานอยู่ คุณไม่สามารถเรียกใช้ Bisq พร้อมกันได้ @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=การปิดระบบอยู่ร popup.shutDownInProgress.msg=การปิดแอพพลิเคชั่นอาจใช้เวลาสักครู่\nโปรดอย่าขัดจังหวะกระบวนการนี้ popup.attention.forTradeWithId=ต้องให้ความสำคัญสำหรับการซื้อขายด้วย ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Bad arbitrator ECKey popup.accountSigning.success.headline=Congratulations popup.accountSigning.success.description=All {0} payment accounts were successfully signed! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=One of your payment accounts has been verified and signed by an arbitrator. Trading with this account will automatically sign your trading peer''s account after a successful trade.\n\n{0} popup.accountSigning.signedByPeer=One of your payment accounts has been verified and signed by a trading peer. Your initial trading limit will be lifted and you''ll be able to sign other accounts in {0} days from now.\n\n{1} popup.accountSigning.peerLimitLifted=The initial limit for one of your accounts has been lifted.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=ข้อมูลเพิ่มเติม payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=เปิดหน้าเว็บ payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1} payment.f2f.offerbook.tooltip.extra=ข้อมูลเพิ่มเติม: {0} diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 465eced3136..81d2d33e2b2 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=This offer uses a payment method you hav offerbook.warning.counterpartyTradeRestrictions=This offer cannot be taken due to counterparty trade restrictions -offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- The buyer''s account has not been signed by an arbitrator or a peer\n- The time since signing of the buyer''s account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=The allowed trade amount is limited to {0} because of security restrictions based on the following criteria:\n- Your account has not been signed by an arbitrator or a peer\n- The time since signing of your account is not at least 30 days\n- The payment method for this offer is considered risky for bank chargebacks\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=Kiểm tra:: Đặt báo giá cho {0} bitcoin createOffer.createOfferFundWalletInfo.headline=Nộp tiền cho báo giá của bạn # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Khoản tiền giao dịch: {0} \n -createOffer.createOfferFundWalletInfo.msg=Bạn cần đặt cọc {0} cho báo giá này.\n\nCác khoản tiền này sẽ được giữ trong ví nội bộ của bạn và sẽ bị khóa vào địa chỉ đặt cọc multisig khi có người nhận báo giá của bạn.\n\nKhoản tiền này là tổng của:\n{1}- tiền gửi đại lý của bạn: {2}\n- Phí giao dịch: {3}\n- Phí đào: {4}\n\nBạn có thể chọn giữa hai phương án khi nộp tiền cho giao dịch:\n- Sử dụng ví Bisq của bạn (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví bên ngoài (riêng tư hơn)\n\nBạn sẽ xem các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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=Có lỗi xảy ra khi đặt chào giá:\n\n{0}\n\nKhông còn tiền trong ví của bạn.\nHãy khởi động lại ứng dụng và kiểm tra kết nối mạng. @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=Bạn không thể nhận báo giá này do sử takeOffer.takeOfferFundWalletInfo.headline=Nộp tiền cho giao dịch của bạn # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- Giá trị giao dịch: {0} \n -takeOffer.takeOfferFundWalletInfo.msg=Bạn cần nộp {0} để nhận báo giá này.\n\nGiá trị này là tổng của:\n{1}- Tiền ứng trước của bạn: {2}\n- phí giao dịch: {3}\n- Tổng phí đào: {4}\n\nBạn có thể chọn một trong hai phương án khi nộp tiền cho giao dịch của bạn:\n- Sử dụng ví Bisq (tiện lợi, nhưng giao dịch có thể bị kết nối) OR\n- Chuyển từ ví ngoài (riêng tư hơn)\n\nBạn sẽ thấy các phương án nộp tiền và thông tin chi tiết sau khi đóng cửa sổ này. +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=Bạn đã thanh toán, bạn có thể rút số tiền này tại màn hình \"Vốn/Gửi vốn\". takeOffer.paymentInfo=Thông tin thanh toán takeOffer.setAmountPrice=Cài đặt số tiền @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=Đợi xác nhận blockchain portfolio.pending.step2_buyer.startPayment=Bắt đầu thanh toán @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=Your trade peer has accepted portfolio.pending.mediationResult.button=View proposed resolution portfolio.pending.mediationResult.popup.headline=Mediation result for trade with ID: {0} portfolio.pending.mediationResult.popup.headline.peerAccepted=Your trade peer has accepted the mediator''s suggestion for trade {0} -portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://docs.bisq.network/trading-rules.html#arbitration] +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbitration portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted @@ -982,7 +982,7 @@ support.buyerTaker=Người mua BTC/Người nhận support.sellerTaker=Người bán BTC/Người nhận support.backgroundInfo=Bisq is not a company, so it handles disputes differently.\n\nTraders can communicate within the application via secure chat on the open trades screen to try solving disputes on their own. If that is not sufficient, a mediator can step in to help. The mediator will evaluate the situation and suggest a payout of trade funds. If both traders accept this suggestion, the payout transaction is completed and the trade is closed. If one or both traders do not agree to the mediator's suggested payout, they can request arbitration.The arbitrator will re-evaluate the situation and, if warranted, personally pay the trader back and request reimbursement for this payment from the Bisq DAO. -support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=Tin nhắn hệ thống: {0} support.youOpenedTicket=Bạn đã mở yêu cầu hỗ trợ.\n\n{0}\n\nPhiên bản Bisq: {1} support.youOpenedDispute=Bạn đã mở yêu cầu giải quyết tranh chấp.\n\n{0}\n\nPhiên bản Bisq: {1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer URLs (uses Tor, setting.preferences.deviationToLarge=Giá trị không được phép lớn hơn {0}%. setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=Sử dụng giá trị thông dụng +setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/vbyte +setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/vbyte). Transaction fee is usually in the range of 50-400 satoshis/vbyte. setting.preferences.ignorePeers=Bỏ qua đối tác[địa chỉ onion:cổng] setting.preferences.ignoreDustThreshold=Giá trị đầu ra tối thiểu không phải số dư nhỏ setting.preferences.currenciesInList=Tiền tệ trong danh sách cung cấp giá thị trường @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=The deposit transaction of the closed error.closedTradeWithNoDepositTx=The deposit transaction of the closed trade with the trade ID {0} is null.\n\nPlease restart the application to clean up the closed trades list. popup.warning.walletNotInitialized=Ví chưa được kích hoạt -popup.warning.osxKeyLoggerWarning=Due to stricter security measures in macOS 10.14 and above, launching a Java application (Bisq uses Java) causes a popup warning in macOS ('Bisq would like to receive keystrokes from any application').\n\nTo avoid that issue please open your 'macOS Settings' and go to 'Security & Privacy' -> 'Privacy' -> 'Input Monitoring' and Remove 'Bisq' from the list on the right side.\n\nBisq will upgrade to a newer Java version to avoid that issue as soon the technical limitations (Java packager for the required Java version is not shipped yet) are resolved. popup.warning.wrongVersion=Có thể máy tính của bạn có phiên bản Bisq không đúng.\nCấu trúc máy tính của bạn là: {0}.\nHệ nhị phân Bisq bạn cài đặt là: {1}.\nVui lòng tắt máy và cài đặt lại phiên bản đúng ({2}). popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a new database version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bisq installed.\nYou can download it at: [HYPERLINK:https://bisq.network/downloads].\n\nPlease restart the application. popup.warning.startupFailed.twoInstances=Bisq đã chạy. Bạn không thể chạy hai chương trình Bisq. @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=Đang tắt ứng dụng popup.shutDownInProgress.msg=Tắt ứng dụng sẽ mất vài giây.\nVui lòng không gián đoạn quá trình này. popup.attention.forTradeWithId=Cần chú ý khi giao dịch có ID {0} -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=Có sẵn nhiều tài khoản thanh toán popup.info.multiplePaymentAccounts.msg=Bạn có sẵn nhiều tài khoản thanh toán cho chào giá này. Vui lòng đảm bảo là bạn chọn đúng tài khoản. @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=Bad arbitrator ECKey popup.accountSigning.success.headline=Congratulations popup.accountSigning.success.description=All {0} payment accounts were successfully signed! -popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://docs.bisq.network/payment-methods#account-signing]. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=One of your payment accounts has been verified and signed by an arbitrator. Trading with this account will automatically sign your trading peer''s account after a successful trade.\n\n{0} popup.accountSigning.signedByPeer=One of your payment accounts has been verified and signed by a trading peer. Your initial trading limit will be lifted and you''ll be able to sign other accounts in {0} days from now.\n\n{1} popup.accountSigning.peerLimitLifted=The initial limit for one of your accounts has been lifted.\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=thông tin thêm payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://docs.bisq.network/trading-rules.html#f2f-trading] +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=Mở trang web payment.f2f.offerbook.tooltip.countryAndCity=Country and city: {0} / {1} payment.f2f.offerbook.tooltip.extra=Thông tin thêm: {0} diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 592d2d017bc..feb0becdc38 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=这个报价使用了您未创建过的 offerbook.warning.counterpartyTradeRestrictions=由于交易伙伴的交易限制，这个报价不能接受 -offerbook.warning.newVersionAnnouncement=使用这个版本的软件，交易伙伴可以验证和验证彼此的支付帐户，以创建一个可信的支付帐户网络。\n\n交易成功后，您的支付帐户将被验证以及交易限制将在一定时间后解除（此时间基于验证方法）。\n\n有关验证帐户的更多信息，请参见文档 https://docs.bisq.network/payment-methods#account-signing +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=基于以下标准的安全限制，允许的交易金额限制为 {0}：\n- 买方的帐目没有由仲裁员或伙伴验证\n- 买方帐户自验证之日起不足30天\n- 本报价的付款方式被认为存在银行退款的风险\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=基于以下标准的安全限制，允许的交易金额限制为{0}：\n- 你的买家帐户没有由仲裁员或伙伴验证\n- 自验证你的帐户以来的时间少于30天\n- 本报价的付款方式被认为存在银行退款的风险\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=复审：报价挂单 {0} 比特币 createOffer.createOfferFundWalletInfo.headline=为您的报价充值 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n -createOffer.createOfferFundWalletInfo.msg=这个报价您需要 {0} 作为保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Bisq 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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请检查您的互联网连接或尝试重启应用程序。 @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=您不能对这笔报价下单，因为它使用 takeOffer.takeOfferFundWalletInfo.headline=为交易充值 # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易数量：{0}\n -takeOffer.takeOfferFundWalletInfo.msg=这个报价您需要付出 {0} 保证金。\n\n这些资金保留在您的本地钱包并会被冻结到多重验证保证金地址直到报价交易成功。\n\n总数量：{1}\n- 保证金：{2}\n- 挂单费：{3}\n- 矿工手续费：{4}\n\n您有两种选项可以充值您的交易：\n- 使用您的 Bisq 钱包（方便，但交易可能会被链接到）或者\n- 从外部钱包转入（或许这样更隐秘一些）\n\n关闭此弹出窗口后，您将看到所有资金选项和详细信息。 +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=如果你已经支付，你可以在“资金/提现”提现它。 takeOffer.paymentInfo=付款信息 takeOffer.setAmountPrice=设置数量 @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=与市场价格偏差百分比 portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=等待区块链确认 portfolio.pending.step2_buyer.startPayment=开始付款 @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=你的伙伴已经接受了 portfolio.pending.mediationResult.button=查看建议的解决方案 portfolio.pending.mediationResult.popup.headline=调解员在交易 ID：{0}上的建议 portfolio.pending.mediationResult.popup.headline.peerAccepted=你的伙伴已经接受了调解员的建议 -portfolio.pending.mediationResult.popup.info=调解员建议的支出如下：\n你将支付：{0}\n你的交易伙伴将支付：{1}\n\n你可以接受或拒绝这笔调解费支出。\n\n通过接受，你验证了合约的支付交易。如果你的交易伙伴也接受和验证，支付将完成，交易将关闭。\n\n如果你们其中一人或双方都拒绝该建议，你将必须等到（2）（{3}区块）与仲裁员展开第二轮纠纷讨论，仲裁员将再次调查该案件，并根据他们的调查结果进行支付。\n\n仲裁员可以收取少量费用（费用上限：交易的保证金）作为其工作的补偿。两个交易者都同意调解员的建议是愉快的路径请求仲裁是针对特殊情况的，比如如果一个交易者确信调解员没有提出公平的赔偿建议（或者如果另一个同伴没有回应）。\n\n关于新的仲裁模型的更多细节：https://docs.bisq.network/trading-rules.html#arbitration -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=您已经接受了调解员的建议支付但是似乎您的交易对手并没有接受。\n\n一旦锁定时间到{0}（区块{1}）您可以打开第二轮纠纷让仲裁员重新研究该案件并重新作出支出决定。\n\n您可以找到更多关于仲裁模型的信息在：\nhttps://docs.bisq.network/trading-rules.html#arbitration +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=拒绝并请求仲裁 portfolio.pending.mediationResult.popup.alreadyAccepted=您已经接受了。 @@ -982,7 +982,7 @@ support.buyerTaker=BTC 买家/买单者 support.sellerTaker=BTC 卖家/买单者 support.backgroundInfo=Bisq 不是一家公司，所以它处理纠纷的方式不同。\n\n交易双方可以在应用程序中通过未完成交易页面上的安全聊天进行通信，以尝试自行解决争端。如果这还不够，调解员可以介入帮助。调解员将对情况进行评估，并对交易资金的支出提出建议。如果两个交易者都接受这个建议，那么支付交易就完成了，交易也结束了。如果一方或双方不同意调解员的建议，他们可以要求仲裁。仲裁员将重新评估情况，如果有必要，将亲自向交易员付款，并要求 Bisq DAO 对这笔付款进行补偿。 -support.initialInfo=请在下面的文本框中输入您的问题描述。添加尽可能多的信息，以加快解决纠纷的时间。\n\n以下是你应提供的资料核对表：\n\t●如果您是 BTC 买家：您是否使用法定货币或其他加密货币转账？如果是，您是否点击了应用程序中的“支付开始”按钮？\n\t●如果您是 BTC 卖家：您是否收到法定货币或其他加密货币的付款了？如果是，你是否点击了应用程序中的“已收到付款”按钮？\n\t●您使用的是哪个版本的 Bisq？\n\t●您使用的是哪种操作系统？\n\t●如果遇到操作执行失败的问题，请考虑切换到新的数据目录。\n\t有时数据目录会损坏，并导致奇怪的错误。\n详见：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n请熟悉纠纷处理的基本规则：\n\t●您需要在2天内答复 {0} 的请求。\n\t●调解员会在2天之内答复，仲裁员会在5天之内答复。\n\t●纠纷的最长期限为14天。\n\t●你需要与仲裁员合作，提供他们为你的案件所要求的信息。\n\t●当您第一次启动应用程序时，您接受了用户协议中争议文档中列出的规则。\n\n您可以通过 {2} 了解有关纠纷处理的更多信息 +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=系统消息：{0} support.youOpenedTicket=您创建了帮助请求。\n\n{0}\n\nBisq 版本：{1} support.youOpenedDispute=您创建了一个纠纷请求。\n\n{0}\n\nBisq 版本：{1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer 链接（使用T setting.preferences.deviationToLarge=值不允许大于30% setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=使用自定义值 +setting.preferences.txFeeMin=交易手续费必须至少为{0} 聪/字节 +setting.preferences.txFeeTooLarge=您输入的数额超过可接受值（>5000 聪/字节）。交易手续费一般在 50-400 聪/字节、 setting.preferences.ignorePeers=忽略节点 [洋葱地址:端口] setting.preferences.ignoreDustThreshold=最小无零头输出值 setting.preferences.currenciesInList=市场价的货币列表 @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=这里包括内部钱包余额包括未确 account.menu.walletInfo.xpub.headLine=监控密钥（xpub keys） account.menu.walletInfo.walletSelector={0} {1} 钱包 account.menu.walletInfo.path.headLine=HD 密钥链路径 -account.menu.walletInfo.path.info=如果您导入其他钱包（例如 Electrum）的种子词，你需要去确认路径。这个操作只能用于你失去 Bisq 钱包和数据目录的控制的紧急情况。\n请记住使用非 Bisq 钱包的资金可能会打乱 Bisq 内部与之相连的钱包数据结构，这可能导致交易失败。\n\n请不要将 BSQ 发送至非 Bisq 钱包，因为这可能让您的 BSQ 交易记录失效以及损失 BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=显示原始钱包详情与私钥 ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=交易 ID 为 {0} 的已关闭交易 error.closedTradeWithNoDepositTx=交易 ID 为 {0} 的保证金交易已被确认。\n\n请重新启动应用程序来清理已关闭的交易列表。 popup.warning.walletNotInitialized=钱包至今未初始化 -popup.warning.osxKeyLoggerWarning=由于 MacOS 10.14 及更高版本中的安全措施更加严格，因此启动 Java 应用程序（Bisq 使用Java）会在 MacOS 中引发弹出警告（``Bisq 希望从任何应用程序接收击键''）.\n\n为了避免该问题，请打开“ MacOS 设置”，然后转到“安全和隐私”->“隐私”->“输入监视”，然后从右侧列表中删除“ Bisq”。\n\n一旦解决了技术限制（所需的 Java 版本的 Java 打包程序尚未交付），Bisq将升级到新的 Java 版本，以避免该问题。 popup.warning.wrongVersion=您这台电脑上可能有错误的 Bisq 版本。\n您的电脑的架构是：{0}\n您安装的 Bisq 二进制文件是：{1}\n请关闭并重新安装正确的版本（{2}）。 popup.warning.incompatibleDB=我们检测到不兼容的数据库文件！\n\n那些数据库文件与我们当前的代码库不兼容：\n{0}\n\n我们对损坏的文件进行了备份，并将默认值应用于新的数据库版本。\n\n备份位于：\n{1}/db/backup_of_corrupted_data。\n\n请检查您是否安装了最新版本的 Bisq\n您可以下载：\nhttps://bisq.network/downloads\n\n请重新启动应用程序。 popup.warning.startupFailed.twoInstances=Bisq 已经在运行。 您不能运行两个 Bisq 实例。 @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=正在关闭 popup.shutDownInProgress.msg=关闭应用可能会花一点时间。\n请不要打断关闭过程。 popup.attention.forTradeWithId=交易 ID {0} 需要注意 -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=多个支付账户可用 popup.info.multiplePaymentAccounts.msg=您有多个支付帐户在这个报价中可用。请确你做了正确的选择。 @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=不正确的仲裁员 ECKey popup.accountSigning.success.headline=恭喜 popup.accountSigning.success.description=所有 {0} 支付账户已成功验证！ -popup.accountSigning.generalInformation=您将在帐户页面找到所有账户的验证状态。\n\n更多信息，请访问https://docs.bisq.network/payment-methods#account-signing. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=您的一个付款帐户已被认证以及被仲裁员验证。交易成功后，使用此帐户将自动验证您的交易伙伴的帐户。\n\n{0} popup.accountSigning.signedByPeer=您的一个付款帐户已经被交易伙伴验证和验证。您的初始交易限额将被取消，您将能够在{0}天后验证其他帐户。 popup.accountSigning.peerLimitLifted=您其中一个帐户的初始限额已被取消。\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=附加信息 payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info=与网上交易相比，“面对面”交易有不同的规则，也有不同的风险。\n\n主要区别是：\n●交易伙伴需要使用他们提供的联系方式交换关于会面地点和时间的信息。\n●交易双方需要携带笔记本电脑，在会面地点确认“已发送付款”和“已收到付款”。\n●如果交易方有特殊的“条款和条件”，他们必须在账户的“附加信息”文本框中声明这些条款和条件。\n●在发生争议时，调解员或仲裁员不能提供太多帮助，因为通常很难获得有关会面上所发生情况的篡改证据。在这种情况下，BTC 资金可能会被无限期锁定，或者直到交易双方达成协议。\n\n为确保您完全理解“面对面”交易的不同之处，请阅读以下说明和建议：“https://docs.bisq.network/trading-rules.html#f2f-trading” +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=打开网页 payment.f2f.offerbook.tooltip.countryAndCity=国家或地区及城市：{0} / {1} payment.f2f.offerbook.tooltip.extra=附加信息：{0} diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 00b800f4d5b..4c85ab8fd3c 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -392,7 +392,7 @@ offerbook.warning.noMatchingAccount.msg=這個報價使用了您未創建過的 offerbook.warning.counterpartyTradeRestrictions=由於交易夥伴的交易限制，這個報價不能接受 -offerbook.warning.newVersionAnnouncement=使用這個版本的軟件，交易夥伴可以驗證和驗證彼此的支付帳户，以創建一個可信的支付帳户網絡。\n\n交易成功後，您的支付帳户將被驗證以及交易限制將在一定時間後解除（此時間基於驗證方法）。\n\n有關驗證帳户的更多信息，請參見文檔 https://docs.bisq.network/payment-methods#account-signing +offerbook.warning.newVersionAnnouncement=With this version of the software, trading peers can verify and sign each others' payment accounts to create a network of trusted payment accounts.\n\nAfter successfully trading with a peer with a verified payment account, your payment account will be signed and trading limits will be lifted after a certain time interval (length of this interval is based on the verification method).\n\nFor more information on account signing, please see the documentation at [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.warning.tradeLimitDueAccountAgeRestriction.seller=基於以下標準的安全限制，允許的交易金額限制為 {0}：\n- 買方的帳目沒有由仲裁員或夥伴驗證\n- 買方帳户自驗證之日起不足30天\n- 本報價的付款方式被認為存在銀行退款的風險\n\n{1} popup.warning.tradeLimitDueAccountAgeRestriction.buyer=基於以下標準的安全限制，允許的交易金額限制為{0}：\n- 你的買家帳户沒有由仲裁員或夥伴驗證\n- 自驗證你的帳户以來的時間少於30天\n- 本報價的付款方式被認為存在銀行退款的風險\n\n{1} @@ -458,7 +458,7 @@ createOffer.placeOfferButton=複審：報價掛單 {0} 比特幣 createOffer.createOfferFundWalletInfo.headline=為您的報價充值 # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n -createOffer.createOfferFundWalletInfo.msg=這個報價您需要 {0} 作為保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Bisq 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 +createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to make this offer.\n\nThose funds are reserved in your local wallet and will get locked into the multisig deposit address once someone takes your offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Mining fee: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. # 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請檢查您的互聯網連接或嘗試重啟應用程序。 @@ -514,7 +514,7 @@ takeOffer.noPriceFeedAvailable=您不能對這筆報價下單，因為它使用 takeOffer.takeOfferFundWalletInfo.headline=為交易充值 # suppress inspection "TrailingSpacesInProperty" takeOffer.takeOfferFundWalletInfo.tradeAmount=- 交易數量：{0}\n -takeOffer.takeOfferFundWalletInfo.msg=這個報價您需要付出 {0} 保證金。\n\n這些資金保留在您的本地錢包並會被凍結到多重驗證保證金地址直到報價交易成功。\n\n總數量：{1}\n- 保證金：{2}\n- 掛單費：{3}\n- 礦工手續費：{4}\n\n您有兩種選項可以充值您的交易：\n- 使用您的 Bisq 錢包（方便，但交易可能會被鏈接到）或者\n- 從外部錢包轉入（或許這樣更隱祕一些）\n\n關閉此彈出窗口後，您將看到所有資金選項和詳細信息。 +takeOffer.takeOfferFundWalletInfo.msg=You need to deposit {0} to take this offer.\n\nThe amount is the sum of:\n{1}- Your security deposit: {2}\n- Trading fee: {3}\n- Total mining fees: {4}\n\nYou can choose between two options when funding your trade:\n- Use your Bisq wallet (convenient, but transactions may be linkable) OR\n- Transfer from an external wallet (potentially more private)\n\nYou will see all funding options and details after closing this popup. takeOffer.alreadyPaidInFunds=如果你已經支付，你可以在“資金/提現”提現它。 takeOffer.paymentInfo=付款信息 takeOffer.setAmountPrice=設置數量 @@ -566,7 +566,7 @@ portfolio.closedTrades.deviation.help=Percentage price deviation from market portfolio.pending.invalidTx=There is an issue with a missing or invalid transaction.\n\nPlease do NOT send the fiat or altcoin payment.\n\nOpen a support ticket to get assistance from a Mediator.\n\nError message: {0} -portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. +portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed as confirmed in Bisq: \n● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\nContact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists. portfolio.pending.step1.waitForConf=等待區塊鏈確認 portfolio.pending.step2_buyer.startPayment=開始付款 @@ -803,8 +803,8 @@ portfolio.pending.mediationResult.info.peerAccepted=你的夥伴已經接受了 portfolio.pending.mediationResult.button=查看建議的解決方案 portfolio.pending.mediationResult.popup.headline=調解員在交易 ID：{0}上的建議 portfolio.pending.mediationResult.popup.headline.peerAccepted=你的夥伴已經接受了調解員的建議 -portfolio.pending.mediationResult.popup.info=調解員建議的支出如下：\n你將支付：{0}\n你的交易夥伴將支付：{1}\n\n你可以接受或拒絕這筆調解費支出。\n\n通過接受，你驗證了合約的支付交易。如果你的交易夥伴也接受和驗證，支付將完成，交易將關閉。\n\n如果你們其中一人或雙方都拒絕該建議，你將必須等到（2）（{3}區塊）與仲裁員展開第二輪糾紛討論，仲裁員將再次調查該案件，並根據他們的調查結果進行支付。\n\n仲裁員可以收取少量費用（費用上限：交易的保證金）作為其工作的補償。兩個交易者都同意調解員的建議是愉快的路徑請求仲裁是針對特殊情況的，比如如果一個交易者確信調解員沒有提出公平的賠償建議（或者如果另一個同伴沒有迴應）。\n\n關於新的仲裁模型的更多細節：https://docs.bisq.network/trading-rules.html#arbitration -portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=您已經接受了調解員的建議支付但是似乎您的交易對手並沒有接受。\n\n一旦鎖定時間到{0}（區塊{1}）您可以打開第二輪糾紛讓仲裁員重新研究該案件並重新作出支出決定。\n\n您可以找到更多關於仲裁模型的信息在：\nhttps://docs.bisq.network/trading-rules.html#arbitration +portfolio.pending.mediationResult.popup.info=The mediator has suggested the following payout:\nYou receive: {0}\nYour trading peer receives: {1}\n\nYou can accept or reject this suggested payout.\n\nBy accepting, you sign the proposed payout transaction. If your trading peer also accepts and signs, the payout will be completed, and the trade will be closed.\n\nIf one or both of you reject the suggestion, you will have to wait until {2} (block {3}) to open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nThe arbitrator may charge a small fee (fee maximum: the trader''s security deposit) as compensation for their work. Both traders agreeing to the mediator''s suggestion is the happy path—requesting arbitration is meant for exceptional circumstances, such as if a trader is sure the mediator did not make a fair payout suggestion (or if the other peer is unresponsive).\n\nMore details about the new arbitration model: [HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] +portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout but it seems that your trading peer has not accepted it.\n\nOnce the lock time is over on {0} (block {1}), you can open a second-round dispute with an arbitrator who will investigate the case again and do a payout based on their findings.\n\nYou can find more details about the arbitration model at:[HYPERLINK:https://bisq.wiki/Dispute_resolution#Level_3:_Arbitration] portfolio.pending.mediationResult.popup.openArbitration=拒絕並請求仲裁 portfolio.pending.mediationResult.popup.alreadyAccepted=您已經接受了。 @@ -982,7 +982,7 @@ support.buyerTaker=BTC 買家/買單者 support.sellerTaker=BTC 賣家/買單者 support.backgroundInfo=Bisq 不是一家公司，所以它處理糾紛的方式不同。\n\n交易雙方可以在應用程序中通過未完成交易頁面上的安全聊天進行通信，以嘗試自行解決爭端。如果這還不夠，調解員可以介入幫助。調解員將對情況進行評估，並對交易資金的支出提出建議。如果兩個交易者都接受這個建議，那麼支付交易就完成了，交易也結束了。如果一方或雙方不同意調解員的建議，他們可以要求仲裁。仲裁員將重新評估情況，如果有必要，將親自向交易員付款，並要求 Bisq DAO 對這筆付款進行補償。 -support.initialInfo=請在下面的文本框中輸入您的問題描述。添加儘可能多的信息，以加快解決糾紛的時間。\n\n以下是你應提供的資料核對表：\n\t●如果您是 BTC 買家：您是否使用法定貨幣或其他加密貨幣轉賬？如果是，您是否點擊了應用程序中的“支付開始”按鈕？\n\t●如果您是 BTC 賣家：您是否收到法定貨幣或其他加密貨幣的付款了？如果是，你是否點擊了應用程序中的“已收到付款”按鈕？\n\t●您使用的是哪個版本的 Bisq？\n\t●您使用的是哪種操作系統？\n\t●如果遇到操作執行失敗的問題，請考慮切換到新的數據目錄。\n\t有時數據目錄會損壞，並導致奇怪的錯誤。\n詳見：https://docs.bisq.network/backup-recovery.html#switch-to-a-new-data-directory\n\n請熟悉糾紛處理的基本規則：\n\t●您需要在2天內答覆 {0} 的請求。\n\t●調解員會在2天之內答覆，仲裁員會在5天之內答覆。\n\t●糾紛的最長期限為14天。\n\t●你需要與仲裁員合作，提供他們為你的案件所要求的信息。\n\t●當您第一次啟動應用程序時，您接受了用户協議中爭議文檔中列出的規則。\n\n您可以通過 {2} 瞭解有關糾紛處理的更多信息 +support.initialInfo=Please enter a description of your problem in the text field below. Add as much information as possible to speed up dispute resolution time.\n\nHere is a check list for information you should provide:\n\t● If you are the BTC buyer: Did you make the Fiat or Altcoin transfer? If so, did you click the 'payment started' button in the application?\n\t● If you are the BTC seller: Did you receive the Fiat or Altcoin payment? If so, did you click the 'payment received' button in the application?\n\t● Which version of Bisq are you using?\n\t● Which operating system are you using?\n\t● If you encountered an issue with failed transactions please consider switching to a new data directory.\n\t Sometimes the data directory gets corrupted and leads to strange bugs. \n\t See: https://bisq.wiki/Switching_to_a_new_data_directory\n\nPlease make yourself familiar with the basic rules for the dispute process:\n\t● You need to respond to the {0}''s requests within 2 days.\n\t● Mediators respond in between 2 days. Arbitrators respond in between 5 business days.\n\t● The maximum period for a dispute is 14 days.\n\t● You need to cooperate with the {1} and provide the information they request to make your case.\n\t● You accepted the rules outlined in the dispute document in the user agreement when you first started the application.\n\nYou can read more about the dispute process at: {2} support.systemMsg=系統消息：{0} support.youOpenedTicket=您創建了幫助請求。\n\n{0}\n\nBisq 版本：{1} support.youOpenedDispute=您創建了一個糾紛請求。\n\n{0}\n\nBisq 版本：{1} @@ -1019,6 +1019,8 @@ setting.preferences.autoConfirmServiceAddresses=Monero Explorer 鏈接（使用T setting.preferences.deviationToLarge=值不允許大於30% setting.preferences.txFee=BSQ Withdrawal transaction fee (satoshis/vbyte) setting.preferences.useCustomValue=使用自定義值 +setting.preferences.txFeeMin=交易手續費必須至少為{0} 聰/字節 +setting.preferences.txFeeTooLarge=您輸入的數額超過可接受值（>5000 聰/字節）。交易手續費一般在 50-400 聰/字節、 setting.preferences.ignorePeers=忽略節點 [洋葱地址:端口] setting.preferences.ignoreDustThreshold=最小無零頭輸出值 setting.preferences.currenciesInList=市場價的貨幣列表 @@ -1205,8 +1207,7 @@ account.menu.walletInfo.balance.info=This shows the internal wallet balance incl account.menu.walletInfo.xpub.headLine=Watch keys (xpub keys) account.menu.walletInfo.walletSelector={0} {1} wallet account.menu.walletInfo.path.headLine=HD keychain paths -account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ. - +account.menu.walletInfo.path.info=If you import seed words into another wallet (like Electrum), you'll need to define the path. This should only be done in emergency cases when you lose access to the Bisq wallet and data directory.\nKeep in mind that spending funds from a non-Bisq wallet can bungle the internal Bisq data structures associated with the wallet data, which can lead to failed trades.\n\nNEVER send BSQ from a non-Bisq wallet, as it will probably lead to an invalid BSQ transaction and losing your BSQ.\n\n account.menu.walletInfo.openDetails=Show raw wallet details and private keys ## TODO should we rename the following to a gereric name? @@ -2305,7 +2306,6 @@ error.closedTradeWithUnconfirmedDepositTx=交易 ID 為 {0} 的已關閉交易 error.closedTradeWithNoDepositTx=交易 ID 為 {0} 的保證金交易已被確認。\n\n請重新啟動應用程序來清理已關閉的交易列表。 popup.warning.walletNotInitialized=錢包至今未初始化 -popup.warning.osxKeyLoggerWarning=由於 MacOS 10.14 及更高版本中的安全措施更加嚴格，因此啟動 Java 應用程序（Bisq 使用Java）會在 MacOS 中引發彈出警吿（``Bisq 希望從任何應用程序接收擊鍵''）.\n\n為了避免該問題，請打開“ MacOS 設置”，然後轉到“安全和隱私”->“隱私”->“輸入監視”，然後從右側列表中刪除“ Bisq”。\n\n一旦解決了技術限制（所需的 Java 版本的 Java 打包程序尚未交付），Bisq將升級到新的 Java 版本，以避免該問題。 popup.warning.wrongVersion=您這台電腦上可能有錯誤的 Bisq 版本。\n您的電腦的架構是：{0}\n您安裝的 Bisq 二進制文件是：{1}\n請關閉並重新安裝正確的版本（{2}）。 popup.warning.incompatibleDB=我們檢測到不兼容的數據庫文件！\n\n那些數據庫文件與我們當前的代碼庫不兼容：\n{0}\n\n我們對損壞的文件進行了備份，並將默認值應用於新的數據庫版本。\n\n備份位於：\n{1}/db/backup_of_corrupted_data。\n\n請檢查您是否安裝了最新版本的 Bisq\n您可以下載：\nhttps://bisq.network/downloads\n\n請重新啟動應用程序。 popup.warning.startupFailed.twoInstances=Bisq 已經在運行。 您不能運行兩個 Bisq 實例。 @@ -2376,7 +2376,7 @@ popup.shutDownInProgress.headline=正在關閉 popup.shutDownInProgress.msg=關閉應用可能會花一點時間。\n請不要打斷關閉過程。 popup.attention.forTradeWithId=交易 ID {0} 需要注意 -popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. +popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. This is useful for traders who frequently make the same offer. popup.info.multiplePaymentAccounts.headline=多個支付賬户可用 popup.info.multiplePaymentAccounts.msg=您有多個支付帳户在這個報價中可用。請確你做了正確的選擇。 @@ -2397,7 +2397,7 @@ popup.accountSigning.signAccounts.ECKey.error=不正確的仲裁員 ECKey popup.accountSigning.success.headline=恭喜 popup.accountSigning.success.description=所有 {0} 支付賬户已成功驗證！ -popup.accountSigning.generalInformation=您將在帳户頁面找到所有賬户的驗證狀態。\n\n更多信息，請訪問https://docs.bisq.network/payment-methods#account-signing. +popup.accountSigning.generalInformation=You'll find the signing state of all your accounts in the account section.\n\nFor further information, please visit [HYPERLINK:https://bisq.wiki/Account_limits#Account_signing]. popup.accountSigning.signedByArbitrator=您的一個付款帳户已被認證以及被仲裁員驗證。交易成功後，使用此帳户將自動驗證您的交易夥伴的帳户。\n\n{0} popup.accountSigning.signedByPeer=您的一個付款帳户已經被交易夥伴驗證和驗證。您的初始交易限額將被取消，您將能夠在{0}天后驗證其他帳户。 popup.accountSigning.peerLimitLifted=您其中一個帳户的初始限額已被取消。\n\n{0} @@ -2736,7 +2736,7 @@ payment.shared.extraInfo=附加信息 payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers). payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\nCountry you are located (eg France); \nCountries / regions you would accept trades from (eg France, EU, or any European country); \nAny special terms/conditions; \nAny other details. payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\nIf you do not meet the requirements do not take this trade. -payment.f2f.info=與網上交易相比，“面對面”交易有不同的規則，也有不同的風險。\n\n主要區別是：\n●交易夥伴需要使用他們提供的聯繫方式交換關於會面地點和時間的信息。\n●交易雙方需要攜帶筆記本電腦，在會面地點確認“已發送付款”和“已收到付款”。\n●如果交易方有特殊的“條款和條件”，他們必須在賬户的“附加信息”文本框中聲明這些條款和條件。\n●在發生爭議時，調解員或仲裁員不能提供太多幫助，因為通常很難獲得有關會面上所發生情況的篡改證據。在這種情況下，BTC 資金可能會被無限期鎖定，或者直到交易雙方達成協議。\n\n為確保您完全理解“面對面”交易的不同之處，請閲讀以下説明和建議：“https://docs.bisq.network/trading-rules.html#f2f-trading” +payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\nThe 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' 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 mediator or arbitrator cannot be of much assistance as it is usually difficult 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 an agreement.\n\nTo be sure you fully understand the differences with 'Face to Face' trades please read the instructions and recommendations at: [HYPERLINK:https://bisq.wiki/Face-to-face_(payment_method)] payment.f2f.info.openURL=打開網頁 payment.f2f.offerbook.tooltip.countryAndCity=國家或地區及城市：{0} / {1} payment.f2f.offerbook.tooltip.extra=附加信息：{0} From 59de78c332c4e223be87a3acca1cc71f5428f61c Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 May 2021 20:00:49 +0200 Subject: [PATCH 05/15] Bump version number for v1.6.5 --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/copy_dbs.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 2a79564e5fe..eeccbea3837 100644 --- a/build.gradle +++ b/build.gradle @@ -412,7 +412,7 @@ configure(project(':desktop')) { modules = ['javafx.controls', 'javafx.fxml'] } - version = '1.6.4-SNAPSHOT' + version = '1.6.5' jar.manifest.attributes( "Implementation-Title": project.name, diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index fc6ebf92d0a..2f4b8661ed4 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -30,7 +30,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.6.4"; + public static final String VERSION = "1.6.5"; /** * Holds a list of the tagged resource files for optimizing the getData requests. diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index d4fa82ed8f0..c6603d1eaa6 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.6.4-SNAPSHOT +ENV version 1.6.5 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index 63a085d1f79..6eacae6c2b5 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.6.4 + 1.6.5 CFBundleShortVersionString - 1.6.4 + 1.6.5 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index 640a9d14bea..08b71e6f269 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version="1.6.4" +version="1.6.5" # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index a75160f2973..5b47d01a6a7 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.6.4-SNAPSHOT" +version="1.6.5" target_dir="releases/$version" diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index ff1c01b3197..6ba6f0f3962 100755 --- a/desktop/package/macosx/replace_version_number.sh +++ b/desktop/package/macosx/replace_version_number.sh @@ -2,8 +2,8 @@ cd $(dirname $0)/../../../. -oldVersion=1.6.3 -newVersion=1.6.4 +oldVersion=1.6.4 +newVersion=1.6.5 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 4d7f9a9fd22..9f05f9f2ce1 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.6.4-SNAPSHOT +1.6.5 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index d3f33b00322..9016c1e19f2 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -47,7 +47,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { private static final long CHECK_CONNECTION_LOSS_SEC = 30; - private static final String VERSION = "1.6.4"; + private static final String VERSION = "1.6.5"; private SeedNode seedNode; private Timer checkConnectionLossTime; From be96050964df2b73059d1a306389a5f6561c2ae8 Mon Sep 17 00:00:00 2001 From: cd2357 Date: Mon, 24 May 2021 09:13:36 +0200 Subject: [PATCH 06/15] Build: Change default console to plain Change default gradle console style to plain. This makes y/n user prompts more readable during installer packaging, without having to specify --console=plain. --- gradle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle.properties b/gradle.properties index e4d9a54cbc8..38fb1df2088 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,5 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 + +# Makes Y/N user prompts more readable during installer packaging +org.gradle.console=plain From 3a31ed786793ea2ee109d027f975ea05afd10bf1 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 25 May 2021 10:39:36 +0200 Subject: [PATCH 07/15] Update bitcoinj checkpoints for v1.6.5 --- core/src/main/resources/wallet/checkpoints.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index 5b3f82b78e9..a87f65f162d 100644 --- a/core/src/main/resources/wallet/checkpoints.txt +++ b/core/src/main/resources/wallet/checkpoints.txt @@ -1,6 +1,6 @@ TXT CHECKPOINTS 1 0 -336 +339 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -337,3 +337,6 @@ GaVdn56xd5nImNufAAo+YAAAACAHKVwriCjnfwq5aifRmVw5M7Iuu3iqCAAAAAAAAAAAAMPe34CBzFKs GkD2FFHSldaV1ylFAApGQAAAoCCuIeiM9eCK9ZhitwDrjbRFc/59vyyECwAAAAAAAAAAAIXwebYkSFSbeLbTeMKy9Qdj4KCSw+pp3ozDK+//1/8PzOhCYIwfDRcwPZvi GtqVXMqQe3Ns6MYJAApOIADg/y/0bK1WbDzJeTdiOFGeHwKaSoE1q1JZBgAAAAAAAAAAAORrAS9sz/29N1IuVV4B/HEQl5WopixICLmtrqR9Nv5HVQRVYG/fDBeoizkq G3cyiP8KLWLFM4vLAApWAAAAQCAcSNk1TNl2QHzwbzTCQ4a5Kgdn/DaxAAAAAAAAAAAAAAuXka+Gs7Ar6n2tgyD5s56cuB5sYKmeeTtkM2BAg0ZcoXpmYEgqDBcETC6x +HBzrCdbrVdEyWlGcAApd4AAA/z/mbi0FasGvYrNFR173cCsBqX8ZYNuiBQAAAAAAAAAAAOmmNMCtRFFdI9dL6JvZx2SzyiAlAMvHZxXu0fSBYyBi95Z4YJPvCxfASl8A +HMXPiA7Yq2TAvg7oAAplwADg/y8PoNXZqux7J22Tt6OACK3gtzyoGFxdAwAAAAAAAAAAAJJlpztE1417UDq0w16e5Oy4aYASXym2A+aMLu+VZx9WlrmNYGOoDReoTVIo +HVlvUHhtZuK/0YNBAAptoAAAACDh3dGZyflMEQKf8NvR3vmO7MEz9i2IDQAAAAAAAAAAAD75AXEYjGSu6ZpHyNYEaaakf00ekgDHHmPsKXObB4tGUuqcYOk8CxcuZVP2 From 3be0795eeab44656d82de4493f464618b47c6218 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 25 May 2021 10:40:45 +0200 Subject: [PATCH 08/15] Update data stores for v1.6.5 --- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/macosx/copy_dbs.sh | 5 +++++ .../main/resources/AccountAgeWitnessStore_1.6.5_BTC_MAINNET | 3 +++ p2p/src/main/resources/BlindVoteStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/ProposalStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/TempProposalStore_BTC_MAINNET | 3 +++ .../main/resources/TradeStatistics3Store_1.6.5_BTC_MAINNET | 3 +++ 9 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 p2p/src/main/resources/AccountAgeWitnessStore_1.6.5_BTC_MAINNET create mode 100644 p2p/src/main/resources/TempProposalStore_BTC_MAINNET create mode 100644 p2p/src/main/resources/TradeStatistics3Store_1.6.5_BTC_MAINNET diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 2f4b8661ed4..20ce4f56960 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -38,7 +38,7 @@ public class Version { * historical data stores. */ public static final List HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2", - "1.5.5", "1.5.7", "1.6.0", "1.6.3"); + "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5"); public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh index 08b71e6f269..8b881898f47 100755 --- a/desktop/package/macosx/copy_dbs.sh +++ b/desktop/package/macosx/copy_dbs.sh @@ -15,3 +15,8 @@ cp "$dbDir/TradeStatistics3Store" "$resDir/TradeStatistics3Store_${version}_BTC_ cp "$dbDir/AccountAgeWitnessStore" "$resDir/AccountAgeWitnessStore_${version}_BTC_MAINNET" cp "$dbDir/DaoStateStore" "$resDir/DaoStateStore_BTC_MAINNET" cp "$dbDir/SignedWitnessStore" "$resDir/SignedWitnessStore_BTC_MAINNET" + +# Only to be updated when required +# cp "$dbDir/ProposalStore" "$resDir/ProposalStore_BTC_MAINNET" +# cp "$dbDir/TempProposalStore" "$resDir/TempProposalStore_BTC_MAINNET" +# cp "$dbDir/BlindVoteStore" "$resDir/BlindVoteStore_BTC_MAINNET" diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.6.5_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.6.5_BTC_MAINNET new file mode 100644 index 00000000000..ece1abccc7b --- /dev/null +++ b/p2p/src/main/resources/AccountAgeWitnessStore_1.6.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46133abc575ba397fabf65a7ce3940e02ecb07f80730b9b4309d7a378b33f669 +size 107422 diff --git a/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET b/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET index be29bc66ab4..edc65895d97 100644 --- a/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET +++ b/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0feba11eb9f44e5d3b705348b53533324193ae328198c16f1257910d6c9c9cf8 -size 88133 +oid sha256:210cfd09c93253a65ab505d3804b16aca301bb18fbf504a06bf588deeb98f35d +size 1263554 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index fe6aa6a6c5c..99027d2feeb 100644 --- a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET +++ b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:123ebb76206d420d0998a68ead2a7f70184e3bee36eeea713bbf49d66643ce3a -size 122349144 +oid sha256:e0aec21a039e7232bd4f6ffe9717383bc9dee141b5e6c4a8330c34d42cd13b60 +size 127255965 diff --git a/p2p/src/main/resources/ProposalStore_BTC_MAINNET b/p2p/src/main/resources/ProposalStore_BTC_MAINNET index 7304b6b546c..379777e4218 100644 --- a/p2p/src/main/resources/ProposalStore_BTC_MAINNET +++ b/p2p/src/main/resources/ProposalStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef168a7a11e349b1e49a639b5a57bbf8d656ada080aa8b80a2f3c0f0434b6e0f -size 13843 +oid sha256:144612db7207070c9acb3dd97902720080fb2f6fdc36fcfa60a091d92d443c1c +size 140556 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index 5f2d3c70597..cfd4583ece8 100644 --- a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37ff01d3a3aca6465d9f9606d3da233e85ba3a47b77ae7a076c5565343695890 -size 7282079 +oid sha256:f467f09d127a5975bd034662649ac2f7d4896a219dcde53be5ef8ca90ec7b2a1 +size 7644339 diff --git a/p2p/src/main/resources/TempProposalStore_BTC_MAINNET b/p2p/src/main/resources/TempProposalStore_BTC_MAINNET new file mode 100644 index 00000000000..6362da27e62 --- /dev/null +++ b/p2p/src/main/resources/TempProposalStore_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b205c58f28506db0aadd3f048c4189d5c054729df035e69df91234a53953a075 +size 51058 diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.6.5_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.6.5_BTC_MAINNET new file mode 100644 index 00000000000..6e148be2eb1 --- /dev/null +++ b/p2p/src/main/resources/TradeStatistics3Store_1.6.5_BTC_MAINNET @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80b7206b78370daef5b3fa3650fa21eaeae466141e30ed8036541b0b332b9ed1 +size 216303 From 07efb51fe74a34ff2537d55652c19fc123c7fd13 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Tue, 25 May 2021 16:35:12 +0200 Subject: [PATCH 09/15] Update release process to match new improvements --- docs/release-process.md | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index 77c5cb33009..eca124b697e 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -69,6 +69,10 @@ Use VirtualBox > 6.1 with following configuration: #### For every OS * Install latest security updates +* Install/Upgrade to latest Java 11 SDK + * macOS (brew option): `brew upgrade openjdk@11` + * Ubuntu (brew option): `brew upgrade java11` + * Windows: Download latest version from https://www.oracle.com/java/technologies/javase-jdk11-downloads.html #### For Windows @@ -88,19 +92,19 @@ certificate and provisioning file before running the build. . 2. Set environment variables to ~/.profile file or the like... (one time effort) - * `BISQ_GPG_USER`: e.g. export BISQ_GPG_USER=manfred@bitsquare.io - * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system - * `BISQ_PACKAGE_SIGNING_IDENTITY`: e.g. "Developer ID Application: Christoph Atteneder (WQT93T6D6C)" - * `BISQ_PRIMARY_BUNDLE_ID`: e.g. "network.bisq.CAT" - * `BISQ_PACKAGE_NOTARIZATION_AC_USERNAME`: your Apple developer email address - * `BISQ_PACKAGE_NOTARIZATION_ASC_PROVIDER`: Your developer ID (e.g. WQT93T6D6C) + * `BISQ_GPG_USER`: e.g. export BISQ_GPG_USER=manfred@bitsquare.io + * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system + * `BISQ_PACKAGE_SIGNING_IDENTITY`: e.g. "Developer ID Application: Christoph Atteneder (WQT93T6D6C)" + * `BISQ_PRIMARY_BUNDLE_ID`: e.g. "network.bisq.CAT" + * `BISQ_PACKAGE_NOTARIZATION_AC_USERNAME`: your Apple developer email address + * `BISQ_PACKAGE_NOTARIZATION_ASC_PROVIDER`: Your developer ID (e.g. WQT93T6D6C) -3. Run `./gradlew --console=plain packageInstallers` +3. Run `./gradlew packageInstallers` Build output expected in shared folder: 1. `Bisq-${NEW_VERSION}.dmg` macOS notarized and signed installer -2. `desktop-${NEW_VERSION}-all.jar.SHA-256` sha256 sum of fat jar +2. `desktop-${NEW_VERSION}-all-mac.jar.SHA-256` sha256 sum of fat jar 3. `jar-lib-for-raspberry-pi-${NEW_VERSION}.zip` Jar libraries for Raspberry Pi * Before building the other binaries install the generated Bisq app on macOS and verify that everything works as @@ -111,15 +115,15 @@ Build output expected in shared folder: 1. Checkout the release tag in your VM 2. Set environment variables to ~/.profile file or the like... (one time effort) - * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system + * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system -3. Run `./gradlew --console=plain packageInstallers` +3. Run `./gradlew packageInstallers` Build output expected: 1. `bisq_${NEW_VERSION}-1_amd64.deb` package for distributions that derive from Debian 2. `bisq-${NEW_VERSION}-1.x86_64.rpm` package for distributions that derive from Redhat based distros -3. `desktop-${NEW_VERSION}-all.jar.SHA-256` sha256 sum of fat jar +3. `desktop-${NEW_VERSION}-all-linux.jar.SHA-256` sha256 sum of fat jar * Install and run generated package @@ -132,12 +136,12 @@ To be able to generate a signed binary you have to apply and install a developer 2. Set environment variables to ~/.profile file or the like... (one time effort) * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system -3. Run `./gradlew --console=plain packageInstallers` +3. Run `./gradlew packageInstallers` Build output expected: 1. `Bisq-${NEW_VERSION}.exe` Windows signed installer -2. `desktop-${NEW_VERSION}-all.jar.SHA-256` sha256 sum of fat jar +2. `desktop-${NEW_VERSION}-all-windows.jar.SHA-256` sha256 sum of fat jar * Install and run generated package @@ -194,6 +198,9 @@ If all was successful: * Check the fingerprint of the pgp key which was used for signing in signingkey.asc (e.g. 29CDFD3B for Christoph Atteneder) +* Manually add all hashes (macOS, linux, windows) to the `Bisq-${NEW_VERSION}.jar.txt` file. + (TODO: Automate file creation after process has been proven in v1.6.5) + * Add all files including signingkey.asc and the gpg pub keys to GitHub release page * Check all uploaded files with [virustotal.com](https://www.virustotal.com) From 9b023a371fe8b1ea7d8b09d8891a5744a1d3ddde Mon Sep 17 00:00:00 2001 From: sqrrm Date: Wed, 26 May 2021 15:32:32 +0200 Subject: [PATCH 10/15] Manually create BSQ outputs Avoid relying on bitcoinj completeTx for creation of BSQ change outputs as dust BSQ would be used for mining fee, thus burning the BSQ. --- .../core/btc/wallet/BsqWalletService.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java index dda38b56edc..708c5044678 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java @@ -52,7 +52,6 @@ import org.bitcoinj.script.Script; import org.bitcoinj.script.ScriptException; import org.bitcoinj.wallet.CoinSelection; -import org.bitcoinj.wallet.CoinSelector; import org.bitcoinj.wallet.SendRequest; import javax.inject.Inject; @@ -562,38 +561,38 @@ public Transaction getPreparedSendBtcTx(String receiverAddress, return getPreparedSendTx(receiverAddress, receiverAmount, nonBsqCoinSelector); } - private Transaction getPreparedSendTx(String receiverAddress, Coin receiverAmount, CoinSelector coinSelector) + private Transaction getPreparedSendTx(String receiverAddress, + Coin receiverAmount, + BisqDefaultCoinSelector coinSelector) throws AddressFormatException, InsufficientBsqException, WalletException, TransactionVerificationException, BsqChangeBelowDustException { daoKillSwitch.assertDaoIsNotDisabled(); Transaction tx = new Transaction(params); checkArgument(Restrictions.isAboveDust(receiverAmount), "The amount is too low (dust limit)."); tx.addOutput(receiverAmount, Address.fromString(params, receiverAddress)); - SendRequest sendRequest = SendRequest.forTx(tx); - sendRequest.fee = Coin.ZERO; - sendRequest.feePerKb = Coin.ZERO; - sendRequest.ensureMinRequiredFee = false; - sendRequest.aesKey = aesKey; - sendRequest.shuffleOutputs = false; - sendRequest.signInputs = false; - sendRequest.changeAddress = getChangeAddress(); - sendRequest.coinSelector = coinSelector; try { + var selection = coinSelector.select(receiverAmount, wallet.calculateAllSpendCandidates()); + var change = coinSelector.getChange(receiverAmount, selection); + if (Restrictions.isAboveDust(change)) { + tx.addOutput(change, getChangeAddress()); + } else if (!change.isZero()) { + String msg = "BSQ change output is below dust limit. outputValue=" + change.value / 100 + " BSQ"; + log.warn(msg); + throw new BsqChangeBelowDustException(msg, change); + } + + SendRequest sendRequest = SendRequest.forTx(tx); + sendRequest.fee = Coin.ZERO; + sendRequest.feePerKb = Coin.ZERO; + sendRequest.ensureMinRequiredFee = false; + sendRequest.aesKey = aesKey; + sendRequest.shuffleOutputs = false; + sendRequest.signInputs = false; + sendRequest.changeAddress = getChangeAddress(); + sendRequest.coinSelector = coinSelector; wallet.completeTx(sendRequest); checkWalletConsistency(wallet); verifyTransaction(tx); - // printTx("prepareSendTx", tx); - - // Tx has as first output BSQ and an optional second BSQ change output. - // At that stage we do not have added the BTC inputs so there is no BTC change output here. - if (tx.getOutputs().size() == 2) { - Coin bsqChangeOutputValue = tx.getOutputs().get(1).getValue(); - if (!Restrictions.isAboveDust(bsqChangeOutputValue)) { - String msg = "BSQ change output is below dust limit. outputValue=" + bsqChangeOutputValue.value / 100 + " BSQ"; - log.warn(msg); - throw new BsqChangeBelowDustException(msg, bsqChangeOutputValue); - } - } return tx; } catch (InsufficientMoneyException e) { From d6e17610bd9cbf398fe88d9a8e07947147060d4c Mon Sep 17 00:00:00 2001 From: Stephan Oeste Date: Thu, 27 May 2021 12:38:16 +0200 Subject: [PATCH 11/15] Remove Bitpay as a pricenode data provider --- .../bisq/price/spot/providers/Bitpay.java | 102 ------------------ .../bisq/price/spot/providers/BitpayTest.java | 34 ------ 2 files changed, 136 deletions(-) delete mode 100644 pricenode/src/main/java/bisq/price/spot/providers/Bitpay.java delete mode 100644 pricenode/src/test/java/bisq/price/spot/providers/BitpayTest.java diff --git a/pricenode/src/main/java/bisq/price/spot/providers/Bitpay.java b/pricenode/src/main/java/bisq/price/spot/providers/Bitpay.java deleted file mode 100644 index 0c44cbc2db2..00000000000 --- a/pricenode/src/main/java/bisq/price/spot/providers/Bitpay.java +++ /dev/null @@ -1,102 +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 . - */ - -package bisq.price.spot.providers; - -import bisq.price.spot.ExchangeRate; -import bisq.price.spot.ExchangeRateProvider; -import bisq.price.util.bitpay.BitpayMarketData; -import bisq.price.util.bitpay.BitpayTicker; - -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.RequestEntity; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.util.UriComponentsBuilder; - -import java.time.Duration; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Stream; - -@Component -class Bitpay extends ExchangeRateProvider { - - private final RestTemplate restTemplate = new RestTemplate(); - - public Bitpay() { - super("BITPAY", "bitpay", Duration.ofMinutes(1)); - } - - @Override - public Set doGet() { - - Set result = new HashSet(); - - Predicate isDesiredFiatPair = t -> SUPPORTED_FIAT_CURRENCIES.contains(t.getCode()); - Predicate isDesiredCryptoPair = t -> SUPPORTED_CRYPTO_CURRENCIES.contains(t.getCode()); - - getTickers() - .filter(isDesiredFiatPair.or(isDesiredCryptoPair)) - .forEach(ticker -> { - boolean useInverseRate = false; - if (SUPPORTED_CRYPTO_CURRENCIES.contains(ticker.getCode())) { - // Use inverse rate for alts, because the API returns the - // conversion rate in the opposite direction than what we need - // API returns the BTC/Alt rate, we need the Alt/BTC rate - useInverseRate = true; - } - - BigDecimal rate = ticker.getRate(); - // Find the inverse rate, while using enough decimals to reflect very - // small exchange rates - BigDecimal inverseRate = (rate.compareTo(BigDecimal.ZERO) > 0) ? - BigDecimal.ONE.divide(rate, 8, RoundingMode.HALF_UP) : - BigDecimal.ZERO; - - result.add(new ExchangeRate( - ticker.getCode(), - (useInverseRate ? inverseRate : rate), - new Date(), - this.getName() - )); - }); - - return result; - } - - private Stream getTickers() { - BitpayMarketData marketData = restTemplate.exchange( - RequestEntity - .get(UriComponentsBuilder - .fromUriString("https://bitpay.com/rates").build() - .toUri()) - .build(), - new ParameterizedTypeReference() { - } - ).getBody(); - - return Arrays.stream(marketData.getData()); - } -} diff --git a/pricenode/src/test/java/bisq/price/spot/providers/BitpayTest.java b/pricenode/src/test/java/bisq/price/spot/providers/BitpayTest.java deleted file mode 100644 index 38569e1ce84..00000000000 --- a/pricenode/src/test/java/bisq/price/spot/providers/BitpayTest.java +++ /dev/null @@ -1,34 +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 . - */ - -package bisq.price.spot.providers; - -import bisq.price.AbstractExchangeRateProviderTest; - -import lombok.extern.slf4j.Slf4j; - -import org.junit.jupiter.api.Test; - -@Slf4j -public class BitpayTest extends AbstractExchangeRateProviderTest { - - @Test - public void doGet_successfulCall() { - doGet_successfulCall(new Bitpay()); - } - -} From 84c3fb581b9f09730f8354de069cc68122583812 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 27 May 2021 21:28:21 +0200 Subject: [PATCH 12/15] Fix setting of buyer security deposit The existing code failed if an offer was duplicated that had a different minimum security deposit set. It is changed so that it makes sure that the it never falls below the minimum buyer security deposit and never exceeds the maximum security deposit percentage. --- .../main/offer/MutableOfferDataModel.java | 2 +- .../main/offer/MutableOfferViewModel.java | 4 +++- .../duplicateoffer/DuplicateOfferDataModel.java | 16 +++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java index c15effc7192..d216c89f298 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java @@ -714,7 +714,7 @@ private Coin getSellerSecurityDepositAsCoin() { return getBoundedSellerSecurityDepositAsCoin(percentOfAmountAsCoin); } - private Coin getBoundedBuyerSecurityDepositAsCoin(Coin value) { + protected Coin getBoundedBuyerSecurityDepositAsCoin(Coin value) { // We need to ensure that for small amount values we don't get a too low BTC amount. We limit it with using the // MinBuyerSecurityDepositAsCoin from Restrictions. return Coin.valueOf(Math.max(Restrictions.getMinBuyerSecurityDepositAsCoin().value, value.value)); diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java index b77f2165c4b..ceb17786704 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java @@ -481,8 +481,10 @@ private void createListeners() { securityDepositAsDoubleListener = (ov, oldValue, newValue) -> { if (newValue != null) { buyerSecurityDeposit.set(FormattingUtils.formatToPercent((double) newValue)); - if (dataModel.getAmount().get() != null) + if (dataModel.getAmount().get() != null) { buyerSecurityDepositInBTC.set(btcFormatter.formatCoinWithCode(dataModel.getBuyerSecurityDepositAsCoin())); + } + updateBuyerSecurityDeposit(); } else { buyerSecurityDeposit.set(""); buyerSecurityDepositInBTC.set(""); diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java index ab0729c6ba1..b713ed112e7 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java @@ -40,6 +40,8 @@ import bisq.network.p2p.P2PService; +import org.bitcoinj.core.Coin; + import com.google.inject.Inject; import javax.inject.Named; @@ -88,14 +90,18 @@ public void populateData(Offer offer) { setVolume(offer.getVolume()); setUseMarketBasedPrice(offer.isUseMarketBasedPrice()); - if (offer.getBuyerSecurityDeposit().value == Restrictions.getMinBuyerSecurityDepositAsCoin().getValue()) { - setBuyerSecurityDeposit(Restrictions.getMinBuyerSecurityDepositAsPercent()); - } else { - setBuyerSecurityDeposit(CoinUtil.getAsPercentPerBtc(offer.getBuyerSecurityDeposit(), offer.getAmount())); - } + setBuyerSecurityDeposit(getBuyerSecurityAsPercent(offer)); if (offer.isUseMarketBasedPrice()) { setMarketPriceMargin(offer.getMarketPriceMargin()); } } + + private double getBuyerSecurityAsPercent(Offer offer) { + Coin offerBuyerSecurityDeposit = getBoundedBuyerSecurityDepositAsCoin(offer.getBuyerSecurityDeposit()); + double offerBuyerSecurityDepositAsPercent = CoinUtil.getAsPercentPerBtc(offerBuyerSecurityDeposit, + offer.getAmount()); + return Math.min(offerBuyerSecurityDepositAsPercent, + Restrictions.getMaxBuyerSecurityDepositAsPercent()); + } } From caec38de5dd7786de66566eb9f315f7ae41fd913 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 28 May 2021 17:51:02 +0200 Subject: [PATCH 13/15] Revert setting of deposit when cloning an offer --- .../desktop/main/offer/MutableOfferViewModel.java | 1 - .../duplicateoffer/DuplicateOfferDataModel.java | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java index ceb17786704..e09486dbd0c 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java @@ -484,7 +484,6 @@ private void createListeners() { if (dataModel.getAmount().get() != null) { buyerSecurityDepositInBTC.set(btcFormatter.formatCoinWithCode(dataModel.getBuyerSecurityDepositAsCoin())); } - updateBuyerSecurityDeposit(); } else { buyerSecurityDeposit.set(""); buyerSecurityDepositInBTC.set(""); diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java index b713ed112e7..ff0b6cb8600 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/duplicateoffer/DuplicateOfferDataModel.java @@ -24,7 +24,6 @@ import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.btc.wallet.BsqWalletService; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.btc.wallet.Restrictions; import bisq.core.offer.CreateOfferService; import bisq.core.offer.Offer; import bisq.core.offer.OfferUtil; @@ -36,12 +35,9 @@ import bisq.core.user.User; import bisq.core.util.FormattingUtils; import bisq.core.util.coin.CoinFormatter; -import bisq.core.util.coin.CoinUtil; import bisq.network.p2p.P2PService; -import org.bitcoinj.core.Coin; - import com.google.inject.Inject; import javax.inject.Named; @@ -90,18 +86,8 @@ public void populateData(Offer offer) { setVolume(offer.getVolume()); setUseMarketBasedPrice(offer.isUseMarketBasedPrice()); - setBuyerSecurityDeposit(getBuyerSecurityAsPercent(offer)); - if (offer.isUseMarketBasedPrice()) { setMarketPriceMargin(offer.getMarketPriceMargin()); } } - - private double getBuyerSecurityAsPercent(Offer offer) { - Coin offerBuyerSecurityDeposit = getBoundedBuyerSecurityDepositAsCoin(offer.getBuyerSecurityDeposit()); - double offerBuyerSecurityDepositAsPercent = CoinUtil.getAsPercentPerBtc(offerBuyerSecurityDeposit, - offer.getAmount()); - return Math.min(offerBuyerSecurityDepositAsPercent, - Restrictions.getMaxBuyerSecurityDepositAsPercent()); - } } From 351d5f13e719752bb6f83dd4fb29e83704e3deaf Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 31 May 2021 09:53:33 +0200 Subject: [PATCH 14/15] Revert to SNAPSHOT version --- build.gradle | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/insert_snapshot_version.sh | 2 +- relay/src/main/resources/version.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index eeccbea3837..22eda77ede3 100644 --- a/build.gradle +++ b/build.gradle @@ -412,7 +412,7 @@ configure(project(':desktop')) { modules = ['javafx.controls', 'javafx.fxml'] } - version = '1.6.5' + version = '1.6.5-SNAPSHOT' jar.manifest.attributes( "Implementation-Title": project.name, diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index c6603d1eaa6..2f3b2e2c860 100644 --- a/desktop/package/linux/Dockerfile +++ b/desktop/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 1.6.5 +ENV version 1.6.5-SNAPSHOT RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 5b47d01a6a7..422043aff59 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.6.5" +version="1.6.5-SNAPSHOT" target_dir="releases/$version" diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh index ebd56946914..afb9d8b2ced 100755 --- a/desktop/package/macosx/insert_snapshot_version.sh +++ b/desktop/package/macosx/insert_snapshot_version.sh @@ -2,7 +2,7 @@ cd $(dirname $0)/../../../ -version=1.6.4 +version=1.6.5 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 9f05f9f2ce1..aba957a6eb3 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.6.5 +1.6.5-SNAPSHOT From c433cffe3929033849b66e4fa39b824ac653ec56 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 31 May 2021 11:58:42 +0200 Subject: [PATCH 15/15] Fix release process formatting --- docs/release-process.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index eca124b697e..23fbb6629be 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -70,9 +70,9 @@ Use VirtualBox > 6.1 with following configuration: * Install latest security updates * Install/Upgrade to latest Java 11 SDK - * macOS (brew option): `brew upgrade openjdk@11` - * Ubuntu (brew option): `brew upgrade java11` - * Windows: Download latest version from https://www.oracle.com/java/technologies/javase-jdk11-downloads.html + * macOS (brew option): `brew upgrade openjdk@11` + * Ubuntu (brew option): `brew upgrade java11` + * Windows: Download latest version from https://www.oracle.com/java/technologies/javase-jdk11-downloads.html #### For Windows @@ -92,12 +92,13 @@ certificate and provisioning file before running the build. . 2. Set environment variables to ~/.profile file or the like... (one time effort) - * `BISQ_GPG_USER`: e.g. export BISQ_GPG_USER=manfred@bitsquare.io - * `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system - * `BISQ_PACKAGE_SIGNING_IDENTITY`: e.g. "Developer ID Application: Christoph Atteneder (WQT93T6D6C)" - * `BISQ_PRIMARY_BUNDLE_ID`: e.g. "network.bisq.CAT" - * `BISQ_PACKAGE_NOTARIZATION_AC_USERNAME`: your Apple developer email address - * `BISQ_PACKAGE_NOTARIZATION_ASC_PROVIDER`: Your developer ID (e.g. WQT93T6D6C) + +* `BISQ_GPG_USER`: e.g. export BISQ_GPG_USER=manfred@bitsquare.io +* `BISQ_SHARED_FOLDER`: shared folder that is used between your VM host and client system +* `BISQ_PACKAGE_SIGNING_IDENTITY`: e.g. "Developer ID Application: Christoph Atteneder (WQT93T6D6C)" +* `BISQ_PRIMARY_BUNDLE_ID`: e.g. "network.bisq.CAT" +* `BISQ_PACKAGE_NOTARIZATION_AC_USERNAME`: your Apple developer email address +* `BISQ_PACKAGE_NOTARIZATION_ASC_PROVIDER`: Your developer ID (e.g. WQT93T6D6C) 3. Run `./gradlew packageInstallers`