mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove string from fxml, refactor naming (WIP)

Browse Source
This commit is contained in:
Manfred Karrer 2017-03-05 20:41:04 -05:00
parent 0982346636
commit bbb6d5d244
90 changed files with 506 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/io/bitsquare/locale/Res.java
View File

@ -39,6 +39,14 @@ public class Res {
return ResourceBundle.getBundle("i18n.displayStrings", new UTF8Control());
}
public static String getWithCol(String key) {
return get(key) + ":";
}
public static String getWithCol(String key, Object... arguments) {
return get(key, arguments) + ":";
}
public static String get(String key) {
// TODO remove once translation done
// for testing missing translation strings

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/AliPayForm.java
View File

@ -64,7 +64,7 @@ public class AliPayForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), aliPayAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), aliPayAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -86,7 +86,7 @@ public class AliPayForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "Payment method:", Res.get(aliPayAccount.getPaymentMethod().getId()));
TextField field = addLabelTextField(gridPane, ++gridRow, "Account no.:", aliPayAccount.getAccountNr()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), aliPayAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), aliPayAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/BankForm.java
View File

@ -205,7 +205,7 @@ abstract class BankForm extends PaymentMethodForm {
addLabelTextField(gridPane, gridRow, "Account name:", paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addLabelTextField(gridPane, ++gridRow, "Payment method:", Res.get(paymentAccount.getPaymentMethod().getId()));
addLabelTextField(gridPane, ++gridRow, "Country:", getCountryBasedPaymentAccount().getCountry() != null ? getCountryBasedPaymentAccount().getCountry().name : "");
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), paymentAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), paymentAccount.getSingleTradeCurrency().getNameAndCode());
addAcceptedBanksForDisplayAccount();
addHolderNameAndIdForDisplayAccount();
@ -382,7 +382,7 @@ abstract class BankForm extends PaymentMethodForm {
}
});
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.get("label.currency")).second;
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.getWithCol("shared.currency")).second;
currencyComboBox.setPromptText(Res.get("list.currency.select"));
currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllSortedFiatCurrencies()));
currencyComboBox.setOnAction(e -> {

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CashDepositForm.java
View File

@ -217,7 +217,7 @@ public class CashDepositForm extends PaymentMethodForm {
addLabelTextField(gridPane, gridRow, "Account name:", paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addLabelTextField(gridPane, ++gridRow, "Payment method:", Res.get(paymentAccount.getPaymentMethod().getId()));
addLabelTextField(gridPane, ++gridRow, "Country:", getCountryBasedPaymentAccount().getCountry() != null ? getCountryBasedPaymentAccount().getCountry().name : "");
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), paymentAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), paymentAccount.getSingleTradeCurrency().getNameAndCode());
addAcceptedBanksForDisplayAccount();
addHolderNameAndIdForDisplayAccount();
addLabelTextField(gridPane, ++gridRow, "Account holder email:", cashDepositAccountContractData.getHolderEmail());
@ -399,7 +399,7 @@ public class CashDepositForm extends PaymentMethodForm {
}
});
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.get("label.currency")).second;
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.getWithCol("shared.currency")).second;
currencyComboBox.setPromptText(Res.get("list.currency.select"));
currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllSortedFiatCurrencies()));
currencyComboBox.setOnAction(e -> {

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/ChaseQuickPayForm.java
View File

@ -73,7 +73,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), chaseQuickPayAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), chaseQuickPayAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -96,7 +96,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "Account holder name:", chaseQuickPayAccount.getHolderName());
TextField field = addLabelTextField(gridPane, ++gridRow, "Email:", chaseQuickPayAccount.getEmail()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), chaseQuickPayAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), chaseQuickPayAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/ClearXchangeForm.java
View File

@ -72,7 +72,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), clearXchangeAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), clearXchangeAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -95,7 +95,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "Account holder name:", clearXchangeAccount.getHolderName());
TextField field = addLabelTextField(gridPane, ++gridRow, "Email or mobile no.:", clearXchangeAccount.getEmailOrMobileNr()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), clearXchangeAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), clearXchangeAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/FasterPaymentsForm.java
View File

@ -75,7 +75,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), fasterPaymentsAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), fasterPaymentsAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -98,7 +98,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "UK Sort code:", fasterPaymentsAccount.getSortCode());
TextField field = addLabelTextField(gridPane, ++gridRow, "Account number:", fasterPaymentsAccount.getAccountNr()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), fasterPaymentsAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), fasterPaymentsAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/InteracETransferForm.java
View File

@ -90,7 +90,7 @@ public class InteracETransferForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), interacETransferAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), interacETransferAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -114,7 +114,7 @@ public class InteracETransferForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "Email:", interacETransferAccount.getEmail()).second.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, "Secret question:", interacETransferAccount.getQuestion()).second.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, "Answer:", interacETransferAccount.getAnswer()).second.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), interacETransferAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), interacETransferAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

2
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
View File

@ -65,7 +65,7 @@ public abstract class PaymentMethodForm {
}
protected void addTradeCurrencyComboBox() {
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.get("label.currency")).second;
currencyComboBox = addLabelComboBox(gridPane, ++gridRow, Res.getWithCol("shared.currency")).second;
currencyComboBox.setPromptText(Res.get("list.currency.select"));
currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllMainFiatCurrencies()));
currencyComboBox.setConverter(new StringConverter<TradeCurrency>() {

2
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
View File

@ -93,7 +93,7 @@ public class PerfectMoneyForm extends PaymentMethodForm {
TextField field = addLabelTextField(gridPane, ++gridRow, "Account no.:", perfectMoneyAccount.getAccountNr()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), perfectMoneyAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), perfectMoneyAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

2
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java
View File

@ -315,7 +315,7 @@ public class SepaForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "BIC:", sepaAccount.getBic()).second.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, "Country of Bank:",
sepaAccount.getCountry() != null ? sepaAccount.getCountry().name : "");
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), sepaAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), sepaAccount.getSingleTradeCurrency().getNameAndCode());
String countries;
Tooltip tooltip = null;
if (CountryUtil.containsAllSepaEuroCountries(sepaAccount.getAcceptedCountryCodes())) {

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SwishForm.java
View File

@ -73,7 +73,7 @@ public class SwishForm extends PaymentMethodForm {
updateFromInputs();
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), swishAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), swishAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -96,7 +96,7 @@ public class SwishForm extends PaymentMethodForm {
addLabelTextField(gridPane, ++gridRow, "Account holder name:", swishAccount.getHolderName());
TextField field = addLabelTextField(gridPane, ++gridRow, "Mobile no.:", swishAccount.getMobileNr()).second;
field.setMouseTransparent(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), swishAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), swishAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

4
gui/src/main/java/io/bitsquare/gui/components/paymentmethods/USPostalMoneyOrderForm.java
View File

@ -78,7 +78,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
});
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), usPostalMoneyOrderAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), usPostalMoneyOrderAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
addAccountNameTextFieldWithAutoFillCheckBox();
}
@ -103,7 +103,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
textArea.setText(usPostalMoneyOrderAccount.getPostalAddress());
textArea.setPrefHeight(60);
textArea.setEditable(false);
addLabelTextField(gridPane, ++gridRow, Res.get("label.currency"), usPostalMoneyOrderAccount.getSingleTradeCurrency().getNameAndCode());
addLabelTextField(gridPane, ++gridRow, Res.getWithCol("shared.currency"), usPostalMoneyOrderAccount.getSingleTradeCurrency().getNameAndCode());
addAllowedPeriod();
}

6
gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.fxml
View File

@ -25,7 +25,7 @@
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="bsqWalletTab" text="BSQ wallet" closable="false"/>
<Tab fx:id="CompensationTab" text="Compensation" closable="false"/>
<Tab fx:id="votingTab" text="Voting" closable="false"/>
<Tab fx:id="bsqWalletTab" closable="false"/>
<Tab fx:id="compensationTab" closable="false"/>
<Tab fx:id="votingTab" closable="false"/>
</TabPane>

15
gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
View File

