mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 06:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add new strings. Cleanup.

Browse source
This commit is contained in:
Manfred Karrer 2018-01-26 22:25:03 -05:00
parent af855f2326
commit b220c1a6e2
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/resources/i18n/displayStrings.properties
View file

@ -828,8 +828,7 @@ settings.net.reSyncSPVSuccess=The SPV chain file has been deleted. You need to r
After the restart it can take a while for resyncing with the network and you will only see all transactions once the resync is completed.\n\nPlease make another restart after the resync has completed because there are sometimes inconsistencies leading to incorrect balance display.
settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please have patience, it can take a while when resyncing with the network.
settings.net.reSyncSPVAfterRestartCompleted=The resync is now completed. Please restart the application.
settings.net.reSyncSPVFailed=Could not delete SPV chain file.
settings.net.reSyncSPVFailed=Could not delete SPV chain file.\nError: {0}
setting.about.aboutBisq=About Bisq
setting.about.about=Bisq is an open source project and a decentralized network of users who want to exchange Bitcoin with national currencies or alternative crypto currencies in a privacy protecting way. Learn more about Bisq on our project web page.
setting.about.web=Bisq web page
@ -1286,6 +1285,7 @@ popup.error.createTx=Error at creating transaction: {0}
popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
error.spvFileCorrupted=An error occurred when reading the SPV chain file.\nIt might be that the SPV chain file is corrupted.\n\nError message: {0}\n\nDo you want to delete it and start a resync?
error.deleteAddressEntryListFailed=Could not delete AddressEntryList file.\nError: {0}
popup.warning.walletNotInitialized=The wallet is not initialized yet
popup.warning.wrongVersion=You probably have the wrong Bisq version for this computer.\n\

2
core/src/main/java/io/bisq/core/btc/AddressEntryList.java
View file

@ -89,7 +89,7 @@ public final class AddressEntryList implements PersistableEnvelope, PersistedDat
this.wallet = wallet;
if (list != null) {
list.stream().forEach(addressEntry -> {
list.forEach(addressEntry -> {
DeterministicKey keyFromPubHash = (DeterministicKey) wallet.findKeyFromPubHash(addressEntry.getPubKeyHash());
if (keyFromPubHash != null) {
addressEntry.setDeterministicKey(keyFromPubHash);

3
gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java
View file

@ -69,7 +69,8 @@ import static javafx.beans.binding.Bindings.createBooleanBinding;
@Slf4j
public class WalletPasswordWindow extends Overlay<WalletPasswordWindow> {
private final WalletsManager walletsManager;
private final File storageDir;
private File storageDir;
private Button unlockButton;
private AesKeyHandler aesKeyHandler;
private PasswordTextField passwordTextField;