Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.8.2 #5993

Merged
merged 15 commits into from Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -461,7 +461,7 @@ configure(project(':desktop')) {
modules = ['javafx.controls', 'javafx.fxml']
}

version = '1.8.0-SNAPSHOT'
version = '1.8.2-SNAPSHOT'

jar.manifest.attributes(
"Implementation-Title": project.name,
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/bisq/common/app/Version.java
Expand Up @@ -30,15 +30,15 @@ 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.8.0";
public static final String VERSION = "1.8.2";

/**
* Holds a list of the tagged resource files for optimizing the getData requests.
* This must not contain each version but only those where we add new version-tagged resource files for
* historical data stores.
*/
public static final List<String> 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.6.5", "1.7.2", "1.7.4", "1.8.0");
"1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1");

public static int getMajorVersion(String version) {
return getSubVersion(version, 0);
Expand Down
Expand Up @@ -25,7 +25,6 @@
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OfferRestrictions;
import bisq.core.payment.AssetAccount;
import bisq.core.payment.ChargeBackRisk;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
Expand Down Expand Up @@ -228,7 +227,7 @@ private void onBootStrapped() {
private void republishAllFiatAccounts() {
if (user.getPaymentAccounts() != null)
user.getPaymentAccounts().stream()
.filter(account -> !(account instanceof AssetAccount))
.filter(account -> account.getPaymentMethod().isFiat())
.forEach(account -> {
AccountAgeWitness myWitness = getMyWitness(account.getPaymentAccountPayload());
// We only publish if the date of our witness is inside the date tolerance.
Expand Down
21 changes: 14 additions & 7 deletions core/src/main/resources/i18n/displayStrings.properties
Expand Up @@ -193,7 +193,6 @@ shared.tradeWalletBalance=Trade wallet balance
shared.makerTxFee=Maker: {0}
shared.takerTxFee=Taker: {0}
shared.iConfirm=I confirm
shared.tradingFeeInBsqInfo=≈ {0}
shared.openURL=Open {0}
shared.fiat=Fiat
shared.crypto=Crypto
Expand All @@ -208,8 +207,6 @@ shared.new=NEW
shared.blindVoteTxId=Blind vote transaction ID
shared.proposal=Proposal
shared.votes=Votes
shared.learnMore=Learn more
shared.dismiss=Dismiss
shared.selectedArbitrator=Selected arbitrator
shared.selectedMediator=Selected mediator
shared.selectedRefundAgent=Selected arbitrator
Expand Down Expand Up @@ -351,7 +348,6 @@ offerbook.filterByCurrency=Filter by currency
offerbook.filterByPaymentMethod=Filter by payment method
offerbook.matchingOffers=Offers matching my accounts
offerbook.timeSinceSigning=Account info
offerbook.timeSinceSigning.info=This account was verified and {0}
offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts
offerbook.timeSinceSigning.info.peer=signed by a peer, waiting %d days for limits to be lifted
offerbook.timeSinceSigning.info.peerLimitLifted=signed by a peer and limits were lifted
Expand All @@ -374,8 +370,6 @@ offerbook.timeSinceSigning.help=When you successfully complete a trade with a pe
offerbook.timeSinceSigning.notSigned=Not signed yet
offerbook.timeSinceSigning.notSigned.ageDays={0} days
offerbook.timeSinceSigning.notSigned.noNeed=N/A
shared.notSigned=This account has not been signed yet and was created {0} days ago
shared.notSigned.noNeed=This account type does not require signing
shared.notSigned.noNeedDays=This account type does not require signing and was created {0} days ago
shared.notSigned.noNeedAlts=Altcoin accounts do not feature signing or aging

Expand Down Expand Up @@ -3340,7 +3334,6 @@ password.passwordsDoNotMatch=The 2 passwords you entered don't match.
password.forgotPassword=Forgot password?
password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\
It is highly recommended that you make a backup of the application directory and write down your seed words before setting a password!
password.backupWasDone=I have already made a backup
password.setPassword=Set Password (I already made a backup)
password.makeBackup=Make Backup

Expand Down Expand Up @@ -3420,19 +3413,33 @@ payment.upi.virtualPaymentAddress=Virtual Payment Address

# suppress inspection "UnusedProperty"
payment.swift.headline=International SWIFT Wire Transfer
# suppress inspection "UnusedProperty"
payment.swift.title.bank=Receiving Bank
# suppress inspection "UnusedProperty"
payment.swift.title.intermediary=Intermediary Bank (click to expand)
# suppress inspection "UnusedProperty"
payment.swift.country.bank=Receiving Bank Country
# suppress inspection "UnusedProperty"
payment.swift.country.intermediary=Intermediary Bank Country
# suppress inspection "UnusedProperty"
payment.swift.swiftCode.bank=Receiving Bank SWIFT Code
# suppress inspection "UnusedProperty"
payment.swift.swiftCode.intermediary=Intermediary Bank SWIFT Code
# suppress inspection "UnusedProperty"
payment.swift.name.bank=Receiving Bank name
# suppress inspection "UnusedProperty"
payment.swift.name.intermediary=Intermediary Bank name
# suppress inspection "UnusedProperty"
payment.swift.branch.bank=Receiving Bank branch
# suppress inspection "UnusedProperty"
payment.swift.branch.intermediary=Intermediary Bank branch
# suppress inspection "UnusedProperty"
payment.swift.address.bank=Receiving Bank address
# suppress inspection "UnusedProperty"
payment.swift.address.intermediary=Intermediary Bank address
# suppress inspection "UnusedProperty"
payment.swift.address.beneficiary=Beneficiary address
# suppress inspection "UnusedProperty"
payment.swift.phone.beneficiary=Beneficiary phone number
payment.swift.account=Account No. (or IBAN)
payment.swift.use.intermediary=Use Intermediary Bank
Expand Down
10 changes: 6 additions & 4 deletions core/src/main/resources/i18n/displayStrings_cs.properties
Expand Up @@ -97,6 +97,7 @@ shared.BTCMinMax=BTC (min - max)
shared.removeOffer=Odstranit nabídku
shared.dontRemoveOffer=Neodstraňovat nabídku
shared.editOffer=Upravit nabídku
shared.duplicateOffer=Duplikovat nabídku
shared.openLargeQRWindow=Otevřít velké okno s QR kódem
shared.tradingAccount=Obchodní účet
shared.faq=Navštívit stránku FAQ
Expand Down Expand Up @@ -394,7 +395,7 @@ offerbook.removeOffer.success=Odebrání nabídky bylo úspěšné.
offerbook.removeOffer.failed=Odebrání nabídky selhalo:\n{0}
offerbook.deactivateOffer.failed=Deaktivace nabídky se nezdařila:\n{0}
offerbook.activateOffer.failed=Zveřejnění nabídky se nezdařilo:\n{0}
offerbook.withdrawFundsHint=Prostředky, které jste zaplatili, můžete vybrat z obrazovky {0}.
offerbook.withdrawFundsHint=Offer has been removed. Funds are not reserved for this offer anymore. You can send Available funds to an external wallet at the {0} screen.

offerbook.warning.noTradingAccountForCurrency.headline=Žádný platební účet pro vybranou měnu
offerbook.warning.noTradingAccountForCurrency.msg=Pro vybranou měnu nemáte nastavený platební účet.\n\nChcete místo toho vytvořit nabídku pro jinou měnu?
Expand Down Expand Up @@ -536,7 +537,7 @@ takeOffer.success.info=Stav vašeho obchodu můžete vidět v \"Portfolio/Otevř
takeOffer.error.message=Při převzetí nabídky došlo k chybě.\n\n{0}

takeOffer.bsqSwap.success.headline=Váš swapový obchod BSQ je dokončen
takeOffer.bsqSwap.success.info=Until your trade is included in a block you can see your completed trade at \"Portfolio/Unconfirmed BSQ Swaps\"
takeOffer.bsqSwap.success.info=Dokud váš obchod nebude zahrnut v bitcoin bloku, můžete si svůj dokončený obchod prohlédnout na \"Portfolio/Nepotvrzené BSQ swapy\"

# new entries
takeOffer.takeOfferButton=Přehled: Využijte nabídku {0} bitcoin
Expand Down Expand Up @@ -2245,6 +2246,7 @@ filterWindow.disableApi=Deaktivovat API
filterWindow.disableMempoolValidation=Deaktivovat validaci mempoolu
filterWindow.disablePowMessage=Zakázat zprávy vyžadující Proof of Work
filterWindow.powDifficulty=Obtížnost Proof of work (BSQ swap nabídky)
filterWindow.enabledPowVersions=Povolené verze Proof of work (čísla oddělená čárkou)
filterWindow.makerFeeBtc=Min. BTC poplatek tvůrce (např. 0.001)
filterWindow.takerFeeBtc=Min. BTC poplatek příjemce (e.g. 0.007)
filterWindow.makerFeeBsq=Min. BTC poplatek tvůrce (e.g. 15.14)
Expand Down Expand Up @@ -2406,8 +2408,8 @@ popup.warning.notSufficientConnectionsToBtcNetwork=Musíte počkat, až budete m
popup.warning.downloadNotComplete=Musíte počkat, až bude stahování chybějících bitcoinových bloků kompletní.
popup.warning.chainNotSynced=Výška blockchainu peněženky Bisq není správně synchronizována. Pokud jste aplikaci spustili nedávno, počkejte, dokud nebude zveřejněn jeden blok bitcoinů.\n\nVýšku blockchainu můžete zkontrolovat v Nastavení/Informace o síti. Pokud projde více než jeden blok a tento problém přetrvává, asi být zastaven, v takovém případě byste měli provést SPV resynchonizaci. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]
popup.warning.daoNeedsResync=Bisq DAO stav musí být resynchronizován.\n\nProsím přejděte do menu \"Sledování DAO sítě\" a postupujte podle instrukcí, abyste stav DAO znovu resynchronizovali.
popup.warning.removeOffer=Opravdu chcete tuto nabídku odebrat?\nPokud tuto nabídku odstraníte, ztratí se poplatek tvůrce {0}.
popup.warning.removeNoFeeOffer=Are you sure you want to remove that offer?\nNo maker fee will be lost if you remove that offer.
popup.warning.removeOffer=Are you sure you want to remove this offer?\nThe maker fee of {0} will be lost if you remove this offer.
popup.warning.removeNoFeeOffer=Are you sure you want to remove this offer?\nNo maker fee will be lost if you remove this offer.
popup.warning.tooLargePercentageValue=Nelze nastavit procento 100% nebo větší.
popup.warning.examplePercentageValue=Zadejte procento jako číslo \"5.4\" pro 5.4%
popup.warning.noPriceFeedAvailable=Pro tuto měnu není k dispozici žádný zdroj cen. Nelze použít procentuální cenu.\nVyberte pevnou cenu.
Expand Down