mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect display strings

Browse source
This commit is contained in:
Manfred Karrer 2017-03-12 16:14:32 -05:00
parent 3b557463da
commit 9ff23016c8
4 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -836,12 +836,11 @@ the z-addresses (private), because the arbitrator would not be able to verify th
account.fiat.yourFiatAccounts=Your national currency\n\
accounts:
account.backup.title=Backup wallet and data directory
account.backup.title=Backup wallet
account.backup.location=Backup location:
account.backup.selectLocation=Select backup location
account.backup.backupNow=Backup now (backup is not encrypted!)
account.backup.openAppDir=Open data directory
account.backup.appDir=Application data directory:
account.backup.appDir=Application data directory
account.backup.openDirectory=Open directory
account.backup.success=Backup successfully saved at:\n{0}
account.backup.directoryNotAccessible=The directory you have chosen is not accessible. {0}

5
common/src/main/resources/i18n/displayStrings_de.properties
View file

@ -830,12 +830,11 @@ the z-addresses (private), because the arbitrator would not be able to verify th
account.fiat.yourFiatAccounts=Your national currency\naccounts:
account.backup.title=Backup wallet and data directory
account.backup.title=Backup wallet
account.backup.location=Backup location:
account.backup.selectLocation=Select backup location
account.backup.backupNow=Backup now (backup is not encrypted!)
account.backup.openAppDir=Open data directory
account.backup.appDir=Application data directory:
account.backup.appDir=Application data directory
account.backup.openDirectory=Open directory
account.backup.success=Backup successfully saved at:\n{0}
account.backup.directoryNotAccessible=The directory you have chosen is not accessible. {0}

8
gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java
View file

@ -85,13 +85,15 @@ public class BackupView extends ActivatableView<GridPane, Void> {
applyBackupDirectory(backUpLocationTextField.getText());
};
Tuple2<Button, Button> tuple2 = FormBuilder.add2ButtonsAfterGroup(root, ++gridRow, Res.get("account.backup.backupNow"), Res.get("account.backup.openAppDir"));
Tuple2<Button, Button> tuple2 = FormBuilder.add2ButtonsAfterGroup(root, ++gridRow,
Res.get("account.backup.selectLocation"), Res.get("account.backup.backupNow"));
selectBackupDir = tuple2.first;
backupNow = tuple2.second;
updateButtons();
FormBuilder.addTitledGroupBg(root, ++gridRow, 1, Res.get("account.backup.selectLocation"), Layout.GROUP_DISTANCE);
openDataDir = FormBuilder.addLabelButton(root, gridRow, Res.get("account.backup.appDir"), Res.get("account.backup.openDirectory"), Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
FormBuilder.addTitledGroupBg(root, ++gridRow, 1, Res.get("account.backup.appDir"), Layout.GROUP_DISTANCE);
openDataDir = FormBuilder.addLabelButton(root, gridRow, Res.getWithCol("account.backup.appDir"),
Res.get("account.backup.openDirectory"), Layout.FIRST_ROW_AND_GROUP_DISTANCE).second;
openDataDir.setDefaultButton(false);
}

27
network/src/main/java/io/bisq/p2p/seed/SeedNodesRepository.java
View file

@ -18,38 +18,13 @@ public class SeedNodesRepository {
// - testnet uses port 8001
// - regtest uses port 8002
private Set<NodeAddress> torSeedNodeAddresses = Sets.newHashSet(
// In alpha we change the network with new releases. That will be faded out once we become backwards compatible (Beta)
// We keep 1 seed node running for the last 2 mainnet versions, just in case a user has not updated and need to
// access still his his app
// mainnet
// v0.3.5, v0.3.6 (backwards compatible)
/*new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"),
new NodeAddress("3efgjjbdvhbvck3x.onion:8000"),
new NodeAddress("3unfcshgwipxhxfm.onion:8000"),*/
// v0.4.0, v0.4.1
/* new NodeAddress("ybmi4iaesugslxrw.onion:8000"),
new NodeAddress("ufwnvo775jfnjeux.onion:8000"),
new NodeAddress("b66vnevaljo6xt5a.onion:8000"),*/
// v0.4.2
// ...83
/* DevFlags.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("uadzuib66jupaept.onion:8000"),
DevFlags.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("wgthuiqn3aoiovbm.onion:8000"),
// ...14
DevFlags.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("hbma455xxbqhcuqh.onion:8000"),
DevFlags.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("2zxtnprnx5wqr7a3.onion:8000"),
*/
// v0.5.0
DevEnv.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("vmox6ohwogklewem.onion:8002"),
// local dev test
// DevFlags.STRESS_TEST_MODE ? new NodeAddress("hlitt7z4bec4kdh4.onion:8000") : new NodeAddress("23bnormzh2mvkz3z.onion:8000"),
// testnet
// testnet (not operated by bisq devs)
new NodeAddress("znmy44wcstn2rkva.onion:8001"),
// regtest