From 7475f1720704d9d439d192fcbe033a3433ec5dd1 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 30 Jul 2020 10:19:34 +0200 Subject: [PATCH 1/6] Bump version number for v1.3.7 --- build.gradle | 2 +- common/src/main/java/bisq/common/app/Version.java | 2 +- desktop/package/linux/Dockerfile | 2 +- desktop/package/linux/package.sh | 2 +- desktop/package/linux/release.sh | 2 +- desktop/package/macosx/Info.plist | 4 ++-- desktop/package/macosx/create_app.sh | 2 +- desktop/package/macosx/finalize.sh | 2 +- desktop/package/macosx/replace_version_number.sh | 4 ++-- desktop/package/windows/package.bat | 2 +- desktop/package/windows/release.bat | 2 +- relay/src/main/resources/version.txt | 2 +- seednode/src/main/java/bisq/seednode/SeedNodeMain.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 82d5cc2ffb1..7ba2bae38a0 100644 --- a/build.gradle +++ b/build.gradle @@ -378,7 +378,7 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.3.6-SNAPSHOT' + version = '1.3.7' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java index 1508625a4d1..926c361e4f4 100644 --- a/common/src/main/java/bisq/common/app/Version.java +++ b/common/src/main/java/bisq/common/app/Version.java @@ -27,7 +27,7 @@ public class Version { // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update // Therefore all sub versions start again with 1 // We use semantic versioning with major, minor and patch - public static final String VERSION = "1.3.6"; + public static final String VERSION = "1.3.7"; public static int getMajorVersion(String version) { return getSubVersion(version, 0); diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile index e064c83eccf..b0c1bd474b6 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.3.6-SNAPSHOT +ENV version 1.3.7 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/linux/package.sh b/desktop/package/linux/package.sh index 0b216eb4a49..61975412a32 100755 --- a/desktop/package/linux/package.sh +++ b/desktop/package/linux/package.sh @@ -6,7 +6,7 @@ # - Update version below # - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory -version=1.3.6-SNAPSHOT +version=1.3.7 version_base=$(echo $version | awk -F'[_-]' '{print $1}') if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then diff --git a/desktop/package/linux/release.sh b/desktop/package/linux/release.sh index 758087d9c58..0eefb6a521f 100755 --- a/desktop/package/linux/release.sh +++ b/desktop/package/linux/release.sh @@ -4,7 +4,7 @@ # Prior to running this script: # - Update version below -version=1.3.6-SNAPSHOT +version=1.3.7 base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../.. package_dir=$base_dir/desktop/package release_dir=$base_dir/desktop/release/$version diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index aefe0585808..7125f93a83d 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -5,10 +5,10 @@ CFBundleVersion - 1.3.6 + 1.3.7 CFBundleShortVersionString - 1.3.6 + 1.3.7 CFBundleExecutable Bisq diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh index 64484c5b2b8..2938ac7bcd2 100755 --- a/desktop/package/macosx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e -version="1.3.6-SNAPSHOT" +version="1.3.7" cd .. ./gradlew :desktop:build -x test shadowJar diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh index 5fc8cb9341d..16ed7856ce1 100755 --- a/desktop/package/macosx/finalize.sh +++ b/desktop/package/macosx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="1.3.6-SNAPSHOT" +version="1.3.7" target_dir="releases/$version" diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh index 5ae7510d697..9f21dcae758 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.3.5 -newVersion=1.3.6 +oldVersion=1.3.6 +newVersion=1.3.7 find . -type f \( -name "finalize.sh" \ -o -name "create_app.sh" \ diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat index 2b1069cfbb4..6103e8ebbe6 100644 --- a/desktop/package/windows/package.bat +++ b/desktop/package/windows/package.bat @@ -11,7 +11,7 @@ @echo off -set version=1.3.6-SNAPSHOT +set version=1.3.7 if not exist "%JAVA_HOME%\bin\javapackager.exe" ( if not exist "%ProgramFiles%\Java\jdk-10.0.2" ( echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK. diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat index ef3f270a033..6b4b09ed0af 100644 --- a/desktop/package/windows/release.bat +++ b/desktop/package/windows/release.bat @@ -6,7 +6,7 @@ @echo off -set version=1.3.6-SNAPSHOT +set version=1.3.7 set release_dir=%~dp0..\..\..\releases\%version% set package_dir=%~dp0.. diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt index 9e9c154446d..3336003dccd 100644 --- a/relay/src/main/resources/version.txt +++ b/relay/src/main/resources/version.txt @@ -1 +1 @@ -1.3.6-SNAPSHOT +1.3.7 diff --git a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java index 7894a8393c7..d8a853deeb4 100644 --- a/seednode/src/main/java/bisq/seednode/SeedNodeMain.java +++ b/seednode/src/main/java/bisq/seednode/SeedNodeMain.java @@ -30,7 +30,7 @@ @Slf4j public class SeedNodeMain extends ExecutableForAppWithP2p { - private static final String VERSION = "1.3.6"; + private static final String VERSION = "1.3.7"; private SeedNode seedNode; public SeedNodeMain() { From dfc5eb0459323771abd6ae3da8841d7d77861141 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Thu, 30 Jul 2020 10:21:12 +0200 Subject: [PATCH 2/6] Update translations for v1.3.7 --- .../i18n/displayStrings_de.properties | 49 ++++++++++--------- .../i18n/displayStrings_es.properties | 1 + .../i18n/displayStrings_fa.properties | 1 + .../i18n/displayStrings_fr.properties | 1 + .../i18n/displayStrings_ja.properties | 1 + .../i18n/displayStrings_pt-br.properties | 1 + .../i18n/displayStrings_pt.properties | 1 + .../i18n/displayStrings_ru.properties | 1 + .../i18n/displayStrings_th.properties | 1 + .../i18n/displayStrings_vi.properties | 1 + .../i18n/displayStrings_zh-hans.properties | 1 + .../i18n/displayStrings_zh-hant.properties | 1 + 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 51269aa525b..d77811966a4 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -355,8 +355,8 @@ shared.notSigned.noNeed=Dieser Kontotyp verwendet keine Unterzeichnung offerbook.nrOffers=Anzahl der Angebote: {0} offerbook.volume={0} (min - max) -offerbook.deposit=Deposit BTC (%) -offerbook.deposit.help=Deposit paid by each trader to guarantee the trade. Will be returned when the trade is completed. +offerbook.deposit=Kaution BTC (%) +offerbook.deposit.help=Kaution, die von jedem Trader gezahlt wird, um den Trade zu garantieren. Wird zurückgezahlt, wenn der Trade abgeschlossen ist. offerbook.createOfferToBuy=Neues Angebot erstellen, um {0} zu kaufen offerbook.createOfferToSell=Neues Angebot erstellen, um {0} zu verkaufen @@ -464,7 +464,7 @@ createOffer.tac=Mit der Erstellung dieses Angebots stimme ich zu, mit jedem Hän createOffer.currencyForFee=Handelsgebühr createOffer.setDeposit=Kaution des Käufers festlegen (%) createOffer.setDepositAsBuyer=Meine Kaution als Käufer festlegen (%) -createOffer.setDepositForBothTraders=Set both traders' security deposit (%) +createOffer.setDepositForBothTraders=Legen Sie die Kaution beider Trader fest (%) createOffer.securityDepositInfo=Die Kaution ihres Käufers wird {0} createOffer.securityDepositInfoAsBuyer=Ihre Kaution als Käufer wird {0} createOffer.minSecurityDepositUsed=Min. Kaution des Käufers wird verwendet @@ -683,7 +683,7 @@ portfolio.pending.step5_buyer.refunded=Rückerstattete Kaution portfolio.pending.step5_buyer.withdrawBTC=Ihre Bitcoins abheben portfolio.pending.step5_buyer.amount=Abzuhebender Betrag portfolio.pending.step5_buyer.withdrawToAddress=An diese Adresse abheben -portfolio.pending.step5_buyer.moveToBisqWallet=Keep funds in Bisq wallet +portfolio.pending.step5_buyer.moveToBisqWallet=Gelder in der Bisq Wallet aufbewahren portfolio.pending.step5_buyer.withdrawExternal=An externe Wallet abheben portfolio.pending.step5_buyer.alreadyWithdrawn=Ihre Gelder wurden bereits abgehoben.\nBitte überprüfen Sie den Transaktionsverlauf. portfolio.pending.step5_buyer.confirmWithdrawal=Anfrage zum Abheben bestätigen @@ -1153,6 +1153,7 @@ account.password.info=Mit Passwortschutz müssen Sie Ihr Passwort eingeben, sowo account.seed.backup.title=Backup der Seed-Wörter Ihrer Wallet erstellen account.seed.info=Bitte schreiben Sie die sowohl Seed-Wörter als auch das Datum auf! Mit diesen Seed-Wörtern und dem Datum können Sie Ihre Wallet jederzeit wiederherstellen.\nDie Seed-Wörter werden für die BTC- und BSQ-Wallet genutzt.\n\nSchreiben Sie die Seed-Wörter auf ein Blatt Papier schreiben und speichern Sie sie nicht auf Ihrem Computer.\n\nBitte beachten Sie, dass die Seed-Wörter KEIN Ersatz für ein Backup sind.\nSie müssen ein Backup des gesamten Anwendungsverzeichnisses unter \"Konto/Backup\" erstellen, um den ursprünglichen Zustand der Anwendung wiederherstellen zu können.\nDas Importieren der Seed-Wörter wird nur für Notfälle empfohlen. Die Anwendung wird ohne richtiges Backup der Datenbankdateien und Schlüssel nicht funktionieren! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Sie haben kein Wallet-Passwort festgelegt, was das Anzeigen der Seed-Wörter schützen würde.\n\nMöchten Sie die Seed-Wörter jetzt anzeigen? account.seed.warn.noPw.yes=Ja, und nicht erneut fragen account.seed.enterPw=Geben Sie Ihr Passwort ein um die Seed-Wörter zu sehen @@ -1999,7 +2000,7 @@ filterWindow.disableDaoBelowVersion=Min. für DAO erforderliche Version filterWindow.disableTradeBelowVersion=Min. zum Handeln erforderliche Version filterWindow.add=Filter hinzufügen filterWindow.remove=Filter entfernen -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.btcFeeReceiverAddresses=BTC Gebühr Empfänger-Adressen offerDetailsWindow.minBtcAmount=Min. BTC-Betrag offerDetailsWindow.min=(min. {0}) @@ -2217,22 +2218,22 @@ popup.accountSigning.signedByPeer=Eines Ihrer Zahlungskonten wurde von einem Tra popup.accountSigning.peerLimitLifted=Das anfängliche Limit für eines Ihrer Konten wurde aufgehoben.\n\n{0} popup.accountSigning.peerSigner=Eines Ihrer Konten ist reif genug, um andere Zahlungskonten zu unterzeichnen, und das anfängliche Limit für eines Ihrer Konten wurde aufgehoben.\n\n{0} -popup.accountSigning.singleAccountSelect.headline=Select account age witness -popup.accountSigning.singleAccountSelect.description=Search for account age witness. -popup.accountSigning.singleAccountSelect.datePicker=Select point of time for signing -popup.accountSigning.confirmSingleAccount.headline=Confirm selected account age witness -popup.accountSigning.confirmSingleAccount.selectedHash=Selected witness hash -popup.accountSigning.confirmSingleAccount.button=Sign account age witness -popup.accountSigning.successSingleAccount.description=Witness {0} was signed -popup.accountSigning.successSingleAccount.success.headline=Success -popup.accountSigning.successSingleAccount.signError=Failed to sign witness, {0} - -popup.accountSigning.unsignedPubKeys.headline=Unsigned Pubkeys -popup.accountSigning.unsignedPubKeys.sign=Sign Pubkeys -popup.accountSigning.unsignedPubKeys.signed=Pubkeys were signed -popup.accountSigning.unsignedPubKeys.result.headline=Signing completed -popup.accountSigning.unsignedPubKeys.result.signed=Signed pubkeys -popup.accountSigning.unsignedPubKeys.result.failed=Failed to sign +popup.accountSigning.singleAccountSelect.headline=Zeuge für Konto-Alter auswählen +popup.accountSigning.singleAccountSelect.description=Nach Zeuge für Konto-Alter suchen +popup.accountSigning.singleAccountSelect.datePicker=Zeitpunkt für Unterzeichnung auswählen +popup.accountSigning.confirmSingleAccount.headline=Ausgewählten Zeugen für Konto-Alter bestätigen +popup.accountSigning.confirmSingleAccount.selectedHash=Ausgewählter Zeugen-Hash +popup.accountSigning.confirmSingleAccount.button=Zeuge für Konto-Alter unterzeichnen +popup.accountSigning.successSingleAccount.description=Zeuge {0} wurde unterzeichnet +popup.accountSigning.successSingleAccount.success.headline=Erfolg +popup.accountSigning.successSingleAccount.signError=Zeuge nicht unterzeichnet, {0} + +popup.accountSigning.unsignedPubKeys.headline=Nicht unterzeichnete Pubkeys +popup.accountSigning.unsignedPubKeys.sign=Pubkeys unterzeichnen +popup.accountSigning.unsignedPubKeys.signed=Pubkeys wurden unterzeichnet +popup.accountSigning.unsignedPubKeys.result.headline=Unterzeichnung abgeschlossen +popup.accountSigning.unsignedPubKeys.result.signed=Unterzeichnete Pubkeys +popup.accountSigning.unsignedPubKeys.result.failed=Fehler bei Unterzeichnung #################################################################### # Notifications @@ -2509,13 +2510,13 @@ payment.accountType=Kontotyp payment.checking=Überprüfe payment.savings=Ersparnisse payment.personalId=Personalausweis -payment.clearXchange.info=Zelle is a money transfer service that works best *through* another bank.\n\n1. Check this page to see if (and how) your bank works with Zelle:\nhttps://www.zellepay.com/get-started\n\n2. Take special note of your transfer limits—sending limits vary by bank, and banks often specify separate daily, weekly, and monthly limits.\n\n3. If your bank does not work with Zelle, you can still use it through the Zelle mobile app, but your transfer limits will be much lower.\n\n4. The name specified on your Bisq account MUST match the name on your Zelle/bank account. \n\nIf you cannot complete a Zelle transaction as specified in your trade contract, you may lose some (or all) of your security deposit.\n\nBecause of Zelle''s somewhat higher chargeback risk, sellers are advised to contact unsigned buyers through email or SMS to verify that the buyer really owns the Zelle account specified in Bisq. +payment.clearXchange.info=Zelle ist ein Geldtransferdienst, der am besten *durch* eine andere Bank funktioniert.\n\n1. Sehen Sie auf dieser Seite nach, ob (und wie) Ihre Bank mit Zelle zusammenarbeitet:\nhttps://www.zellepay.com/get-started\n\n2. Achten Sie besonders auf Ihre Überweisungslimits - die Sendelimits variieren je nach Bank, und die Banken geben oft separate Tages-, Wochen- und Monatslimits an.\n\n3. Wenn Ihre Bank nicht mit Zelle zusammenarbeitet, können Sie sie trotzdem über die Zelle Mobile App benutzen, aber Ihre Überweisungslimits werden viel niedriger sein.\n\n4. Der auf Ihrem Bisq-Konto angegebene Name MUSS mit dem Namen auf Ihrem Zelle/Bankkonto übereinstimmen. \n\nWenn Sie eine Zelle Transaktion nicht wie in Ihrem Handelsvertrag angegeben durchführen können, verlieren Sie möglicherweise einen Teil (oder die gesamte) Kaution.\n\nWegen des etwas höheren Chargeback-Risikos von Zelle wird Verkäufern empfohlen, nicht unterzeichnete Käufer per E-Mail oder SMS zu kontaktieren, um zu überprüfen, ob der Käufer wirklich das in Bisq angegebene Zelle-Konto besitzt. payment.fasterPayments.newRequirements.info=Einige Banken haben damit begonnen, den vollständigen Namen des Empfängers für Faster Payments Überweisungen zu überprüfen. Ihr aktuelles Faster Payments-Konto gibt keinen vollständigen Namen an.\n\nBitte erwägen Sie, Ihr Faster Payments-Konto in Bisq neu einzurichten, um zukünftigen {0} Käufern einen vollständigen Namen zu geben.\n\nWenn Sie das Konto neu erstellen, stellen Sie sicher, dass Sie die genaue Bankleitzahl, Kontonummer und die "Salt"-Werte für die Altersverifikation von Ihrem alten Konto auf Ihr neues Konto kopieren. Dadurch wird sichergestellt, dass das Alter und der Unterschriftsstatus Ihres bestehenden Kontos erhalten bleiben. payment.moneyGram.info=Wenn MoneyGram verwendet wird, muss der BTC Käufer die MoneyGram und ein Foto der Quittung per E-Mail an den BTC-Verkäufer senden. Die Quittung muss den vollständigen Namen, das Land, das Bundesland des Verkäufers und den Betrag deutlich zeigen. Der Käufer bekommt die E-Mail-Adresse des Verkäufers im Handelsprozess angezeigt. payment.westernUnion.info=Wenn Western Union verwendet wird, muss der BTC Käufer die MTCN (Tracking-Nummer) und ein Foto der Quittung per E-Mail an den BTC-Verkäufer senden. Die Quittung muss den vollständigen Namen, die Stadt, das Land des Verkäufers und den Betrag deutlich zeigen. Der Käufer bekommt die E-Mail-Adresse des Verkäufers im Handelsprozess angezeigt. payment.halCash.info=Bei Verwendung von HalCash muss der BTC-Käufer dem BTC-Verkäufer den HalCash-Code per SMS vom Mobiltelefon senden.\n\nBitte achten Sie darauf, dass Sie den maximalen Betrag, den Sie bei Ihrer Bank mit HalCash versenden dürfen, nicht überschreiten. Der Mindestbetrag pro Auszahlung beträgt 10 EUR und der Höchstbetrag 600 EUR. Bei wiederholten Abhebungen sind es 3000 EUR pro Empfänger pro Tag und 6000 EUR pro Empfänger pro Monat. Bitte überprüfen Sie diese Limits bei Ihrer Bank, um sicherzustellen, dass sie die gleichen Limits wie hier angegeben verwenden.\n\nDer Auszahlungsbetrag muss ein Vielfaches von 10 EUR betragen, da Sie keine anderen Beträge an einem Geldautomaten abheben können. Die Benutzeroberfläche beim Erstellen und Annehmen eines Angebots passt den BTC-Betrag so an, dass der EUR-Betrag korrekt ist. Sie können keinen marktbasierten Preis verwenden, da sich der EUR-Betrag bei sich ändernden Preisen ändern würde.\n\nIm Streitfall muss der BTC-Käufer den Nachweis erbringen, dass er die EUR geschickt hat. -payment.limits.info=Please be aware that all bank transfers carry a certain amount of chargeback risk.\n\nTo mitigate this risk, Bisq sets per-trade limits based on two factors:\n\n1. The estimated level of chargeback risk for the payment method used\n2. The age of your account for that payment method\n\nThe account you are creating now is new and its age is zero. As your account ages, your per-trade limits will grow:\n\n● During the 1st month, your per-trade limit will be {0}\n● During the 2nd month, your per-trade limit will be {1}\n● After the 2nd month, your per-trade limit will be {2}\n\nPlease note: limits only apply to trade size. You can place as many trades as you like. -payment.limits.info.withSigning=To limit chargeback risk, Bisq sets per-trade limits for this payment account type based on the following 2 factors:\n\n1. General chargeback risk for the payment method\n2. Account signing status\n\nThis payment account is not yet signed, so it is limited to buying {0} per trade. After signing, buy limits will increase as follows:\n\n● Before signing, and for 30 days after signing, your per-trade buy limit will be {0}\n● 30 days after signing, your per-trade buy limit will be {1}\n● 60 days after signing, your per-trade buy limit will be {2}\n\nSell limits are not affected by account signing, and increase with account age.\n\nSee more:\nhttps://bisq.wiki/Account_limits\n\nPlease note: limits only apply to trade size. You can place as many trades as you like. +payment.limits.info=Bitte beachten Sie, dass alle Banküberweisungen mit einem gewissen Rückbuchungsrisiko verbunden sind.\n\nUm dieses Risiko zu mindern, setzt Bisq Limits pro Trade fest, die auf zwei Faktoren basieren:\n\n1. Die geschätzte Höhe des Rückbuchungsrisikos für die verwendete Zahlungsmethode\n2. Das Alter Ihres Kontos für diese Zahlungsmethode\n\nDas Konto, das Sie jetzt anlegen, ist neu und sein Alter ist Null. Wenn Ihr Konto altert, werden die Limits pro Trade erhöht:\n\n● Während des 1. Monats wird Ihr Limit pro Trade {0} betragen\n● Während des 2. Monats wird Ihr Limit pro Trade {1} betragen\n● Nach dem 2. Monat wird Ihr Limit pro Trade {2} betragen\n\nBitte beachten Sie: Die Beschränkungen gelten nur für die Trade-Größe. Sie können so viele Trades platzieren, wie Sie möchten. +payment.limits.info.withSigning=Um das Rückbuchungsrisiko zu begrenzen, setzt Bisq für diesen Zahlungskontotyp Limits pro Trade auf der Grundlage der folgenden 2 Faktoren fest:\n\n1. Allgemeines Rückbuchungsrisiko für die Zahlungsmethode\n2. Status der Kontounterzeichnung\n\nDieses Zahlungskonto ist noch nicht unterzeichnet, so dass es auf den Kauf von {0} pro Trade beschränkt ist. Nach der Unterzeichnung werden die Kauflimits wie folgt erhöht:\n\n● Vor der Unterzeichnung und für 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {0}\n● 30 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {1}\n● 60 Tage nach der Unterzeichnung beträgt Ihr Kauflimit pro Trade {2}\n\nVerkaufslimits sind von der Kontounterzeichnung nicht betroffen und erhöhen sich mit dem Alter des Kontos.\n\nSiehe mehr:\nhttps://bisq.wiki/Account_limits\n\n\nBitte beachten Sie: Die Beschränkungen gelten nur für die Trade-Größe. Sie können so viele Trades platzieren, wie Sie möchten. payment.cashDeposit.info=Bitte bestätigen Sie, dass Ihre Bank Bareinzahlungen in Konten von anderen Personen erlaubt. Zum Beispiel werden diese Einzahlungen bei der Bank of America und Wells Fargo nicht mehr erlaubt. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 2b816737fc1..f1296160c31 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -1153,6 +1153,7 @@ account.password.info=Con protección por contraseña necesitará introducir su account.seed.backup.title=Copia de seguridad de palabras semilla del monedero account.seed.info=Por favor apunte en un papel tanto las palabras semilla del monedero como la fecha! Puede recuperar su monedero en cualquier momento con las palabras semilla y la fecha.\nLas mismas palabras semilla se usan para el monedero BTC como BSQ\n\nDebe apuntar las palabras semillas en una hoja de papel. No la guarde en su computadora.\n\nPor favor, tenga en cuenta que las palabras semilla no son un sustituto de la copia de seguridad.\nNecesita hacer la copia de seguridad de todo el directorio de aplicación en la pantalla \"Cuenta/Copia de Seguridad\" para recuperar un estado de aplicación válido y los datos.\nImportar las palabras semilla solo se recomienda para casos de emergencia. La aplicación no será funcional sin una buena copia de seguridad de los archivos de la base de datos y las claves! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=No ha establecido una contraseña de cartera que proteja la visualización de las palabras semilla.\n\n¿Quiere que se muestren las palabras semilla? account.seed.warn.noPw.yes=Sí, y no preguntar de nuevo account.seed.enterPw=Introducir contraseña para ver las palabras semilla diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index dac0d8a1065..f8766b6743e 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -1153,6 +1153,7 @@ account.password.info=با محافظت رمزعبوری شما باید با ه account.seed.backup.title=پشتیبان گیری از کلمات رمز خصوصی کیف های پول شما account.seed.info=لطفا هم کلمات seed و هم تاریخ را یادداشت کنید! شما هر زمانی که بخواهید می‌توانید کیف‌پولتان را با استفاده از کلمات seed و تاریخ بازیابی کنید.\nهمین کلمات seed برای کیف‌پول‌های BTC و BSQ هم استفاده می‌شود.\n\nشما باید کلمات seed را روی یک برگ کاغذ یادداشت کنید. آنها را روی کامپیوتر خودتان ذخیره نکنید.\n\nلطفا توجه کنید که کلمات seed جایگزینی برای یک پشتیبان نیستند.\nبرای بازیابی وضعیت و داده‌های برنامه باید از طریق صفحه \"Account/Backup\" از کل پوشه برنامه پشتیبان بسازید.\nوارد کردن کلمات seed فقط در موارد اورژانسی توصیه می‌شود. برنامه بدون پشتیبان از پایگاه داده و کلیدهای مناسب درست عمل نخواهد کرد! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=شما یک رمز عبور کیف پول تنظیم نکرده اید که از نمایش کلمات رمز خصوصی محافظت کند.\n\nآیا می خواهید کلمات رمز خصوصی نشان داده شود؟ account.seed.warn.noPw.yes=بلی، و دوباره از من نپرس account.seed.enterPw=وارد کردن رمز عبور به منظور مشاهده ی کلمات رمز خصوصی diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 262436a4828..38718e50fb2 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -1153,6 +1153,7 @@ account.password.info=Avec la protection par mot de passe, vous devrez entrer vo account.seed.backup.title=Sauvegarder les mots composant la seed de votre portefeuille account.seed.info=Veuillez noter les mots de la seed du portefeuille ainsi que la date! Vous pouvez récupérer votre portefeuille à tout moment avec les mots de la seed et la date.\nLes mêmes mots-clés de la seed sont utilisés pour les portefeuilles BTC et BSQ.\n\nVous devriez écrire les mots de la seed sur une feuille de papier. Ne les enregistrez pas sur votre ordinateur.\n\nVeuillez noter que les mots de la seed ne remplacent PAS une sauvegarde.\nVous devez créer une sauvegarde de l'intégralité du répertoire de l'application à partir de l'écran \"Compte/Sauvergarde\" pour restaurer correctement les données de l'application.\nL'importation de mots de la seed n'est recommandée qu'en cas d'urgence. L'application ne sera pas fonctionnelle sans une sauvegarde adéquate des fichiers et des clés de la base de données ! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Vous n'avez pas configuré un mot de passe de portefeuille qui protégerait l'affichage des mots composant la seed.\n\nVoulez-vous afficher les mots composant la seed? account.seed.warn.noPw.yes=Oui, et ne me le demander plus à l'avenir account.seed.enterPw=Entrer le mot de passe afficher les mots composant la seed diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 9e38e3e7843..d9dd35c9e1c 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -1153,6 +1153,7 @@ account.password.info=パスワード保護を使用すると、アプリケー account.seed.backup.title=あなたのウォレットのシードワードをバックアップ account.seed.info=ウォレットのシードワードと日付の両方を書き留めてください！あなたはシードワードと日付でいつでもウォレットを復元することができます。\nBTCおよびBSQウォレットには同じシードワードが使用されています。\n\nあなたは一枚の紙にシードワードを書き留めるべきです。コンピュータに保存しないでください。\n\nシードワードはバックアップの代わりにはならないことに気をつけて下さい。\nアプリケーションの状態とデータを復元するには「アカウント/バックアップ」画面からアプリケーションディレクトリ全体のバックアップを作成する必要があります。\nシードワードのインポートは緊急の場合にのみ推奨されます。データベースファイルとキーの適切なバックアップがなければ、アプリケーションは機能しません！ +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=シードワードの表示を保護するためのウォレットパスワードを設定していません。 \n\nシードワードを表示しますか？ account.seed.warn.noPw.yes=はい、そして次回から確認しないで下さい account.seed.enterPw=シードワードを見るためにパスワードを入力 diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index bfa8060ea9f..257fe648bbc 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -1153,6 +1153,7 @@ account.password.info=Ao proteger a carteira com uma senha, você precisará dig account.seed.backup.title=Fazer backup das palavras-semente da carteira account.seed.info=Por favor, anote em um papel a data e as palavras-semente da carteira! Com essas informações, você poderá recuperar sua carteira à qualquer momento.\nA semente exibida é usada tanto para a carteira BTC quanto para a carteira BSQ.\n\nVocê deve anotá-las em uma folha de papel. Jamais anote as palavras em um arquivo no seu computador ou em seu e-mail.\n\nNote que a semente da carteira NÃO substitui um backup.\nPara fazer isso, você precisa fazer backup da pasta do Bisq na seção \"Conta/Backup\".\nA importação da semente da carteira só é recomendada em casos de emergência. O programa não funcionará corretamente se você não recuperá-lo através de um backup! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Você não definiu uma senha para carteira, que protegeria a exibição das palavras-semente.\n\nGostaria de exibir as palavras-semente? account.seed.warn.noPw.yes=Sim, e não me pergunte novamente account.seed.enterPw=Digite a senha para ver a semente da carteira diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index a45e9018492..9166fc33431 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -1153,6 +1153,7 @@ account.password.info=Com a proteção por senha, você precisará inserir a sua account.seed.backup.title=Fazer backup das palavras semente da sua carteira account.seed.info=Por favor, anote as palavras-semente da carteira e a data! Você pode recuperar sua carteira a qualquer momento com palavras-semente e a data.\nAs mesmas palavras-semente são usadas para a carteira BTC e BSQ.\n\nVocê deve anotar as palavras-semente numa folha de papel. Não as guarde no seu computador.\n\nPor favor, note que as palavras-semente não são um substituto para um backup.\nVocê precisa criar um backup de todo o diretório do programa a partir do ecrã \"Conta/Backup\" para recuperar o estado e os dados do programa.\nA importação de palavras-semente é recomendada apenas para casos de emergência. O programa não será funcional sem um backup adequado dos arquivos da base de dados e das chaves! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Você não definiu uma senha da carteira que protegeria a exibição das palavras-semente.\n\nVocê quer exibir as palavras-semente? account.seed.warn.noPw.yes=Sim, e não me pergunte novamente account.seed.enterPw=Digite a senha para ver palavras-semente diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 417b0ae9cc0..f3905eb3dad 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -1153,6 +1153,7 @@ account.password.info=При использовании пароля его не account.seed.backup.title=Сохраните мнемоническую фразу для вашего кошелька account.seed.info=Запишите мнемоническую фразу для кошелька и дату создания его! Используя эти данные, вы сможете восстановить ваш кошелёк когда угодно.\nДля обоих кошельков, BTC и BSQ, используется одна и та же мнемоническая фраза.\n\nВам следует записать её на бумаге и не хранить на компьютере.\n\nМнемоническая фраза НЕ заменяет резервную копию.\nВам следует сделать резервную копию всего каталога приложения в разделе \«Счёт/Резервное копирование\» для восстановления состояния приложения и данных.\nИмпорт мнемонической фразы рекомендуется только в экстренных случаях. Приложение не будет функционировать должным образом без наличия резервной копии файлов базы данных и ключей! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Вы не установили пароль от кошелька для защиты мнемонической фразы.\n\nОтобразить мнемоническую фразу на экране? account.seed.warn.noPw.yes=Да и не спрашивать снова account.seed.enterPw=Введите пароль, чтобы увидеть мнемоническую фразу diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index fe558e019cd..9501ebe4792 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -1153,6 +1153,7 @@ account.password.info=ด้วยระบบป้องกันรหัส account.seed.backup.title=สำรองข้อมูล wallet โค้ดของคุณ account.seed.info=โปรดเขียนรหัสสำรองข้อมูล wallet และวันที่! คุณสามารถกู้ข้อมูล wallet ของคุณได้ทุกเมื่อด้วย รหัสสำรองข้อมูล wallet และวันที่\nรหัสสำรองข้อมูล ใช้ทั้ง BTC และ BSQ wallet\n\nคุณควรเขียนรหัสสำรองข้อมูล wallet ลงบนแผ่นกระดาษและไม่บันทึกไว้ในคอมพิวเตอร์ของคุณ\n\nโปรดทราบว่า รหัสสำรองข้อมูล wallet ไม่ได้แทนการสำรองข้อมูล\nคุณจำเป็นต้องสำรองข้อมูลสารบบแอ็พพลิเคชั่นทั้งหมดที่หน้าจอ \"บัญชี / การสำรองข้อมูล \" เพื่อกู้คืนสถานะแอ็พพลิเคชั่นและข้อมูลที่ถูกต้อง\nการนำเข้ารหัสสำรองข้อมูล wallet เป็นคำแนะนำเฉพาะสำหรับกรณีฉุกเฉินเท่านั้น แอพพลิเคชั่นจะไม่สามารถใช้งานได้หากไม่มีไฟล์สำรองฐานข้อมูลและคีย์ที่ถูกต้อง! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=คุณยังไม่ได้ตั้งรหัสผ่าน wallet ซึ่งจะช่วยป้องกันการแสดงผลของรหัสสำรองข้อมูล wallet \n\nคุณต้องการแสดงรหัสสำรองข้อมูล wallet หรือไม่ account.seed.warn.noPw.yes=ใช่ และไม่ต้องถามฉันอีก account.seed.enterPw=ป้อนรหัสผ่านเพื่อดูรหัสสำรองข้อมูล wallet diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 81d542a92f1..0848a9a20b4 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -1153,6 +1153,7 @@ account.password.info=Bằng cách bảo vệ với mật khẩu, bạn cần nh account.seed.backup.title=Sao lưu dự phòng từ khởi tạo ví của bạn account.seed.info=Hãy viết ra từ khởi tạo ví của bạn và ngày! Bạn có thể khôi phục ví của bạn bất cứ lúc nào với các từ khởi tạo và ngày này.\nTừ khởi tạo được sử dụng chung cho cả ví BTC và BSQ.\n\nBạn nên viết các từ khởi tạo ra tờ giấy. Không được lưu trên máy tính.\n\nLưu ý rằng từ khởi tạo KHÔNG PHẢI là phương án thay thế cho sao lưu dự phòng.\nBạn cần sao lưu dự phòng toàn bộ thư mục của ứng dụng tại màn hình \"Tài khoản/Sao lưu dự phòng\" để khôi phục trạng thái và dữ liệu ứng dụng.\nNhập từ khởi tạo chỉ được thực hiện trong tình huống khẩn cấp. Ứng dụng sẽ không hoạt động mà không có dự phòng các file dữ liệu và khóa phù hợp! +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=Bạn đã tạo mật khẩu ví để bảo vệ tránh hiển thị Seed words.\n\nBạn có muốn hiển thị Seed words? account.seed.warn.noPw.yes=Có và không hỏi lại account.seed.enterPw=Nhập mật khẩu để xem seed words diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 68839ccf30e..41e1afb010a 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -1153,6 +1153,7 @@ account.password.info=使用密码保护，您需要在将比特币从钱包中 account.seed.backup.title=备份您的钱包还原密钥 account.seed.info=请写下钱包还原密钥和时间！\n您可以通过还原密钥和时间在任何时候恢复您的钱包。\n还原密钥用于 BTC 和 BSQ 钱包。\n\n您应该在一张纸上写下还原密钥并且不要保存它们在您的电脑上。\n请注意还原密钥并不能代替备份。\n您需要备份完整的应用程序目录在”账户/备份“界面去恢复有效的应用程序状态和数据。 +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=您还没有设置一个可以保护还原密钥显示的钱包密码。\n\n要显示还原密钥吗？ account.seed.warn.noPw.yes=是的，不要再问我 account.seed.enterPw=输入密码查看还原密钥 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 560346abb4a..7ecced8354f 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -1153,6 +1153,7 @@ account.password.info=使用密碼保護，您需要在將比特幣從錢包中 account.seed.backup.title=備份您的錢包還原金鑰 account.seed.info=請寫下錢包還原金鑰和時間！\n您可以通過還原金鑰和時間在任何時候恢復您的錢包。\n還原金鑰用於 BTC 和 BSQ 錢包。\n\n您應該在一張紙上寫下還原金鑰並且不要儲存它們在您的電腦上。\n請注意還原金鑰並不能代替備份。\n您需要備份完整的應用程式目錄在”賬戶/備份“介面去恢復有效的應用程式狀態和資料。 +account.seed.backup.warning=Please note that the seed words are NOT a replacement for a backup.\nYou need to create a backup of the whole application directory from the \"Account/Backup\" screen to recover application state and data.\nImporting seed words is only recommended for emergency cases. The application will not be functional without a proper backup of the database files and keys!\n\nSee the wiki page https://bisq.wiki/Backing_up_application_data for extended info. account.seed.warn.noPw.msg=您還沒有設定一個可以保護還原金鑰顯示的錢包密碼。\n\n要顯示還原金鑰嗎？ account.seed.warn.noPw.yes=是的，不要再問我 account.seed.enterPw=輸入密碼檢視還原金鑰 From b222046fd6e69aeae63c8009d46f2b90f93e918c Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 1 Aug 2020 03:39:25 +0900 Subject: [PATCH 3/6] Tweak popup text and trade rules for USPMO payment method Co-Authored-By: Steve Jain --- .../main/resources/i18n/displayStrings.properties | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index a6a1154e785..85aaeb422b6 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3117,12 +3117,15 @@ payment.cashDeposit.info=Please confirm your bank allows you to send cash deposi payment.revolut.info=Please be sure that the phone number you used for your Revolut account is registered at Revolut \ otherwise the BTC buyer cannot send you the funds. -payment.usPostalMoneyOrder.info=Money orders are one of the more private fiat purchase methods available on Bisq.\n\n\ - However, please be aware of potentially increased risks associated with their use. Bisq will not bear any \ - responsibility in case a sent money order is stolen, and the mediator or arbitrator will in such cases award the BTC \ - to the sender of the money order, provided they can produce tracking information and receipts. \ - It may be advisable for the sender to write the BTC seller's name on the money order, in order to minimize the \ - risk that the money order is cashed by someone else. +payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\ +\n\ +- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n\ +- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\ +\n\ +In the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Bisq mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\n\ +Failure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\n\ +In all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\n\ +If you do not understand these requirements, do not trade using USPMO on Bisq. payment.f2f.contact=Contact info payment.f2f.contact.prompt=How you want to get contacted by the trading peer? (email address, phone number,...) From 780f42573872a5f4242b45f54042e841c3c8abe6 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 1 Aug 2020 22:49:32 +0900 Subject: [PATCH 4/6] Remove pricenode gztmprecgqjq64zh.onion operated by @wiz --- core/src/main/java/bisq/core/provider/ProvidersRepository.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/provider/ProvidersRepository.java b/core/src/main/java/bisq/core/provider/ProvidersRepository.java index ff0cf31fd52..2d46f9c5c22 100644 --- a/core/src/main/java/bisq/core/provider/ProvidersRepository.java +++ b/core/src/main/java/bisq/core/provider/ProvidersRepository.java @@ -39,8 +39,7 @@ public class ProvidersRepository { "http://xc3nh4juf2hshy7e.onion/", // @emzy "http://ceaanhbvluug4we6.onion/", // @mrosseel "http://44mgyoe2b6oqiytt.onion/", // @devinbileck - "http://62nvujg5iou3vu3i.onion/", // @alexej996 - "http://gztmprecgqjq64zh.onion/" // @wiz + "http://62nvujg5iou3vu3i.onion/" // @alexej996 ); private final Config config; From 2f06a941719112bb54f986697fd8811d0d04b4b2 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Sun, 2 Aug 2020 10:44:24 +0200 Subject: [PATCH 5/6] Update bitcoinj checkpoints for v1.3.7 --- core/src/main/resources/wallet/checkpoints.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/wallet/checkpoints.txt b/core/src/main/resources/wallet/checkpoints.txt index b216d6f3352..99bb07622a8 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 -315 +317 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G @@ -316,3 +316,5 @@ DyhWrFlPqEc/c9+uAAmZAAAgACDcrvMMuRSy9GQxh8BFNt6wIDWYhvU4EQAAAAAAAAAAABVOP5QKoWx9 D5uvExILinkBRJMsAAmg4ADg/yfO2pclcPlRE5XVKCPZeF63mn30v+yHDgAAAAAAAAAAAPaDA4g+h9tjjVWtJ587WMHb07Mcfa1BoDJCANQd+z94wJDEXvaXEhf5l8cN EAgacoNqeblmwryDAAmowAAAACBrw4jKPLZgZpVWF50edwCXFDSCydrEBwAAAAAAAAAAAJzD7FqR8uJdE2JDv+AVjncVcclu70I3QzG/aH2H/bHffOnYXjV/FBdyiZsc EGp3iH6JaGGCuz8LAAmwoAAAQCAgBboCfncZ/s4WkKcsLjW+V4vlPQoDAwAAAAAAAAAAALs0nxXJbP7VZ+Fc3dhRpL6RN6QfYphMw8iCNdqEKGL6e/joXvLUERcyQVAj +ENuF9IkxgIodMy/3AAm4gAAAACCTOuNmt+7x2vxFMkHRbDxRElZiABP9DAAAAAAAAAAAAAERAwV0KNK6qPCLxwDpQCkrbHi2jFc/Kldv0N5pJMkE+XP7XhnVERet5rYy +EUyU1REypM3OngUzAAnAYAAAgCB898coFK4fvpBHu54gmeu1eEuspbAwCAAAAAAAAAAAAHQ93L5j0nbFj5FI6biHU0sUuxN+qzGCaK4mc2P3nQYZpEoMXxU6EBeWCMCJ From ff795ba648c06ef9eb3df472c94cc08fd4afd881 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Sun, 2 Aug 2020 11:01:54 +0200 Subject: [PATCH 6/6] Update data stores for v1.3.7 --- p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/DaoStateStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET | 4 ++-- p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET index df1496ea743..9fd395ea388 100644 --- a/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET +++ b/p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66465857e4922ac59f1ce574bc6eec0f9766b8b0d45ad29c0c1b3a183f46e333 -size 1767441 +oid sha256:54e87ad4ca9e79fff6da1dbdc7f3b1af069e1b43cdcbac388a043bbafd155e64 +size 1825752 diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET index 8d1ff4803c9..ab160e8b201 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:40204f9ff479d4542fc6fe2ac37eaeff806fc2142a98f6a4b633c2099bf84422 -size 71972549 +oid sha256:da8eb98c10af8c9a99a54cac6304fd68d6ff5f90604347f5a5825cf56c4e7533 +size 76161888 diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET index 76c9e516211..6760f74d3ef 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:6eab2bf4bbe491edd713ec42986b0901755aa1ffc0b241fce386e5b0345a0a7a -size 2610307 +oid sha256:3c951d95fb1d9fc6ba7e0d26bc94b12533c44ad12782705779df00d617b00d1f +size 3191819 diff --git a/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET index 6528ae06438..7207f792e35 100644 --- a/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET +++ b/p2p/src/main/resources/TradeStatistics2Store_BTC_MAINNET @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed554c233bf0147aff10ae2edd2bd6ef0b99fe50a14d7cc3b09f8fc33e4aa08c -size 14383213 +oid sha256:5688976d2b682c32e7404138312cc86472050e6c1c77fdfa92d99410efea3468 +size 14981277