@ -26,6 +26,7 @@ import io.bitsquare.gui.main.dao.compensation.CompensationView;
import io.bitsquare.gui.main.dao.voting.VotingView;
import io.bitsquare.gui.main.dao.wallet.BsqWalletView;
import io.bitsquare.gui.main.dao.wallet.dashboard.BsqDashboardView;
import io.bitsquare.locale.Res;
import io.bitsquare.user.Preferences;
import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML;
@ -38,7 +39,7 @@ import javax.inject.Inject;
public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
@FXML
Tab bsqWalletTab, CompensationTab, votingTab;
Tab bsqWalletTab, compensationTab, votingTab;
private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener;
@ -61,9 +62,13 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
@Override
public void initialize() {
bsqWalletTab.setText(Res.get("daoView.tab.bsqWallet"));
compensationTab.setText(Res.get("daoView.tab.compensation"));
votingTab.setText(Res.get("daoView.tab.voting"));
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(DaoView.class) == 1) {
if (CompensationTab == null && viewPath.get(2).equals(CompensationView.class))
if (compensationTab == null && viewPath.get(2).equals(CompensationView.class))
navigation.navigateTo(MainView.class, DaoView.class, BsqWalletView.class, BsqDashboardView.class);
else
loadView(viewPath.tip());
@ -77,7 +82,7 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
navigation.navigateTo(MainView.class, DaoView.class, BsqWalletView.class, BsqDashboardView.class);
else
navigation.navigateTo(MainView.class, DaoView.class, BsqWalletView.class, selectedViewClass);
} else if (newValue == CompensationTab) {
} else if (newValue == compensationTab) {
navigation.navigateTo(MainView.class, DaoView.class, CompensationView.class);
} else if (newValue == votingTab) {
navigation.navigateTo(MainView.class, DaoView.class, VotingView.class);
@ -94,7 +99,7 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
Tab selectedItem = root.getSelectionModel().getSelectedItem();
if (selectedItem == bsqWalletTab)
navigation.navigateTo(MainView.class, DaoView.class, BsqWalletView.class);
else if (selectedItem == CompensationTab)
else if (selectedItem == compensationTab)
navigation.navigateTo(MainView.class, DaoView.class, CompensationView.class);
else if (selectedItem == votingTab)
navigation.navigateTo(MainView.class, DaoView.class, VotingView.class);
@ -113,7 +118,7 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
selectedTab = bsqWalletTab;
bsqWalletView = (BsqWalletView) view;
} else if (view instanceof CompensationView) {
selectedTab = CompensationTab;
selectedTab = compensationTab;
} else if (view instanceof VotingView) {
selectedTab = votingTab;
}

2
gui/src/main/java/io/bitsquare/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
View File

@ -219,7 +219,7 @@ public class ActiveCompensationRequestView extends ActivatableView<SplitPane, Vo
}
private void setColumns() {
TableColumn<CompensationRequest, CompensationRequest> dateColumn = new TableColumn<CompensationRequest, CompensationRequest>(Res.get("table.column.dateTime.header")) {
TableColumn<CompensationRequest, CompensationRequest> dateColumn = new TableColumn<CompensationRequest, CompensationRequest>(Res.get("shared.dateTime")) {
{
setMinWidth(190);
setMaxWidth(190);

2
gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.fxml
View File

@ -26,6 +26,6 @@
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="tradersDisputesTab" text="Support tickets" closable="false"/>
<Tab fx:id="tradersDisputesTab" closable="false"/>
</TabPane>

4
gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java
View File

@ -31,6 +31,7 @@ import io.bitsquare.gui.main.disputes.trader.TraderDisputeView;
import io.bitsquare.gui.main.overlays.popups.Popup;
import io.bitsquare.gui.main.portfolio.PortfolioView;
import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
import io.bitsquare.locale.Res;
import io.bitsquare.p2p.NodeAddress;
import io.bitsquare.user.Preferences;
import javafx.beans.value.ChangeListener;
@ -71,14 +72,13 @@ public class DisputesView extends ActivatableViewAndModel<TabPane, Activatable>
this.arbitratorManager = arbitratorManager;
this.disputeManager = disputeManager;
this.keyRing = keyRing;
this.preferences = preferences;
}
@Override
public void initialize() {
log.debug("initialize ");
tradersDisputesTab.setText(Res.get("disputesView.tab.support"));
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(DisputesView.class) == 1)
loadView(viewPath.tip());

10
gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
View File

@ -23,10 +23,10 @@
AnchorPane.topAnchor="0.0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="depositTab" text="Deposit funds" closable="false"/>
<Tab fx:id="withdrawalTab" text="Available for withdrawal" closable="false"/>
<Tab fx:id="reservedTab" text="Reserved funds" closable="false"/>
<Tab fx:id="lockedTab" text="Locked funds" closable="false"/>
<Tab fx:id="transactionsTab" text="Transactions" closable="false"/>
<Tab fx:id="depositTab" closable="false"/>
<Tab fx:id="withdrawalTab" closable="false"/>
<Tab fx:id="reservedTab" closable="false"/>
<Tab fx:id="lockedTab" closable="false"/>
<Tab fx:id="transactionsTab" closable="false"/>
</TabPane>

7
gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View File

@ -26,6 +26,7 @@ import io.bitsquare.gui.main.funds.locked.LockedView;
import io.bitsquare.gui.main.funds.reserved.ReservedView;
import io.bitsquare.gui.main.funds.transactions.TransactionsView;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
import io.bitsquare.locale.Res;
import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML;
import javafx.scene.control.Tab;
@ -54,6 +55,12 @@ public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
@Override
public void initialize() {
depositTab.setText(Res.get("funds.tab.deposit"));
withdrawalTab.setText(Res.get("funds.tab.withdrawal"));
reservedTab.setText(Res.get("funds.tab.reserved"));
lockedTab.setText(Res.get("funds.tab.locked"));
transactionsTab.setText(Res.get("funds.tab.transactions"));
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(FundsView.class) == 1)
loadView(viewPath.tip());

10
gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml
View File

@ -28,11 +28,11 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Select" fx:id="selectColumn" minWidth="110" maxWidth="110" sortable="false"/>
<TableColumn text="Address" fx:id="addressColumn" minWidth="320"/>
<TableColumn text="Balance in BTC" fx:id="balanceColumn" minWidth="150"/>
<TableColumn text="Confirmations" fx:id="confidenceColumn" minWidth="150"/>
<TableColumn text="Usage" fx:id="usageColumn" minWidth="200"/>
<TableColumn fx:id="selectColumn" minWidth="110" maxWidth="110" sortable="false"/>
<TableColumn fx:id="addressColumn" minWidth="320"/>
<TableColumn fx:id="balanceColumn" minWidth="150"/>
<TableColumn fx:id="confirmationsColumn" minWidth="150"/>
<TableColumn fx:id="usageColumn" minWidth="200"/>
</columns>
</TableView>

15
gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
View File

@ -36,6 +36,7 @@ import io.bitsquare.gui.main.overlays.windows.QRCodeWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.gui.util.Layout;
import io.bitsquare.locale.Res;
import io.bitsquare.user.Preferences;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.beans.value.ChangeListener;
@ -74,7 +75,7 @@ public class DepositView extends ActivatableView<VBox, Void> {
@FXML
TableView<DepositListItem> tableView;
@FXML
TableColumn<DepositListItem, DepositListItem> selectColumn, addressColumn, balanceColumn, confidenceColumn, usageColumn;
TableColumn<DepositListItem, DepositListItem> selectColumn, addressColumn, balanceColumn, confirmationsColumn, usageColumn;
private ImageView qrCodeImageView;
private AddressTextField addressTextField;
private Button generateNewAddressButton;
@ -113,6 +114,12 @@ public class DepositView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
selectColumn.setText(Res.get("shared.select"));
addressColumn.setText(Res.get("shared.address"));
balanceColumn.setText(Res.get("shared.balanceWithCur"));
confirmationsColumn.setText(Res.get("shared.confirmations"));
usageColumn.setText(Res.get("shared.usage"));
// trigger creation of at least 1 savings address
walletService.getOrCreateAddressEntry(AddressEntry.Context.AVAILABLE);
@ -131,7 +138,7 @@ public class DepositView extends ActivatableView<VBox, Void> {
addressColumn.setComparator((o1, o2) -> o1.getAddressString().compareTo(o2.getAddressString()));
balanceColumn.setComparator((o1, o2) -> o1.getBalanceAsCoin().compareTo(o2.getBalanceAsCoin()));
confidenceColumn.setComparator((o1, o2) -> Double.valueOf(o1.getTxConfidenceIndicator().getProgress())
confirmationsColumn.setComparator((o1, o2) -> Double.valueOf(o1.getTxConfidenceIndicator().getProgress())
.compareTo(o2.getTxConfidenceIndicator().getProgress()));
usageColumn.setComparator((a, b) -> (a.getNumTxOutputs() < b.getNumTxOutputs()) ? -1 : ((a.getNumTxOutputs() == b.getNumTxOutputs()) ? 0 : 1));
tableView.getSortOrder().add(usageColumn);
@ -431,9 +438,9 @@ public class DepositView extends ActivatableView<VBox, Void> {
private void setConfidenceColumnCellFactory() {
confidenceColumn.setCellValueFactory((addressListItem) ->
confirmationsColumn.setCellValueFactory((addressListItem) ->
new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
confidenceColumn.setCellFactory(
confirmationsColumn.setCellFactory(
new Callback<TableColumn<DepositListItem, DepositListItem>, TableCell<DepositListItem,
DepositListItem>>() {

8
gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.fxml
View File

@ -28,10 +28,10 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn text="Details" fx:id="detailsColumn" minWidth="320"/>
<TableColumn text="Address" fx:id="addressColumn" minWidth="320"/>
<TableColumn text="Balance in BTC" fx:id="balanceColumn" minWidth="110"/>
<TableColumn fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn fx:id="detailsColumn" minWidth="320"/>
<TableColumn fx:id="addressColumn" minWidth="320"/>
<TableColumn fx:id="balanceColumn" minWidth="110"/>
</columns>
</TableView>

8
gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java
View File

@ -29,6 +29,7 @@ import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.Tradable;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
@ -56,7 +57,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
@FXML
TableView<LockedListItem> tableView;
@FXML
TableColumn<LockedListItem, LockedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn, confidenceColumn;
TableColumn<LockedListItem, LockedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn;
private final BtcWalletService walletService;
private final TradeManager tradeManager;
@ -90,6 +91,11 @@ public class LockedView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
dateColumn.setText(Res.get("shared.dateTime"));
detailsColumn.setText(Res.get("shared.details"));
addressColumn.setText(Res.get("shared.address"));
balanceColumn.setText(Res.get("shared.balanceWithCur", "BTC"));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No funds are locked in trades"));

8
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.fxml
View File

@ -28,10 +28,10 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn text="Details" fx:id="detailsColumn" minWidth="320"/>
<TableColumn text="Address" fx:id="addressColumn" minWidth="320"/>
<TableColumn text="Balance in BTC" fx:id="balanceColumn" minWidth="110"/>
<TableColumn fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn fx:id="detailsColumn" minWidth="320"/>
<TableColumn fx:id="addressColumn" minWidth="320"/>
<TableColumn fx:id="balanceColumn" minWidth="110"/>
</columns>
</TableView>

8
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
View File

@ -29,6 +29,7 @@ import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.Tradable;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
@ -56,7 +57,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
@FXML
TableView<ReservedListItem> tableView;
@FXML
TableColumn<ReservedListItem, ReservedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn, confidenceColumn;
TableColumn<ReservedListItem, ReservedListItem> dateColumn, detailsColumn, addressColumn, balanceColumn;
private final BtcWalletService walletService;
private final TradeManager tradeManager;
@ -90,6 +91,11 @@ public class ReservedView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
dateColumn.setText(Res.get("shared.dateTime"));
detailsColumn.setText(Res.get("shared.details"));
addressColumn.setText(Res.get("shared.address"));
balanceColumn.setText(Res.get("shared.balanceWithCur", "BTC"));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No funds are reserved in open offers"));

15
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
View File

@ -27,14 +27,13 @@
</padding>
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn text="Details" fx:id="detailsColumn" minWidth="220" maxWidth="220"/>
<TableColumn text="Address" fx:id="addressColumn" minWidth="260"/>
<TableColumn text="Transaction ID" fx:id="transactionColumn" minWidth="180"/>
<TableColumn text="Amount in BTC" fx:id="amountColumn" minWidth="130" maxWidth="130"/>
<TableColumn text="Confirmations" fx:id="confidenceColumn" minWidth="130" maxWidth="130"/>
<TableColumn text="Revert Tx" fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110"
visible="false"/>
<TableColumn fx:id="dateColumn" minWidth="180" maxWidth="180"/>
<TableColumn fx:id="detailsColumn" minWidth="220" maxWidth="220"/>
<TableColumn fx:id="addressColumn" minWidth="260"/>
<TableColumn fx:id="transactionColumn" minWidth="180"/>
<TableColumn fx:id="amountColumn" minWidth="130" maxWidth="130"/>
<TableColumn fx:id="confidenceColumn" minWidth="130" maxWidth="130"/>
<TableColumn fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110" visible="false"/>
</columns>
</TableView>
<Button fx:id="exportButton"/>

10
gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
View File

@ -33,6 +33,7 @@ import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.Tradable;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
@ -119,10 +120,17 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
dateColumn.setText(Res.get("shared.dateTime"));
detailsColumn.setText(Res.get("shared.details"));
addressColumn.setText(Res.get("shared.address"));
transactionColumn.setText(Res.get("shared.txId", "BTC"));
amountColumn.setText(Res.get("shared.amountWithCur", "BTC"));
confidenceColumn.setText(Res.get("shared.confirmations", "BTC"));
revertTxColumn.setText(Res.get("shared.revert", "BTC"));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No transactions available"));
setDateColumnCellFactory();
setDetailsColumnCellFactory();
setAddressColumnCellFactory();

14
gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
View File

@ -28,9 +28,9 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Select" fx:id="selectColumn" minWidth="60" maxWidth="60" sortable="false"/>
<TableColumn text="Address" fx:id="addressColumn" minWidth="320"/>
<TableColumn text="Balance in BTC" fx:id="balanceColumn" minWidth="310" maxWidth="310"/>
<TableColumn fx:id="selectColumn" minWidth="60" maxWidth="60" sortable="false"/>
<TableColumn fx:id="addressColumn" minWidth="320"/>
<TableColumn fx:id="balanceColumn" minWidth="310" maxWidth="310"/>
</columns>
</TableView>
@ -39,17 +39,17 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
</padding>
<Label text="Amount in BTC:" GridPane.rowIndex="0"/>
<Label fx:id="amountLabel" GridPane.rowIndex="0"/>
<TextField fx:id="amountTextField" GridPane.rowIndex="0" GridPane.columnIndex="1"/>
<Label text="Withdraw from address:" GridPane.rowIndex="1"/>
<Label fx:id="fromLabel" GridPane.rowIndex="1"/>
<TextField fx:id="withdrawFromTextField" editable="false" focusTraversable="false"
GridPane.rowIndex="1" GridPane.columnIndex="1"/>
<Label text="Withdraw to address:" GridPane.rowIndex="2"/>
<Label fx:id="toLabel" GridPane.rowIndex="2"/>
<TextField fx:id="withdrawToTextField" GridPane.rowIndex="2" GridPane.columnIndex="1"/>
<Button fx:id="withdrawButton" text="Withdraw selected" defaultButton="true" onAction="#onWithdraw"
<Button fx:id="withdrawButton" defaultButton="true" onAction="#onWithdraw"
GridPane.rowIndex="3"
GridPane.columnIndex="1"/>

12
gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
View File

@ -36,6 +36,7 @@ import io.bitsquare.gui.main.overlays.windows.WalletPasswordWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.gui.util.validation.BtcAddressValidator;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.Tradable;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.TradeManager;
@ -66,6 +67,8 @@ import java.util.stream.Collectors;
@FxmlView
public class WithdrawalView extends ActivatableView<VBox, Void> {
@FXML
Label amountLabel, fromLabel, toLabel;
@FXML
Button withdrawButton;
@FXML
@ -119,6 +122,15 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
@Override
public void initialize() {
amountLabel.setText(Res.getWithCol("shared.amountWithCur", "BTC"));
fromLabel.setText(Res.getWithCol("funds.withdrawal.fromLabel", "BTC"));
toLabel.setText(Res.getWithCol("funds.withdrawal.toLabel", "BTC"));
withdrawButton.setText(Res.get("funds.withdrawal.withdrawButton"));
addressColumn.setText(Res.get("shared.address"));
balanceColumn.setText(Res.get("shared.balanceWithCur", "BTC"));
selectColumn.setText(Res.get("shared.select"));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No funds are available for withdrawal"));
tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);

14
gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
View File

@ -111,7 +111,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
currencyComboBox.setPromptText(Res.get("list.currency.select"));
currencyComboBox.setConverter(GUIUtil.getCurrencyListItemConverter(Res.get("shared.offers"), model.preferences));
Label currencyLabel = new Label(Res.get("label.currency"));
Label currencyLabel = new Label(Res.getWithCol("shared.currency"));
HBox currencyHBox = new HBox();
currencyHBox.setSpacing(5);
currencyHBox.setPadding(new Insets(5, -20, -5, 20));
@ -173,7 +173,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
tradeCurrency -> {
String code = tradeCurrency.getCode();
areaChart.setTitle(Res.get("market.offerBook.chart.title", formatter.getCurrencyNameAndCurrencyPair(code)));
volumeColumnLabel.set(Res.get("table.column.amountWithCur.header", code));
volumeColumnLabel.set(Res.get("shared.amountWithCur", code));
xAxis.setTickLabelFormatter(new StringConverter<Number>() {
@Override
public String toString(Number object) {
@ -207,7 +207,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
sellOfferHeaderLabel.setText(Res.get("market.offerBook.sellOfferHeaderLabel", code, "BTC"));
sellOfferButton.setText(Res.get("market.offerBook.sellOfferButton", code, "BTC"));
priceColumnLabel.set(Res.get("table.column.priceWithCur.header", "BTC"));
priceColumnLabel.set(Res.get("shared.priceWithCur", "BTC"));
} else {
if (bottomHBox.getChildren().size() == 2 && bottomHBox.getChildren().get(0).getUserData().equals(Offer.Direction.SELL.name())) {
bottomHBox.getChildren().get(0).toFront();
@ -220,7 +220,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
sellOfferHeaderLabel.setText(Res.get("market.offerBook.sellOfferHeaderLabel", "BTC", code));
sellOfferButton.setText(Res.get("market.offerBook.sellOfferButton", "BTC", code));
priceColumnLabel.set(Res.get("table.column.priceWithCur.header", code));
priceColumnLabel.set(Res.get("shared.priceWithCur", code));
}
xAxis.setLabel(formatter.getPriceWithCurrencyCode(code));
@ -263,7 +263,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
yAxis = new NumberAxis();
yAxis.setForceZeroInRange(false);
yAxis.setAutoRanging(true);
yAxis.setLabel(Res.get("table.column.amountWithCur.header", "BTC"));
yAxis.setLabel(Res.get("shared.amountWithCur", "BTC"));
yAxis.setTickLabelFormatter(new NumberAxis.DefaultFormatter(yAxis, "", ""));
seriesBuy = new XYChart.Series<>();
@ -382,7 +382,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
});
// amount
TableColumn<OfferListItem, OfferListItem> amountColumn = new TableColumn<>(Res.get("table.column.amountWithCur.header", "BTC"));
TableColumn<OfferListItem, OfferListItem> amountColumn = new TableColumn<>(Res.get("shared.amountWithCur", "BTC"));
amountColumn.setMinWidth(115);
amountColumn.setSortable(false);
amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
@ -404,7 +404,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
});
// accumulated
TableColumn<OfferListItem, OfferListItem> accumulatedColumn = new TableColumn<>(Res.get("table.column.sumWithCur.header", "BTC"));
TableColumn<OfferListItem, OfferListItem> accumulatedColumn = new TableColumn<>(Res.get("shared.sumWithCur", "BTC"));
accumulatedColumn.setMinWidth(100);
accumulatedColumn.setSortable(false);
accumulatedColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));

2
gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
View File

@ -128,7 +128,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
///////////////////////////////////////////////////////////////////////////////////////////
private TableColumn<SpreadItem, SpreadItem> getCurrencyColumn() {
TableColumn<SpreadItem, SpreadItem> column = new TableColumn<SpreadItem, SpreadItem>(Res.get("table.column.currency.header")) {
TableColumn<SpreadItem, SpreadItem> column = new TableColumn<SpreadItem, SpreadItem>(Res.get("shared.currency")) {
{
setMinWidth(160);
}

21
gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
View File

@ -95,6 +95,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
// Constructor, lifecycle
///////////////////////////////////////////////////////////////////////////////////////////
@SuppressWarnings("WeakerAccess")
@Inject
public TradesChartsView(TradesChartsViewModel model, BSFormatter formatter) {
super(model);
@ -175,15 +176,15 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
priceColumn.setSortable(!showAll);
if (showAll) {
volumeColumn.setText(Res.get("table.column.amount.header"));
priceColumnLabel.set(Res.get("table.column.price.header"));
volumeColumn.setText(Res.get("shared.amount"));
priceColumnLabel.set(Res.get("shared.price"));
if (!tableView.getColumns().contains(marketColumn))
tableView.getColumns().add(1, marketColumn);
} else {
priceSeries.setName(selectedTradeCurrency.getName());
String code = selectedTradeCurrency.getCode();
volumeColumn.setText(Res.get("table.column.amountWithCur.header", "BTC"));
volumeColumn.setText(Res.get("shared.amountWithCur", "BTC"));
priceColumnLabel.set(formatter.getPriceWithCurrencyCode(code));
if (tableView.getColumns().contains(marketColumn))
@ -297,7 +298,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
volumeAxisY = new NumberAxis();
volumeAxisY.setForceZeroInRange(true);
volumeAxisY.setAutoRanging(true);
volumeAxisY.setLabel(Res.get("table.column.volumeWithCur.header", "BTC"));
volumeAxisY.setLabel(Res.get("shared.volumeWithCur", "BTC"));
volumeAxisY.setTickLabelFormatter(new StringConverter<Number>() {
@Override
public String toString(Number object) {
@ -377,7 +378,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
///////////////////////////////////////////////////////////////////////////////////////////
private HBox getToolBox() {
Label currencyLabel = new Label(Res.get("label.currency"));
Label currencyLabel = new Label(Res.getWithCol("shared.currency"));
currencyLabel.setPadding(new Insets(0, 4, 0, 0));
currencyComboBox = new ComboBox<>();
@ -426,7 +427,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
VBox.setVgrow(tableView, Priority.ALWAYS);
// date
TableColumn<TradeStatistics, TradeStatistics> dateColumn = new TableColumn<TradeStatistics, TradeStatistics>(Res.get("table.column.dateTime.header")) {
TableColumn<TradeStatistics, TradeStatistics> dateColumn = new TableColumn<TradeStatistics, TradeStatistics>(Res.get("shared.dateTime")) {
{
setMinWidth(190);
setMaxWidth(190);
@ -455,7 +456,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
tableView.getColumns().add(dateColumn);
// market
marketColumn = new TableColumn<TradeStatistics, TradeStatistics>(Res.get("table.column.market.header")) {
marketColumn = new TableColumn<TradeStatistics, TradeStatistics>(Res.get("shared.market")) {
{
setMinWidth(130);
setMaxWidth(130);
@ -508,7 +509,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
tableView.getColumns().add(priceColumn);
// amount
TableColumn<TradeStatistics, TradeStatistics> amountColumn = new TableColumn<>(Res.get("table.column.amountWithCur.header", "BTC"));
TableColumn<TradeStatistics, TradeStatistics> amountColumn = new TableColumn<>(Res.get("shared.amountWithCur", "BTC"));
amountColumn.setCellValueFactory((tradeStatistics) -> new ReadOnlyObjectWrapper<>(tradeStatistics.getValue()));
amountColumn.setCellFactory(
new Callback<TableColumn<TradeStatistics, TradeStatistics>, TableCell<TradeStatistics,
@ -562,7 +563,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
tableView.getColumns().add(volumeColumn);
// paymentMethod
TableColumn<TradeStatistics, TradeStatistics> paymentMethodColumn = new TableColumn<>(Res.get("table.column.paymentMethod.header"));
TableColumn<TradeStatistics, TradeStatistics> paymentMethodColumn = new TableColumn<>(Res.get("shared.paymentMethod"));
paymentMethodColumn.setCellValueFactory((tradeStatistics) -> new ReadOnlyObjectWrapper<>(tradeStatistics.getValue()));
paymentMethodColumn.setCellFactory(
new Callback<TableColumn<TradeStatistics, TradeStatistics>, TableCell<TradeStatistics,
@ -586,7 +587,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
tableView.getColumns().add(paymentMethodColumn);
// direction
TableColumn<TradeStatistics, TradeStatistics> directionColumn = new TableColumn<>(Res.get("table.column.tradeType.header"));
TableColumn<TradeStatistics, TradeStatistics> directionColumn = new TableColumn<>(Res.get("shared.tradeType"));
directionColumn.setCellValueFactory((tradeStatistics) -> new ReadOnlyObjectWrapper<>(tradeStatistics.getValue()));
directionColumn.setCellFactory(
new Callback<TableColumn<TradeStatistics, TradeStatistics>, TableCell<TradeStatistics,

5
gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java
View File

@ -17,7 +17,6 @@
package io.bitsquare.gui.main.offer;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.common.view.FxmlView;
import io.bitsquare.gui.common.view.ViewLoader;
@ -29,8 +28,8 @@ import javax.inject.Inject;
public class BuyOfferView extends OfferView {
@Inject
public BuyOfferView(ViewLoader viewLoader, Navigation navigation, PriceFeedService priceFeedService, Preferences preferences) {
super(viewLoader, navigation, priceFeedService, preferences);
public BuyOfferView(ViewLoader viewLoader, Navigation navigation, Preferences preferences) {
super(viewLoader, navigation, preferences);
}
@Override

23
gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
View File

@ -17,7 +17,6 @@
package io.bitsquare.gui.main.offer;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.common.UserThread;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.common.view.ActivatableView;
@ -30,6 +29,7 @@ import io.bitsquare.gui.main.offer.offerbook.OfferBookView;
import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView;
import io.bitsquare.gui.main.overlays.popups.Popup;
import io.bitsquare.locale.CurrencyUtil;
import io.bitsquare.locale.Res;
import io.bitsquare.locale.TradeCurrency;
import io.bitsquare.trade.offer.Offer;
import io.bitsquare.user.Preferences;
@ -48,25 +48,24 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
private CreateOfferView createOfferView;
private TakeOfferView takeOfferView;
private AnchorPane createOfferPane;
private AnchorPane takeOfferPane;
private Navigation.Listener navigationListener;
private Offer offer;
private Tab takeOfferTab, createOfferTab, offerBookTab;
private AnchorPane takeOfferPane;
private final ViewLoader viewLoader;
private final Navigation navigation;
private final PriceFeedService priceFeedService;
private Preferences preferences;
private final Preferences preferences;
private final Offer.Direction direction;
private Tab takeOfferTab, createOfferTab, offerBookTab;
private Offer offer;
private TradeCurrency tradeCurrency;
private boolean createOfferViewOpen, takeOfferViewOpen;
private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener;
private ListChangeListener<Tab> tabListChangeListener;
protected OfferView(ViewLoader viewLoader, Navigation navigation, PriceFeedService priceFeedService, Preferences preferences) {
protected OfferView(ViewLoader viewLoader, Navigation navigation, Preferences preferences) {
this.viewLoader = viewLoader;
this.navigation = navigation;
this.priceFeedService = priceFeedService;
this.preferences = preferences;
this.direction = (this instanceof BuyOfferView) ? Offer.Direction.BUY : Offer.Direction.SELL;
}
@ -142,7 +141,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
if (viewClass == OfferBookView.class && offerBookView == null) {
view = viewLoader.load(viewClass);
// Offerbook must not be cached by ViewLoader as we use 2 instances for sell and buy screens.
offerBookTab = new Tab(isBuy ? "Buy bitcoin" : "Sell bitcoin");
offerBookTab = new Tab(isBuy ? Res.get("shared.buyBitcoin") : Res.get("shared.sellBitcoin"));
offerBookTab.setClosable(false);
offerBookTab.setContent(view.getRoot());
tabPane.getTabs().add(offerBookTab);
@ -158,7 +157,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
CreateOfferView.class);
} else {
new Popup().information("You have already a \"Create offer\" tab open.").show();
new Popup().information(Res.get("popup.createOfferTabOpen")).show();
}
}
@ -170,7 +169,7 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
TakeOfferView.class);
} else {
new Popup().information("You have already a \"Take offer\" tab open.").show();
new Popup().information(Res.get("popup.takeOfferTabOpen")).show();
}
}
};

5
gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java
View File

@ -17,7 +17,6 @@
package io.bitsquare.gui.main.offer;
import io.bitsquare.btc.provider.price.PriceFeedService;
import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.common.view.FxmlView;
import io.bitsquare.gui.common.view.ViewLoader;
@ -29,8 +28,8 @@ import javax.inject.Inject;
public class SellOfferView extends OfferView {
@Inject
public SellOfferView(ViewLoader viewLoader, Navigation navigation, PriceFeedService priceFeedService, Preferences preferences) {
super(viewLoader, navigation, priceFeedService, preferences);
public SellOfferView(ViewLoader viewLoader, Navigation navigation, Preferences preferences) {
super(viewLoader, navigation, preferences);
}
@Override

4
gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
View File

@ -774,7 +774,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
editOfferElements.add(paymentAccountsComboBox);
// we display either currencyComboBox (multi currency account) or currencyTextField (single)
Tuple2<Label, ComboBox> currencyComboBoxTuple = addLabelComboBox(gridPane, ++gridRow, Res.get("label.currency"));
Tuple2<Label, ComboBox> currencyComboBoxTuple = addLabelComboBox(gridPane, ++gridRow, Res.getWithCol("shared.currency"));
currencyComboBoxLabel = currencyComboBoxTuple.first;
editOfferElements.add(currencyComboBoxLabel);
currencyComboBox = currencyComboBoxTuple.second;
@ -792,7 +792,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
}
});
Tuple2<Label, TextField> currencyTextFieldTuple = addLabelTextField(gridPane, gridRow, Res.get("label.currency"), "", 5);
Tuple2<Label, TextField> currencyTextFieldTuple = addLabelTextField(gridPane, gridRow, Res.getWithCol("shared.currency"), "", 5);
currencyTextFieldLabel = currencyTextFieldTuple.first;
editOfferElements.add(currencyTextFieldLabel);
currencyTextField = currencyTextFieldTuple.second;

6
gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml
View File

@ -25,8 +25,8 @@
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" tabClosingPolicy="UNAVAILABLE"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="openOffersTab" text="My open offers"/>
<Tab fx:id="pendingTradesTab" text="Open trades"/>
<Tab fx:id="closedTradesTab" text="History"/>
<Tab fx:id="openOffersTab"/>
<Tab fx:id="pendingTradesTab"/>
<Tab fx:id="closedTradesTab"/>
</TabPane>

5
gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View File

@ -25,6 +25,7 @@ import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView;
import io.bitsquare.gui.main.portfolio.failedtrades.FailedTradesView;
import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.Trade;
import io.bitsquare.trade.failed.FailedTradesManager;
import javafx.beans.value.ChangeListener;
@ -58,6 +59,10 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
@Override
public void initialize() {
openOffersTab.setText(Res.get("portfolio.tab.openOffers"));
pendingTradesTab.setText(Res.get("portfolio.tab.pendingTrades"));
closedTradesTab.setText(Res.get("portfolio.tab.history"));
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(PortfolioView.class) == 1)
loadView(viewPath.tip());

18
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.fxml
View File

@ -28,15 +28,15 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="120" maxWidth="120"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180"/>
<TableColumn text="Market" fx:id="marketColumn" minWidth="100"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
<TableColumn text="Amount in BTC" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Amount" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
<TableColumn text="Status" fx:id="stateColumn" minWidth="80"/>
<TableColumn text="" fx:id="avatarColumn" minWidth="40" maxWidth="40"/>
<TableColumn fx:id="tradeIdColumn" minWidth="120" maxWidth="120"/>
<TableColumn fx:id="dateColumn" minWidth="180"/>
<TableColumn fx:id="marketColumn" minWidth="100"/>
<TableColumn fx:id="priceColumn" minWidth="100"/>
<TableColumn fx:id="amountColumn" minWidth="130"/>
<TableColumn fx:id="volumeColumn" minWidth="130"/>
<TableColumn fx:id="directionColumn" minWidth="80"/>
<TableColumn fx:id="stateColumn" minWidth="80"/>
<TableColumn fx:id="avatarColumn" minWidth="40" maxWidth="40"/>
</columns>
</TableView>
<Button fx:id="exportButton"/>

11
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
View File

@ -27,6 +27,7 @@ import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.GUIUtil;
import io.bitsquare.locale.Res;
import io.bitsquare.p2p.NodeAddress;
import io.bitsquare.trade.Tradable;
import io.bitsquare.trade.Trade;
@ -76,6 +77,16 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
@Override
public void initialize() {
priceColumn.setText(Res.get("shared.price"));
amountColumn.setText(Res.get("shared.amountWithCur", "BTC"));
volumeColumn.setText(Res.get("shared.volume"));
marketColumn.setText(Res.get("shared.market"));
directionColumn.setText(Res.get("shared.tradeType"));
dateColumn.setText(Res.get("shared.dateTime"));
tradeIdColumn.setText(Res.get("shared.tradeId"));
stateColumn.setText(Res.get("shared.state"));
avatarColumn.setText(Res.get(""));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No closed trades available"));

16
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.fxml
View File

@ -28,14 +28,14 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Trade ID" fx:id="tradeIdColumn" minWidth="120" maxWidth="120"/>
<TableColumn text="Date" fx:id="dateColumn" minWidth="180"/>
<TableColumn text="Market" fx:id="marketColumn" minWidth="100"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="100"/>
<TableColumn text="Amount in BTC" fx:id="amountColumn" minWidth="130"/>
<TableColumn text="Amount in EUR" fx:id="volumeColumn" minWidth="130"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="80"/>
<TableColumn text="State" fx:id="stateColumn" minWidth="80"/>
<TableColumn fx:id="tradeIdColumn" minWidth="120" maxWidth="120"/>
<TableColumn fx:id="dateColumn" minWidth="180"/>
<TableColumn fx:id="marketColumn" minWidth="100"/>
<TableColumn fx:id="priceColumn" minWidth="100"/>
<TableColumn fx:id="amountColumn" minWidth="130"/>
<TableColumn fx:id="volumeColumn" minWidth="130"/>
<TableColumn fx:id="directionColumn" minWidth="80"/>
<TableColumn fx:id="stateColumn" minWidth="80"/>
</columns>
</TableView>

10
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
View File

@ -21,6 +21,7 @@ import io.bitsquare.gui.common.view.ActivatableViewAndModel;
import io.bitsquare.gui.common.view.FxmlView;
import io.bitsquare.gui.components.HyperlinkWithIcon;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.locale.Res;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.transformation.SortedList;
import javafx.fxml.FXML;
@ -49,6 +50,15 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
@Override
public void initialize() {
priceColumn.setText(Res.get("shared.price"));
amountColumn.setText(Res.get("shared.amountWithCur", "BTC"));
volumeColumn.setText(Res.get("shared.volume"));
marketColumn.setText(Res.get("shared.market"));
directionColumn.setText(Res.get("shared.tradeType"));
dateColumn.setText(Res.get("shared.dateTime"));
tradeIdColumn.setText(Res.get("shared.tradeId"));
stateColumn.setText(Res.get("shared.state"));
tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
tableView.setPlaceholder(new Label("No closed trades available"));

16
gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
View File

@ -28,14 +28,14 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Offer ID" fx:id="offerIdColumn" minWidth="120" maxWidth="130"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="200"/>
<TableColumn text="Market" fx:id="marketColumn" minWidth="100"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="160"/>
<TableColumn text="BTC (min - max)" fx:id="amountColumn" minWidth="160"/>
<TableColumn text="Amount (min - max)" fx:id="volumeColumn" minWidth="180"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="100"/>
<TableColumn text="" fx:id="removeItemColumn" minWidth="120" maxWidth="120" sortable="false"/>
<TableColumn fx:id="offerIdColumn" minWidth="120" maxWidth="130"/>
<TableColumn fx:id="dateColumn" minWidth="200"/>
<TableColumn fx:id="marketColumn" minWidth="100"/>
<TableColumn fx:id="priceColumn" minWidth="160"/>
<TableColumn fx:id="amountColumn" minWidth="160"/>
<TableColumn fx:id="volumeColumn" minWidth="180"/>
<TableColumn fx:id="directionColumn" minWidth="100"/>
<TableColumn fx:id="removeItemColumn" minWidth="120" maxWidth="120" sortable="false"/>
</columns>
</TableView>

10
gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
View File

@ -26,6 +26,7 @@ import io.bitsquare.gui.main.funds.FundsView;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
import io.bitsquare.gui.main.overlays.popups.Popup;
import io.bitsquare.gui.main.overlays.windows.OfferDetailsWindow;
import io.bitsquare.locale.Res;
import io.bitsquare.trade.offer.OpenOffer;
import io.bitsquare.user.Preferences;
import javafx.beans.property.ReadOnlyObjectWrapper;
@ -62,6 +63,15 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
@Override
public void initialize() {
priceColumn.setText(Res.get("shared.price"));
amountColumn.setText(Res.get("portfolio.openOffer.amountMinMax"));
volumeColumn.setText(Res.get("portfolio.openOffer.volumeMinMax"));
marketColumn.setText(Res.get("shared.market"));
directionColumn.setText(Res.get("shared.tradeType"));
dateColumn.setText(Res.get("shared.dateTime"));
offerIdColumn.setText(Res.get("shared.offerId"));
removeItemColumn.setText("");
setOfferIdColumnCellFactory();
setDirectionColumnCellFactory();
setMarketColumnCellFactory();

18
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml
View File

@ -28,15 +28,15 @@
<TableView fx:id="tableView" VBox.vgrow="SOMETIMES">
<columns>
<TableColumn text="Trade ID" fx:id="idColumn" minWidth="100"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180"/>
<TableColumn text="Market" fx:id="marketColumn" minWidth="90"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="90"/>
<TableColumn text="Amount in BTC" fx:id="tradeAmountColumn" minWidth="130"/>
<TableColumn text="Amount" fx:id="tradeVolumeColumn" minWidth="130"/>
<TableColumn text="Payment method" fx:id="paymentMethodColumn" minWidth="130"/>
<TableColumn text="My role" fx:id="roleColumn" minWidth="150"/>
<TableColumn text="" fx:id="avatarColumn" minWidth="40" maxWidth="40"/>
<TableColumn fx:id="tradeIdColumn" minWidth="100"/>
<TableColumn fx:id="dateColumn" minWidth="180"/>
<TableColumn fx:id="marketColumn" minWidth="90"/>
<TableColumn fx:id="priceColumn" minWidth="90"/>
<TableColumn fx:id="amountColumn" minWidth="130"/>
<TableColumn fx:id="volumeColumn" minWidth="130"/>
<TableColumn fx:id="paymentMethodColumn" minWidth="130"/>
<TableColumn fx:id="roleColumn" minWidth="150"/>
<TableColumn fx:id="avatarColumn" minWidth="40" maxWidth="40"/>
</columns>
</TableView>
</VBox>

31
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java
View File

@ -26,6 +26,7 @@ import io.bitsquare.gui.components.PeerInfoIcon;
import io.bitsquare.gui.main.overlays.popups.Popup;
import io.bitsquare.gui.main.overlays.windows.TradeDetailsWindow;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.Res;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.transformation.SortedList;
import javafx.event.EventHandler;
@ -55,7 +56,7 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
@FXML
TableView<PendingTradesListItem> tableView;
@FXML
TableColumn<PendingTradesListItem, PendingTradesListItem> priceColumn, tradeVolumeColumn, tradeAmountColumn, avatarColumn, marketColumn, roleColumn, paymentMethodColumn, idColumn, dateColumn;
TableColumn<PendingTradesListItem, PendingTradesListItem> priceColumn, volumeColumn, amountColumn, avatarColumn, marketColumn, roleColumn, paymentMethodColumn, tradeIdColumn, dateColumn;
@FXML
private SortedList<PendingTradesListItem> sortedList;
@ -81,6 +82,16 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
@Override
public void initialize() {
priceColumn.setText(Res.get("shared.price"));
amountColumn.setText(Res.get("shared.amountWithCur", "BTC"));
volumeColumn.setText(Res.get("shared.volume"));
marketColumn.setText(Res.get("shared.market"));
roleColumn.setText(Res.get("portfolio.pending.role"));
dateColumn.setText(Res.get("shared.dateTime"));
tradeIdColumn.setText(Res.get("shared.tradeId"));
paymentMethodColumn.setText(Res.get("shared.paymentMethod"));
avatarColumn.setText(Res.get(""));
setTradeIdColumnCellFactory();
setDateColumnCellFactory();
setAmountColumnCellFactory();
@ -95,15 +106,15 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
tableView.setPlaceholder(new Label("No pending trades available"));
tableView.setMinHeight(100);
idColumn.setComparator((o1, o2) -> o1.getTrade().getId().compareTo(o2.getTrade().getId()));
tradeIdColumn.setComparator((o1, o2) -> o1.getTrade().getId().compareTo(o2.getTrade().getId()));
dateColumn.setComparator((o1, o2) -> o1.getTrade().getDate().compareTo(o2.getTrade().getDate()));
tradeVolumeColumn.setComparator((o1, o2) -> {
volumeColumn.setComparator((o1, o2) -> {
if (o1.getTrade().getTradeVolume() != null && o2.getTrade().getTradeVolume() != null)
return o1.getTrade().getTradeVolume().compareTo(o2.getTrade().getTradeVolume());
else
return 0;
});
tradeAmountColumn.setComparator((o1, o2) -> {
amountColumn.setComparator((o1, o2) -> {
if (o1.getTrade().getTradeAmount() != null && o2.getTrade().getTradeAmount() != null)
return o1.getTrade().getTradeAmount().compareTo(o2.getTrade().getTradeAmount());
else
@ -250,8 +261,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
///////////////////////////////////////////////////////////////////////////////////////////
private void setTradeIdColumnCellFactory() {
idColumn.setCellValueFactory((pendingTradesListItem) -> new ReadOnlyObjectWrapper<>(pendingTradesListItem.getValue()));
idColumn.setCellFactory(
tradeIdColumn.setCellValueFactory((pendingTradesListItem) -> new ReadOnlyObjectWrapper<>(pendingTradesListItem.getValue()));
tradeIdColumn.setCellFactory(
new Callback<TableColumn<PendingTradesListItem, PendingTradesListItem>, TableCell<PendingTradesListItem, PendingTradesListItem>>() {
@Override
@ -311,8 +322,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
}
private void setAmountColumnCellFactory() {
tradeAmountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
tradeAmountColumn.setCellFactory(
amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
amountColumn.setCellFactory(
new Callback<TableColumn<PendingTradesListItem, PendingTradesListItem>, TableCell<PendingTradesListItem,
PendingTradesListItem>>() {
@Override
@ -355,8 +366,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
}
private void setVolumeColumnCellFactory() {
tradeVolumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
tradeVolumeColumn.setCellFactory(
volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
volumeColumn.setCellFactory(
new Callback<TableColumn<PendingTradesListItem, PendingTradesListItem>, TableCell<PendingTradesListItem,
PendingTradesListItem>>() {
@Override

6
gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
View File

@ -24,21 +24,21 @@
AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="preferencesTab" text="Settings" closable="false">
<Tab fx:id="settingsTab" closable="false">
<content>
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</content>
</Tab>
<Tab fx:id="networkSettingsTab" text="Network info" closable="false">
<Tab fx:id="networkTab" closable="false">
<content>
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</content>
</Tab>
<Tab fx:id="aboutTab" text="About" closable="false">
<Tab fx:id="aboutTab" closable="false">
<content>
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"

19
gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
View File

@ -24,6 +24,7 @@ import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.settings.about.AboutView;
import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
import io.bitsquare.gui.main.settings.preferences.PreferencesView;
import io.bitsquare.locale.Res;
import javafx.beans.value.ChangeListener;
import javafx.fxml.FXML;
import javafx.scene.control.ScrollPane;
@ -35,7 +36,7 @@ import javax.inject.Inject;
@FxmlView
public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable> {
@FXML
Tab preferencesTab, networkSettingsTab, aboutTab;
Tab settingsTab, networkTab, aboutTab;
private final ViewLoader viewLoader;
private final Navigation navigation;
private Navigation.Listener navigationListener;
@ -49,15 +50,19 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
@Override
public void initialize() {
settingsTab.setText(Res.get("settings.tab.settings"));
networkTab.setText(Res.get("settings.tab.network"));
aboutTab.setText(Res.get("settings.tab.aboutTab"));
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(SettingsView.class) == 1)
loadView(viewPath.tip());
};
tabChangeListener = (ov, oldValue, newValue) -> {
if (newValue == preferencesTab)
if (newValue == settingsTab)
navigation.navigateTo(MainView.class, SettingsView.class, PreferencesView.class);
else if (newValue == networkSettingsTab)
else if (newValue == networkTab)
navigation.navigateTo(MainView.class, SettingsView.class, NetworkSettingsView.class);
else if (newValue == aboutTab)
navigation.navigateTo(MainView.class, SettingsView.class, AboutView.class);
@ -70,9 +75,9 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
navigation.addListener(navigationListener);
Tab selectedItem = root.getSelectionModel().getSelectedItem();
if (selectedItem == preferencesTab)
if (selectedItem == settingsTab)
navigation.navigateTo(MainView.class, SettingsView.class, PreferencesView.class);
else if (selectedItem == networkSettingsTab)
else if (selectedItem == networkTab)
navigation.navigateTo(MainView.class, SettingsView.class, NetworkSettingsView.class);
else if (selectedItem == aboutTab)
navigation.navigateTo(MainView.class, SettingsView.class, AboutView.class);
@ -88,8 +93,8 @@ public class SettingsView extends ActivatableViewAndModel<TabPane, Activatable>
final Tab tab;
View view = viewLoader.load(viewClass);
if (view instanceof PreferencesView) tab = preferencesTab;
else if (view instanceof NetworkSettingsView) tab = networkSettingsTab;
if (view instanceof PreferencesView) tab = settingsTab;
else if (view instanceof NetworkSettingsView) tab = networkTab;
else if (view instanceof AboutView) tab = aboutTab;
else throw new IllegalArgumentException("Navigation to " + viewClass + " is not supported");

4
gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
View File

@ -619,8 +619,8 @@ public class BSFormatter {
public String getPriceWithCurrencyCode(String currencyCode) {
if (CurrencyUtil.isCryptoCurrency(currencyCode))
return Res.get("table.column.priceInCurPerCur.header", "BTC", currencyCode);
return Res.get("shared.priceInCurForCur", "BTC", currencyCode);
else
return Res.get("table.column.priceInCurPerCur.header", currencyCode, "BTC");
return Res.get("shared.priceInCurForCur", currencyCode, "BTC");
}
}

106
gui/src/main/resources/i18n/displayStrings.properties
View File

@ -1,4 +1,4 @@
# Keep display strings organized by domain
# Keep display strings organized by domain
# Naming convention: We use camelCase and dot separated name spaces.
# Use as many sub spaces as required to make the structure clear, but as little as possible.
# E.g.: [main-view].[component].[description]
@ -10,7 +10,7 @@
####################################################################
####################################################################
# Main view
# MainView
####################################################################
mainView.menu.market=Market
@ -57,43 +57,30 @@ mainView.networkWarning.allConnectionsLost=You lost the connection to all {0} ne
####################################################################
# Market
# MarketView
####################################################################
market.tabs.offerBook=Offer book
market.tabs.spread=Spread
market.tabs.trades=Trades
####################################################################
# Market.Offerbook
####################################################################
# OfferBookChartView
market.offerBook.chart.title=Offer book for {0}
market.offerBook.buyOfferHeaderLabel=Offers to sell {0} for {1}
market.offerBook.buyOfferButton=I want to buy {0} (sell {1})
market.offerBook.sellOfferHeaderLabel=Offers to buy {0} with {1}
market.offerBook.sellOfferButton=I want to sell {0} (buy {1})
####################################################################
# Market.Spread
####################################################################
# SpreadView
market.spread.numberOfOffersColumn=All offers ({0})
market.spread.numberOfBuyOffersColumn=Buy BTC ({0})
market.spread.numberOfSellOffersColumn=Sell BTC ({0})
market.spread.totalAmountColumn=Total BTC ({0})
market.spread.spreadColumn=Spread
####################################################################
# Market.Trades
####################################################################
# TradesChartsView
market.trades.nrOfTrades=Trades: {0}
market.trades.tooltip.volumeBar=Volume: {0}\nNo. of trades: {1}\nDate: {2}
market.trades.tooltip.candle.open=Open:
market.trades.tooltip.candle.close=Close:
market.trades.tooltip.candle.high=High:
@ -101,27 +88,64 @@ market.trades.tooltip.candle.low=Low:
market.trades.tooltip.candle.average=Average:
market.trades.tooltip.candle.date=Date:
####################################################################
# OfferView
####################################################################
popup.createOfferTabOpen=You have already a \"Create offer\" tab open.
popup.takeOfferTabOpen=You have already a \"Take offer\" tab open.
# Offerbook/Buy BTC
# Offerbook/Sell BTC
####################################################################
# Portfolio
####################################################################
portfolio.tab.openOffers=My open offers
portfolio.tab.pendingTrades=Open trades
portfolio.tab.history=History
portfolio.openOffer.amountMinMax=BTC (min - max)
portfolio.openOffer.volumeMinMax=Amount (min - max)
portfolio.pending.role=My role
####################################################################
# Funds
####################################################################
funds.tab.deposit=Deposit funds
funds.tab.withdrawal=Available for withdrawal
funds.tab.reserved=Reserved funds
funds.tab.locked=Locked funds
funds.tab.transactions=Transactions
funds.withdrawal.fromLabel=Withdraw from address:
funds.withdrawal.toLabel=Withdraw to address:
funds.withdrawal.withdrawButton=Withdraw selected
####################################################################
# Support
####################################################################
disputesView.tab.support=Support tickets
####################################################################
# Settings
####################################################################
settings.tab.settings=Settings
settings.tab.network=Network info
settings.tab.aboutTab=About
####################################################################
# Account
@ -132,6 +156,10 @@ market.trades.tooltip.candle.date=Date:
# DAO
####################################################################
daoView.tab.bsqWallet=BSQ wallet
daoView.tab.compensation=Compensation
daoView.tab.voting=Voting
####################################################################
# Shared
@ -163,6 +191,33 @@ shared.P2P=P2P
shared.offers=offers
shared.trades=trades
shared.dateTime=Date/Time
shared.price=Price
shared.priceWithCur=Price in {0}
shared.priceInCurForCur=Price in {0} for 1 {1}
shared.amount=Amount
shared.amountWithCur=Amount in {0}
shared.volumeWithCur=Volume in {0}
shared.sumWithCur=Sum in {0}
shared.currency=Currency
shared.market=Market
shared.paymentMethod=Payment method
shared.tradeType=Trade type
shared.details=Details
shared.address=Address
shared.balanceWithCur=Balance in {0}
shared.txId=Transaction ID
shared.confirmations=Confirmations
shared.revert=Revert Tx
shared.select=Select
shared.usage=Usage
shared.state=Status
shared.tradeId=Trade ID
shared.offerId=Offer ID
shared.direction=Direction
####################################################################
# Component specific
####################################################################
@ -171,22 +226,9 @@ list.currency.select=Select currency
list.currency.showAll=Show all
list.currency.editList=Edit currency list
label.currency=Currency:
table.placeholder.noItems=Currently there are no {0} available
table.placeholder.noData=Currently there is no data available
table.column.dateTime.header=Date/Time
table.column.price.header=Price
table.column.priceWithCur.header=Price in {0}
table.column.priceInCurPerCur.header=Price in {0} for 1 {1}
table.column.amount.header=Amount
table.column.amountWithCur.header=Amount in {0}
table.column.volumeWithCur.header=Volume in {0}
table.column.sumWithCur.header=Sum in {0}
table.column.currency.header=Currency
table.column.market.header=Market
table.column.paymentMethod.header=Payment method
table.column.tradeType.header=Trade type
button.buy=I want to buy bitcoin
button.sell=I want to sell bitcoin

8
gui/src/main/resources/i18n/in_dev/displayStrings_ae.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=اقرأ أكثر
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ba.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Čitaj više
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_br.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Leia mais
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_cn.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=阅读更多
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_cz.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Čtěte více
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_de.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Weiterlesen
@ -27,7 +27,7 @@ app.shutdown.text=Das Herunterfahren der Anwendung kann einige Sekunden dauern.\
# Payment methods
payment.account.no=Kontonummer:
label.currency=Währung:
shared.currency=Währung:
payment.account.name=Kontoname:
payment.payment.method=Zahlungsmethode:
payment.account.owner=Kontoinhaber:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Akzeptierte Länder:
createOffer.advancedBox.languages=Akzeptierte Sprachen:
createOffer.advancedBox.arbitrators=Akzeptierte Schiedsrichter:
createOffer.advancedBox.txType=Zahlungsmethode:
label.currency=Währung:
shared.currency=Währung:
createOffer.advancedBox.county=Land des Zahlungskontos:
createOffer.advancedBox.info=Ihre Handelspartner müssen Ihre Angebotsbeschränkungen erfüllen. Sie können die akzeptierten Länder, Sprachen und Schiedsrichter in den Einstellungen bearbeiten. Die Zahlungskonto-Details werden von Ihrem aktuellen ausgewählten Zahlungskonto (wenn Sie mehrere Zahlungskonten haben) verwendet.
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Akzeptierte Länder:
takeOffer.advancedBox.languages=Akzeptierte Sprachen:
takeOffer.advancedBox.arbitrators=Akzeptierte Schiedsrichter:
takeOffer.advancedBox.txType=Zahlungsmethode:
label.currency=Währung:
shared.currency=Währung:
takeOffer.advancedBox.county=Land des Zahlungskontos:
takeOffer.advancedBox.info=Dies sind die Angebotsbeschränkungen, die Ihr Handelspartner in seinem Angebot definiert hat. \
Ihre Einstellungen entsprechen den Einschränkungen und Sie können mit ihm handeln.

8
gui/src/main/resources/i18n/in_dev/displayStrings_dk.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Læs mere
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_en.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# Shared
shared.readMore=Read more
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_es.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Lee más
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -135,7 +135,7 @@ createOffer.advancedBox.countries=Países aceptados:
createOffer.advancedBox.languages=Idiomas aceptados:
createOffer.advancedBox.arbitrators=Árbitros aceptados:
createOffer.advancedBox.txType=Métodos de pago:
label.currency=Moneda:
shared.currency=Moneda:
createOffer.advancedBox.county=País de pago:
createOffer.advancedBox.info=Los socios comerciales deben cumplir las restricciones de su oferta. Puede editar los países aceptados, idiomas y árbitros en las configuraciones. Los detalles de cuentas de pago son usados desde su cuenta de pago actualmente seleccionada (si tiene múltiples cuentas de pago).
@ -194,7 +194,7 @@ takeOffer.advancedBox.countries=Países aceptados:
takeOffer.advancedBox.languages=Lenguajes aceptados:
takeOffer.advancedBox.arbitrators=Árbitros aceptados:
takeOffer.advancedBox.txType=Métodos de pago:
label.currency=Moneda:
shared.currency=Moneda:
takeOffer.advancedBox.county=País de pago:
takeOffer.advancedBox.info=Estas son las restricciones que su socio comercial ha definido en su oferta. \
Sus configuraciones cumplen esas limitaciones y puede comerciar con él.

8
gui/src/main/resources/i18n/in_dev/displayStrings_fi.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Lue lisää
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_fr.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Lire la suite
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ge.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=წაიკითხე მეტი
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_gr.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Διαβάστε περισσότερα
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_hr.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Pročitaj Više
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -135,7 +135,7 @@ createOffer.advancedBox.countries=Prihvaćene zemlje:
createOffer.advancedBox.languages=Prihvaćeni jezici:
createOffer.advancedBox.arbitrators=Prihvaćeni arbitri:
createOffer.advancedBox.txType=Metoda plaćanja:
label.currency=Valuta:
shared.currency=Valuta:
createOffer.advancedBox.county=Zemlja računa za plaćanja:
createOffer.advancedBox.info=Vaš trgovinski partner mora ispunjavati uvjete vaše ponude. Možete promijeniti prihvaćene zemlje, jezike, arbitre u postavkama. Detalji računa za plaćanja preuzeti su iz vašeg trenutno odabranog računa za plaćanja(ako imate više računa za plaćanja).
@ -194,7 +194,7 @@ takeOffer.advancedBox.countries=Prihvaćene zemlje:
takeOffer.advancedBox.languages=Prihvaćeni jezici:
takeOffer.advancedBox.arbitrators=Prihvaćeni arbitri:
takeOffer.advancedBox.txType=Metoda plaćanja:
label.currency=Valuta:
shared.currency=Valuta:
takeOffer.advancedBox.county=Zemlja računa za plaćanja:
takeOffer.advancedBox.info=Ovo su ograničenja ponude koje postavio vaš trgovinski partner u svojoj ponudi. \
Vaše postavke podudaraju se sa tim uvjetima i moguća je razmjena sa njim.

8
gui/src/main/resources/i18n/in_dev/displayStrings_hu.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Olvass tovább
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_id.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Baca lebih banyak
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ie.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=קרא עוד
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_in.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=अधिक पढ़ें
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_is.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Lestu meira
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

6
gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
View File

@ -27,7 +27,7 @@ app.shutdown.text=Lo spegnimento dell'applicazione può richiedere un po' di sec
# Payment methods
payment.account.no=Account n.:
label.currency=Moneta:
shared.currency=Moneta:
payment.account.name=Nome account:
payment.payment.method=Metodo pagamento:
payment.account.owner=Nome del titolare:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Paesi accettati:
createOffer.advancedBox.languages=Lingue accettate:
createOffer.advancedBox.arbitrators=Arbitri accettati:
createOffer.advancedBox.txType=Metodi di pagamento:
label.currency=Moneta:
shared.currency=Moneta:
createOffer.advancedBox.county=Paese conto pagamenti:
createOffer.advancedBox.info=I tuoi partner di compravendita devono soddisfare le ristrizzioni della tua offerta. Nelle impostazioni puoi modificare i paesi accettati, lingue e arbitri. I dettagli usati per account di pagamenti provengono dai tuoi attuali account di pagamenti selezionati (se hai più account di pagamenti).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Paesi accettati:
takeOffer.advancedBox.languages=Lingue accettate:
takeOffer.advancedBox.arbitrators=Arbitri accettati:
takeOffer.advancedBox.txType=Metodi di pagamento:
label.currency=Moneta:
shared.currency=Moneta:
takeOffer.advancedBox.county=Paese conto pagamenti:
takeOffer.advancedBox.info=Queste sono le reistrizioni di offerta che il tuo partner di compravendita ha definito nella sua offerta. \
Le tue impostazioni combaciano quei vincoli e si abilitato a commerciare con lui.

8
gui/src/main/resources/i18n/in_dev/displayStrings_jp.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=続きを読む
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_kg.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Толук маалымат
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_kr.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=자세히보기
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_kz.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Ары қарай оқу
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_lt.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Skaityti daugiau
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_my.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Baca lebih lanjut
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_nl.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Lees verder
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_no.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Les mer
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_nz.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Pānuitia atu
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ph.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Magbasa nang higit pa
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_pl.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Czytaj więcej
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

6
gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Leia mais
@ -84,7 +84,7 @@ createOffer.advancedBox.countries=Países aceites:
createOffer.advancedBox.languages=Línguas aceites:
createOffer.advancedBox.arbitrators=Mediadores aceites:
createOffer.advancedBox.txType=Método de pagamento:
label.currency=Moeda:
shared.currency=Moeda:
createOffer.advancedBox.county=País da conta de pagamento:
createOffer.advancedBox.info=Os seus parceiros na troca terão que obedecer às restrições da sua oferta. Você pode editar os países aceites, línguas e mediadores nas opções. Serão usados os detalhes da conta de pagamento selecionada (caso tenha várias contas de pagamento).
@ -143,7 +143,7 @@ takeOffer.advancedBox.countries=Países aceites:
takeOffer.advancedBox.languages=Línguas aceites:
takeOffer.advancedBox.arbitrators=Mediadores aceites:
takeOffer.advancedBox.txType=Método de pagamento:
label.currency=Moeda:
shared.currency=Moeda:
takeOffer.advancedBox.county=País da conta de pagamento:
takeOffer.advancedBox.info=Estas são as restrições da oferta que o seu parceiro de troca definiu. \
As suas opções de troca combinam com essas restrições e você pode trocar com ele.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ro.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Citeste mai mult
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ru.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Прочитайте больше
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_se.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Läs mer
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_th.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=อ่านเพิ่มเติม
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_ua.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=докладніше
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_uz.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Ko'proq o'qing
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.

8
gui/src/main/resources/i18n/in_dev/displayStrings_vn.properties
View File

@ -1,4 +1,4 @@
# Used by gui/components/infoDisplay.java
# Used by gui/components/infoDisplay.java
# shared
shared.readMore=Đọc thêm
@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
# Payment methods
payment.account.no=Account no.:
label.currency=Currency:
shared.currency=Currency:
payment.account.name=Account name:
payment.payment.method=Payment method:
payment.account.owner=Account holder name:
@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
createOffer.advancedBox.languages=Accepted languages:
createOffer.advancedBox.arbitrators=Accepted arbitrators:
createOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
createOffer.advancedBox.county=Payments account country:
createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
@ -195,7 +195,7 @@ takeOffer.advancedBox.countries=Accepted countries:
takeOffer.advancedBox.languages=Accepted languages:
takeOffer.advancedBox.arbitrators=Accepted arbitrators:
takeOffer.advancedBox.txType=Payments method:
label.currency=Currency:
shared.currency=Currency:
takeOffer.advancedBox.county=Payments account country:
takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \
Your settings match those constraints and you are able to trade with him.