diff --git a/core/src/main/java/io/bitsquare/locale/Res.java b/core/src/main/java/io/bitsquare/locale/Res.java
index b5c3bf88da..bf578af07a 100644
--- a/core/src/main/java/io/bitsquare/locale/Res.java
+++ b/core/src/main/java/io/bitsquare/locale/Res.java
@@ -40,6 +40,9 @@ public class Res {
     }
 
     public static String get(String key) {
+        // TODO remove once translation done
+        // for testing missing translation strings
+        // if (true) return "#";
         try {
             return Res.getResourceBundle().getString(key);
         } catch (MissingResourceException e) {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
index f9dce73097..b373162108 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
+++ b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
@@ -25,7 +25,7 @@
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">
 
-    <Tab fx:id="chartsTab" text="Offer book" closable="false"/>
-    <Tab fx:id="statisticsTab" text="Spreads" closable="false"/>
-    <Tab fx:id="tradesTab" text="Trades" closable="false"/>
+    <Tab fx:id="offerBookTab" closable="false"/>
+    <Tab fx:id="spreadTab" closable="false"/>
+    <Tab fx:id="tradesTab" closable="false"/>
 </TabPane>
diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java
index e31ecb0bf3..c235d517cb 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/market/MarketView.java
@@ -24,6 +24,7 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.market.offerbook.OfferBookChartView;
 import io.bitsquare.gui.main.market.spread.SpreadView;
 import io.bitsquare.gui.main.market.trades.TradesChartsView;
+import io.bitsquare.locale.Res;
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.Tab;
@@ -34,7 +35,7 @@ import javax.inject.Inject;
 @FxmlView
 public class MarketView extends ActivatableViewAndModel<TabPane, Activatable> {
     @FXML
-    Tab chartsTab, tradesTab, statisticsTab;
+    Tab offerBookTab, tradesTab, spreadTab;
     private final ViewLoader viewLoader;
     private final Navigation navigation;
     private Navigation.Listener navigationListener;
@@ -48,17 +49,21 @@ public class MarketView extends ActivatableViewAndModel<TabPane, Activatable> {
 
     @Override
     public void initialize() {
+        offerBookTab.setText(Res.get("market.tabs.offerBook"));
+        spreadTab.setText(Res.get("market.tabs.spread"));
+        tradesTab.setText(Res.get("market.tabs.trades"));
+        
         navigationListener = viewPath -> {
             if (viewPath.size() == 3 && viewPath.indexOf(MarketView.class) == 1)
                 loadView(viewPath.tip());
         };
 
         tabChangeListener = (ov, oldValue, newValue) -> {
-            if (newValue == chartsTab)
+            if (newValue == offerBookTab)
                 navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class);
             else if (newValue == tradesTab)
                 navigation.navigateTo(MainView.class, MarketView.class, TradesChartsView.class);
-            else if (newValue == statisticsTab)
+            else if (newValue == spreadTab)
                 navigation.navigateTo(MainView.class, MarketView.class, SpreadView.class);
         };
     }
@@ -68,7 +73,7 @@ public class MarketView extends ActivatableViewAndModel<TabPane, Activatable> {
         root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
         navigation.addListener(navigationListener);
 
-        if (root.getSelectionModel().getSelectedItem() == chartsTab)
+        if (root.getSelectionModel().getSelectedItem() == offerBookTab)
             navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class);
         else if (root.getSelectionModel().getSelectedItem() == tradesTab)
             navigation.navigateTo(MainView.class, MarketView.class, TradesChartsView.class);
@@ -86,9 +91,9 @@ public class MarketView extends ActivatableViewAndModel<TabPane, Activatable> {
         final Tab tab;
         View view = viewLoader.load(viewClass);
 
-        if (view instanceof OfferBookChartView) tab = chartsTab;
+        if (view instanceof OfferBookChartView) tab = offerBookTab;
         else if (view instanceof TradesChartsView) tab = tradesTab;
-        else if (view instanceof SpreadView) tab = statisticsTab;
+        else if (view instanceof SpreadView) tab = spreadTab;
         else throw new IllegalArgumentException("Navigation to " + viewClass + " is not supported");
 
         tab.setContent(view.getRoot());
diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
index 33c6d43ce3..74b7919af2 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
@@ -90,6 +90,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
     // Constructor, lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @SuppressWarnings("WeakerAccess")
     @Inject
     public OfferBookChartView(OfferBookChartViewModel model, Navigation navigation, BSFormatter formatter) {
         super(model);
@@ -107,10 +108,10 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         };
 
         currencyComboBox = new ComboBox<>();
-        currencyComboBox.setPromptText("Select currency");
-        currencyComboBox.setConverter(GUIUtil.getCurrencyListItemConverter("offers", model.preferences));
+        currencyComboBox.setPromptText(Res.get("list.currency.select"));
+        currencyComboBox.setConverter(GUIUtil.getCurrencyListItemConverter(Res.get("shared.offers"), model.preferences));
 
-        Label currencyLabel = new Label("Currency:");
+        Label currencyLabel = new Label(Res.get("label.currency"));
         HBox currencyHBox = new HBox();
         currencyHBox.setSpacing(5);
         currencyHBox.setPadding(new Insets(5, -20, -5, 20));
@@ -135,8 +136,8 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         bottomHBox.setAlignment(Pos.CENTER);
         HBox.setHgrow(tupleBuy.second, Priority.ALWAYS);
         HBox.setHgrow(tupleSell.second, Priority.ALWAYS);
-        tupleBuy.second.setUserData("BUY");
-        tupleSell.second.setUserData("SELL");
+        tupleBuy.second.setUserData(Offer.Direction.BUY.name());
+        tupleSell.second.setUserData(Offer.Direction.SELL.name());
         bottomHBox.getChildren().addAll(tupleBuy.second, tupleSell.second);
 
         root.getChildren().addAll(currencyHBox, areaChart, bottomHBox);
@@ -171,8 +172,8 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         tradeCurrencySubscriber = EasyBind.subscribe(model.selectedTradeCurrencyProperty,
                 tradeCurrency -> {
                     String code = tradeCurrency.getCode();
-                    areaChart.setTitle("Offer book for " + formatter.getCurrencyNameAndCurrencyPair(code));
-                    volumeColumnLabel.set("Amount in " + code);
+                    areaChart.setTitle(Res.get("market.offerBook.chart.title", formatter.getCurrencyNameAndCurrencyPair(code)));
+                    volumeColumnLabel.set(Res.get("table.column.amount.header", code));
                     xAxis.setTickLabelFormatter(new StringConverter<Number>() {
                         @Override
                         public String toString(Number object) {
@@ -195,30 +196,31 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
                     });
 
                     if (CurrencyUtil.isCryptoCurrency(code)) {
-                        if (bottomHBox.getChildren().size() == 2 && bottomHBox.getChildren().get(0).getUserData().equals("BUY")) {
+                        if (bottomHBox.getChildren().size() == 2 && bottomHBox.getChildren().get(0).getUserData().equals(Offer.Direction.BUY.name())) {
                             bottomHBox.getChildren().get(0).toFront();
                             reverseTableColumns();
                         }
 
-                        buyOfferHeaderLabel.setText("Offers to sell " + code + " for BTC");
-                        buyOfferButton.setText("I want to buy " + code + " (sell BTC)");
+                        buyOfferHeaderLabel.setText(Res.get("market.offerBook.buyOfferHeaderLabel", code, "BTC"));
+                        buyOfferButton.setText(Res.get("market.offerBook.buyOfferButton", code, "BTC"));
 
-                        sellOfferHeaderLabel.setText("Offers to buy " + code + " with BTC");
-                        sellOfferButton.setText("I want to sell " + code + " (buy BTC)");
+                        sellOfferHeaderLabel.setText(Res.get("market.offerBook.sellOfferHeaderLabel", code, "BTC"));
+                        sellOfferButton.setText(Res.get("market.offerBook.sellOfferButton", code, "BTC"));
 
-                        priceColumnLabel.set("Price in BTC");
+                        priceColumnLabel.set(Res.get("table.column.price.header", "BTC"));
                     } else {
-                        if (bottomHBox.getChildren().size() == 2 && bottomHBox.getChildren().get(0).getUserData().equals("SELL")) {
+                        if (bottomHBox.getChildren().size() == 2 && bottomHBox.getChildren().get(0).getUserData().equals(Offer.Direction.SELL.name())) {
                             bottomHBox.getChildren().get(0).toFront();
                             reverseTableColumns();
                         }
-                        buyOfferHeaderLabel.setText("Offers to buy BTC with " + code);
-                        buyOfferButton.setText("I want to sell BTC for " + code);
 
-                        sellOfferHeaderLabel.setText("Offers to sell BTC for " + code);
-                        sellOfferButton.setText("I want to buy BTC with " + code);
+                        buyOfferHeaderLabel.setText(Res.get("market.offerBook.buyOfferHeaderLabel", "BTC", code));
+                        buyOfferButton.setText(Res.get("market.offerBook.buyOfferButton", "BTC", code));
 
-                        priceColumnLabel.set("Price in " + code);
+                        sellOfferHeaderLabel.setText(Res.get("market.offerBook.sellOfferHeaderLabel", "BTC", code));
+                        sellOfferButton.setText(Res.get("market.offerBook.sellOfferButton", "BTC", code));
+
+                        priceColumnLabel.set(Res.get("table.column.price.header", code));
                     }
                     xAxis.setLabel(formatter.getPriceWithCurrencyCode(code));
 
@@ -261,7 +263,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         yAxis = new NumberAxis();
         yAxis.setForceZeroInRange(false);
         yAxis.setAutoRanging(true);
-        yAxis.setLabel("Amount in BTC");
+        yAxis.setLabel(Res.get("chart.yAxis.amount.label", "BTC"));
         yAxis.setTickLabelFormatter(new NumberAxis.DefaultFormatter(yAxis, "", ""));
 
         seriesBuy = new XYChart.Series<>();
@@ -287,13 +289,13 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
     private Tuple4<TableView<OfferListItem>, VBox, Button, Label> getOfferTable(Offer.Direction direction) {
         TableView<OfferListItem> tableView = new TableView<>();
         tableView.setMinHeight(109);
-        tableView.setMinWidth(480); //530
+        tableView.setMinWidth(480);
 
         // price
         TableColumn<OfferListItem, OfferListItem> priceColumn = new TableColumn<>();
         priceColumn.textProperty().bind(priceColumnLabel);
-        priceColumn.setMinWidth(115); //130
-        priceColumn.setMaxWidth(115); //130
+        priceColumn.setMinWidth(115);
+        priceColumn.setMaxWidth(115);
         priceColumn.setSortable(false);
         priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         priceColumn.setCellFactory(
@@ -302,7 +304,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
                     public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem, OfferListItem> column) {
                         return new TableCell<OfferListItem, OfferListItem>() {
                             private Offer offer;
-                            ChangeListener<Number> listener = new ChangeListener<Number>() {
+                            final ChangeListener<Number> listener = new ChangeListener<Number>() {
                                 @Override
                                 public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
                                     if (offer != null && offer.getPrice() != null) {
@@ -336,7 +338,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
 
         // volume
         TableColumn<OfferListItem, OfferListItem> volumeColumn = new TableColumn<>();
-        volumeColumn.setMinWidth(115); //125
+        volumeColumn.setMinWidth(115);
         volumeColumn.setSortable(false);
         volumeColumn.textProperty().bind(volumeColumnLabel);
         volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
@@ -346,7 +348,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
                     public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem, OfferListItem> column) {
                         return new TableCell<OfferListItem, OfferListItem>() {
                             private Offer offer;
-                            ChangeListener<Number> listener = new ChangeListener<Number>() {
+                            final ChangeListener<Number> listener = new ChangeListener<Number>() {
                                 @Override
                                 public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
                                     if (offer != null && offer.getPrice() != null) {
@@ -380,8 +382,8 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
                 });
 
         // amount
-        TableColumn<OfferListItem, OfferListItem> amountColumn = new TableColumn<>("Amount in BTC");
-        amountColumn.setMinWidth(115); //125
+        TableColumn<OfferListItem, OfferListItem> amountColumn = new TableColumn<>(Res.get("table.column.amount.header", "BTC"));
+        amountColumn.setMinWidth(115);
         amountColumn.setSortable(false);
         amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         amountColumn.setCellFactory(
@@ -402,8 +404,8 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
                 });
 
         // accumulated
-        TableColumn<OfferListItem, OfferListItem> accumulatedColumn = new TableColumn<>("Sum in BTC");
-        accumulatedColumn.setMinWidth(100);//130
+        TableColumn<OfferListItem, OfferListItem> accumulatedColumn = new TableColumn<>(Res.get("table.column.sum.header", "BTC"));
+        accumulatedColumn.setMinWidth(100);
         accumulatedColumn.setSortable(false);
         accumulatedColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         accumulatedColumn.setCellFactory(
@@ -436,7 +438,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         }
 
         tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
-        Label placeholder = new Label("Currently there are no offers available");
+        Label placeholder = new Label(Res.get("table.placeholder", Res.get("shared.offers")));
         placeholder.setWrapText(true);
         tableView.setPlaceholder(placeholder);
 
@@ -450,7 +452,7 @@ public class OfferBookChartView extends ActivatableViewAndModel<VBox, OfferBookC
         iconView.setId(isSellOffer ? "image-buy-white" : "image-sell-white");
         button.setGraphic(iconView);
         button.setGraphicTextGap(10);
-        button.setText(isSellOffer ? "I want to buy bitcoin" : "I want to sell bitcoin");
+        button.setText(isSellOffer ? Res.get("button.buy") : Res.get("button.sell"));
         button.setMinHeight(40);
         button.setId(isSellOffer ? "buy-button-big" : "sell-button-big");
         button.setOnAction(e -> {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java
index e5f5a000df..bc8c203349 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartViewModel.java
@@ -58,7 +58,7 @@ class OfferBookChartViewModel extends ActivatableViewModel {
     private final OfferBook offerBook;
     final Preferences preferences;
     final PriceFeedService priceFeedService;
-    private Navigation navigation;
+    private final Navigation navigation;
 
     final ObjectProperty<TradeCurrency> selectedTradeCurrencyProperty = new SimpleObjectProperty<>();
     private final List<XYChart.Data> buyData = new ArrayList<>();
@@ -76,6 +76,7 @@ class OfferBookChartViewModel extends ActivatableViewModel {
     // Constructor, lifecycle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    @SuppressWarnings("WeakerAccess")
     @Inject
     public OfferBookChartViewModel(OfferBook offerBook, Preferences preferences, PriceFeedService priceFeedService, Navigation navigation) {
         this.offerBook = offerBook;
diff --git a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
index 1de516d388..99644ca026 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
@@ -26,6 +26,7 @@ import io.bitsquare.app.DevFlags;
 import io.bitsquare.common.util.Utilities;
 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.payment.PaymentAccount;
 import io.bitsquare.storage.Storage;
@@ -183,9 +184,9 @@ public class GUIUtil {
                 TradeCurrency tradeCurrency = item.tradeCurrency;
                 String code = tradeCurrency.getCode();
                 if (code.equals(GUIUtil.SHOW_ALL_FLAG))
-                    return "▶ Show all";
+                    return "▶ " + Res.get("list.currency.showAll");
                 else if (code.equals(GUIUtil.EDIT_FLAG))
-                    return "▼ Edit currency list";
+                    return "▼ " + Res.get("list.currency.editList");
                 else {
                     String displayString = CurrencyUtil.getNameByCode(code) + " (" + code + ")";
                     if (preferences.getSortMarketCurrenciesNumerically())
diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties
index de9188af7f..c9aee1a75d 100644
--- a/gui/src/main/resources/i18n/displayStrings.properties
+++ b/gui/src/main/resources/i18n/displayStrings.properties
@@ -31,7 +31,6 @@ mainView.balance.reserved=Reserved in offers
 mainView.balance.locked=Locked in trades
 
 mainView.footer.usingTor=(using Tor)
-
 mainView.footer.btcInfo=Bitcoin network peers: {0} / {1} {2} {3}
 mainView.footer.btcInfo.initializing=Initializing
 mainView.footer.btcInfo.synchronizedWith=synchronized with
@@ -65,8 +64,25 @@ market.tabs.offerBook=Offer book
 market.tabs.spread=Spread
 market.tabs.trades=Trades
 
+
 ####################################################################
-# Offerbook
+# Market.Offerbook
+####################################################################
+
+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
+####################################################################
+
+
+####################################################################
+# Market.Trades
 ####################################################################
 
 
@@ -103,169 +119,6 @@ market.tabs.trades=Trades
 ####################################################################
 
 
-####################################################################
-# Popups
-####################################################################
-
-popup.headline.notification=Notification
-popup.headline.instruction=Please note:
-popup.headline.attention=Attention
-popup.headline.backgroundInfo=Background information
-popup.headline.feedback=Completed
-popup.headline.confirmation=Confirmation
-popup.headline.information=Information
-popup.headline.warning=Warning
-popup.headline.error=Error
-
-popup.error.fatalStartupException=A fatal exception occurred at startup.
-popup.error.walletException=Cannot open wallet because of an exception:\n{0}
-
-popup.warning.walletNotInitialized=The wallet is not initialized yet
-popup.warning.wrongVersion=You probably have the wrong Bitsquare version for this computer.\nYour computer's architecture is: {0}.\nThe Bitsquare binary you installed is: {1}.\nPlease shut down and re-install the correct version ({2}).
-popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a newdatabase version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bitsquare installed.\nYou can download it at:\nhttps://bitsquare.io/downloads\n\nPlease restart the application.
-popup.warning.cannotConnectAtStartup=You still did not get connected to the {0} network.\nIf you use Tor for Bitcoin it might be that you got an unstable Tor circuit.\nYou can wait longer or try to restart.
-popup.warning.unknownProblemAtStartup=There is an unknown problem at startup.\nPlease restart and if the problem continues file a bug report.
-popup.warning.startupFailed.timeout=The application could not startup after 4 minutes.\n\n{0}
-popup.warning.startupFailed.twoInstances=Bitsquare is already running. You cannot run two instances of Bitsquare.
-popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bitsquare binary, please file a bug report to the Github page.\nError={0}
-popup.warning.noBountyCastle=There is a problem with the crypto libraries. BountyCastle is not available.
-popup.warning.oldOffers.msg=You have open offers which have been created with an older version of Bitsquare.\nPlease remove those offers as they are not valid anymore.\n\nOffers (ID): {0}
-popup.warning.oldOffers.buttonText=Remove outdated offer(s)
-popup.warning.tradePeriod.halfReached=Your trade with ID {0} has reached the half of the max. allowed trading period and is still not completed.\n\nThe trade period ends on {1}\n\nPlease check your trade state at \"Portfolio/Open trades\" for further information.
-popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator.
-
-popup.privateNotification.headline=Important private notification!
-
-popup.securityRecommendation.headline=Important security recommendation
-popup.securityRecommendation.msg=We would like to remind you to consider using password protection for your wallet if you have not already enabled that.\n\nIt is also highly recommended to write down the wallet seed words. Those seed words are like a master password for recovering your Bitcoin wallet.\nAt the \"Wallet Seed\" section you find more information.\n\nAdditionally you should backup the complete application data folder at the \"Backup\" section.
-
-popup.shutDownInProgress.headline=Shut down in progress
-popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.
-
-
-####################################################################
-# Offerbook / Create offer
-####################################################################
-
-createOffer.amount.prompt=Enter amount in BTC
-createOffer.price.prompt=Enter price
-createOffer.volume.prompt=Enter amount in {0}
-createOffer.minAmount.prompt=Enter min. amount
-
-createOffer.amountPriceBox.title=Create your offer
-createOffer.amountPriceBox.amountDescription=Amount of bitcoin to {0}
-createOffer.amountPriceBox.priceDescriptionFiat=Fixed price per {0}
-createOffer.amountPriceBox.buy.volumeDescription=Amount in {0} to spend
-createOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to receive
-createOffer.amountPriceBox.minAmountDescription=Minimum amount of bitcoin
-createOffer.amountPriceBox.buy.info=Define a price for which you want to buy bitcoin and either enter the amount or the trade volume. With the minimum amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
-createOffer.amountPriceBox.sell.info=Define a price for which you want to sell bitcoin and either enter the amount or the trade volume. With the minimum  amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
-createOffer.amountPriceBox.next=Next step
-createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
-createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted.
-createOffer.amountPriceBox.warning.adjustedVolume=The total volume you have entered leads to invalid fractional bitcoin amounts. The amount has been adjusted and a new total volume be calculated from it.
-createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n{0}
-createOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount.
-createOffer.validation.minAmountLargerThanAmount=Minimum amount cannot be larger than amount.
-
-createOffer.securityDeposit.prompt=Security deposit in BTC
-createOffer.securityDepositBox.description=Customize security deposit
-
-createOffer.fundsBox.title=Fund your offer
-createOffer.fundsBox.totalsNeeded=Funds needed:
-createOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
-createOffer.fundsBox.address=Trade wallet address:
-createOffer.fundsBox.balance=Trade wallet balance:
-createOffer.fundsBox.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. Those funds are reserved and will be used in the case that your offer gets executed. If you cancel your offer you can withdraw your funds from that trading wallet. The only payment made when placing an offer is the offer fee payment. https://bitsquare.io/faq/#6
-createOffer.fundsBox.tradeAmount=Trade amount:
-createOffer.fundsBox.securityDeposit=Security deposit:
-createOffer.fundsBox.offerFee=Create offer fee:
-createOffer.fundsBox.networkFee=Mining fee:
-createOffer.fundsBox.total=Total:
-createOffer.fundsBox.showAdvanced=Show advanced settings
-createOffer.fundsBox.hideAdvanced=Hide advanced settings
-createOffer.fundsBox.placeOffer=Place offer
-createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ...
-createOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0}
-
-createOffer.advancedBox.title=Advanced settings
-createOffer.advancedBox.countries=Accepted countries:
-createOffer.advancedBox.languages=Accepted languages:
-createOffer.advancedBox.arbitrators=Accepted arbitrators:
-createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.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).
-
-createOffer.success.headline=Your offer has been published
-createOffer.success.info=You can manage your open offers in the \"Portfolio\" screen under \"My open offers\".
-   
-createOffer.error.message=An error occurred when placing the offer.\n\n{0}
-
-
-####################################################################
-# Offerbook / Take offer
-####################################################################
-
-takeOffer.amount.prompt=Enter amount in BTC
-takeOffer.price.prompt=Enter price
-takeOffer.volume.prompt=Enter amount in {0}
-takeOffer.minAmount.prompt=Enter min. amount
-
-takeOffer.amountPriceBox.title=Take offer
-takeOffer.amountPriceBox.subTitle=Buy bitcoin
-takeOffer.amountPriceBox.buy.amountDescription=Amount of bitcoin to sell
-takeOffer.amountPriceBox.sell.amountDescription=Amount of bitcoin to buy
-takeOffer.amountPriceBox.priceDescription=Price per bitcoin in {0}
-takeOffer.amountPriceBox.buy.volumeDescription=Receiving amount in {0}
-takeOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to spend
-takeOffer.amountPriceBox.amountRangeDescription=Possible amount range
-takeOffer.securityDepositBox.description=Security deposit for offer
-takeOffer.amountPriceBox.buy.info=Enter the amount of bitcoin you want to sell. You can choose an amount between the minimum amount and the amount.
-takeOffer.amountPriceBox.sell.info=Enter the amount of bitcoin you want to buy. You can choose an amount between the minimum amount and the amount.
-takeOffer.amountPriceBox.next=Next step
-takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
-takeOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount defined in the offer.
-takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher than the amount defined in the offer.
-takeOffer.validation.amountLargerThanOfferAmountMinusFee=That input amount would create dust change for the BTC seller.
-
-takeOffer.fundsBox.title=Fund your trade
-takeOffer.fundsBox.isOfferAvailable=Check if offer is available ...
-takeOffer.fundsBox.totalsNeeded=Funds needed:
-takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
-takeOffer.fundsBox.address=Trade wallet address:
-takeOffer.fundsBox.balance=Trade wallet balance:
-takeOffer.fundsBox.buy.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
-  Those funds will be paid in to a locked deposit address. At the end of a successful trade you will get back your security deposit and the bitcoin amount you sold will be transferred \
-  to the BTC buyer.
-takeOffer.fundsBox.sell.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
-  Those funds will be paid into a locked deposit address. At the end of a successful trade you will get back your security deposit.
-takeOffer.fundsBox.tradeAmount=Amount to sell:
-takeOffer.fundsBox.securityDeposit=Security deposit:
-takeOffer.fundsBox.offerFee=Take offer fee:
-takeOffer.fundsBox.networkFee=Mining fees (3x):
-takeOffer.fundsBox.total=Total:
-takeOffer.fundsBox.showAdvanced=Show advanced settings
-takeOffer.fundsBox.hideAdvanced=Hide advanced settings
-takeOffer.fundsBox.takeOffer=Take offer
-takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ...
-takeOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0}
-
-takeOffer.advancedBox.title=Advanced settings
-takeOffer.advancedBox.countries=Accepted countries:
-takeOffer.advancedBox.languages=Accepted languages:
-takeOffer.advancedBox.arbitrators=Accepted arbitrators:
-takeOffer.advancedBox.txType=Payments method:
-takeOffer.advancedBox.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.
-
-takeOffer.success.headline=You have successfully taken an offer.
-takeOffer.success.info=You can see the status of your trade at the \"Portfolio\" screen under \"Open trades\".
-takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
-
-
 ####################################################################
 # Shared
 ####################################################################
@@ -293,6 +146,28 @@ shared.spend=spend
 
 shared.bitcoin=bitcoin
 shared.P2P=P2P
+shared.offers=offers
+
+####################################################################
+# Component specific
+####################################################################
+
+list.currency.select=Select currency
+list.currency.showAll=Show all
+list.currency.editList=Edit currency list
+
+label.currency=Currency:
+
+table.placeholder=Currently there are no {0} available
+table.column.price.header=Price in {0}
+table.column.amount.header=Amount in {0}
+table.column.sum.header=Sum in {0}
+
+chart.yAxis.amount.label=Amount in {0}
+
+button.buy=I want to buy bitcoin
+button.sell=I want to sell bitcoin
+
 
 
 ####################################################################
@@ -315,7 +190,6 @@ REGTEST=Regtest
 ####################################################################
 
 payment.account.no=Account no.:
-payment.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -323,7 +197,6 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -418,3 +291,169 @@ validation.sortCodeChars={0} must consist of {1} characters.
 validation.bankIdNumber={0} must consist of {1} numbers.
 validation.accountNr=Account number must consist of {0} numbers.
 validation.accountNrChars=Account number must consist of {0} characters.
+
+
+
+
+####################################################################
+# Popups
+####################################################################
+
+popup.headline.notification=Notification
+popup.headline.instruction=Please note:
+popup.headline.attention=Attention
+popup.headline.backgroundInfo=Background information
+popup.headline.feedback=Completed
+popup.headline.confirmation=Confirmation
+popup.headline.information=Information
+popup.headline.warning=Warning
+popup.headline.error=Error
+
+popup.error.fatalStartupException=A fatal exception occurred at startup.
+popup.error.walletException=Cannot open wallet because of an exception:\n{0}
+
+popup.warning.walletNotInitialized=The wallet is not initialized yet
+popup.warning.wrongVersion=You probably have the wrong Bitsquare version for this computer.\nYour computer's architecture is: {0}.\nThe Bitsquare binary you installed is: {1}.\nPlease shut down and re-install the correct version ({2}).
+popup.warning.incompatibleDB=We detected incompatible data base files!\n\nThose database file(s) are not compatible with our current code base:\n{0}\n\nWe made a backup of the corrupted file(s) and applied the default values to a newdatabase version.\n\nThe backup is located at:\n{1}/db/backup_of_corrupted_data.\n\nPlease check if you have the latest version of Bitsquare installed.\nYou can download it at:\nhttps://bitsquare.io/downloads\n\nPlease restart the application.
+popup.warning.cannotConnectAtStartup=You still did not get connected to the {0} network.\nIf you use Tor for Bitcoin it might be that you got an unstable Tor circuit.\nYou can wait longer or try to restart.
+popup.warning.unknownProblemAtStartup=There is an unknown problem at startup.\nPlease restart and if the problem continues file a bug report.
+popup.warning.startupFailed.timeout=The application could not startup after 4 minutes.\n\n{0}
+popup.warning.startupFailed.twoInstances=Bitsquare is already running. You cannot run two instances of Bitsquare.
+popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bitsquare binary, please file a bug report to the Github page.\nError={0}
+popup.warning.noBountyCastle=There is a problem with the crypto libraries. BountyCastle is not available.
+popup.warning.oldOffers.msg=You have open offers which have been created with an older version of Bitsquare.\nPlease remove those offers as they are not valid anymore.\n\nOffers (ID): {0}
+popup.warning.oldOffers.buttonText=Remove outdated offer(s)
+popup.warning.tradePeriod.halfReached=Your trade with ID {0} has reached the half of the max. allowed trading period and is still not completed.\n\nThe trade period ends on {1}\n\nPlease check your trade state at \"Portfolio/Open trades\" for further information.
+popup.warning.tradePeriod.ended=Your trade with ID {0} has reached the max. allowed trading period and is not completed.\n\nThe trade period ended on {1}\n\nPlease check your trade at \"Portfolio/Open trades\" for contacting the arbitrator.
+
+popup.privateNotification.headline=Important private notification!
+
+popup.securityRecommendation.headline=Important security recommendation
+popup.securityRecommendation.msg=We would like to remind you to consider using password protection for your wallet if you have not already enabled that.\n\nIt is also highly recommended to write down the wallet seed words. Those seed words are like a master password for recovering your Bitcoin wallet.\nAt the \"Wallet Seed\" section you find more information.\n\nAdditionally you should backup the complete application data folder at the \"Backup\" section.
+
+popup.shutDownInProgress.headline=Shut down in progress
+popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.
+
+
+
+
+
+####################################################################
+# Offerbook / Create offer
+####################################################################
+
+createOffer.amount.prompt=Enter amount in BTC
+createOffer.price.prompt=Enter price
+createOffer.volume.prompt=Enter amount in {0}
+createOffer.minAmount.prompt=Enter min. amount
+
+createOffer.amountPriceBox.title=Create your offer
+createOffer.amountPriceBox.amountDescription=Amount of bitcoin to {0}
+createOffer.amountPriceBox.priceDescriptionFiat=Fixed price per {0}
+createOffer.amountPriceBox.buy.volumeDescription=Amount in {0} to spend
+createOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to receive
+createOffer.amountPriceBox.minAmountDescription=Minimum amount of bitcoin
+createOffer.amountPriceBox.buy.info=Define a price for which you want to buy bitcoin and either enter the amount or the trade volume. With the minimum amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
+createOffer.amountPriceBox.sell.info=Define a price for which you want to sell bitcoin and either enter the amount or the trade volume. With the minimum  amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
+createOffer.amountPriceBox.next=Next step
+createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
+createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted.
+createOffer.amountPriceBox.warning.adjustedVolume=The total volume you have entered leads to invalid fractional bitcoin amounts. The amount has been adjusted and a new total volume be calculated from it.
+createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n{0}
+createOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount.
+createOffer.validation.minAmountLargerThanAmount=Minimum amount cannot be larger than amount.
+
+createOffer.securityDeposit.prompt=Security deposit in BTC
+createOffer.securityDepositBox.description=Customize security deposit
+
+createOffer.fundsBox.title=Fund your offer
+createOffer.fundsBox.totalsNeeded=Funds needed:
+createOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
+createOffer.fundsBox.address=Trade wallet address:
+createOffer.fundsBox.balance=Trade wallet balance:
+createOffer.fundsBox.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. Those funds are reserved and will be used in the case that your offer gets executed. If you cancel your offer you can withdraw your funds from that trading wallet. The only payment made when placing an offer is the offer fee payment. https://bitsquare.io/faq/#6
+createOffer.fundsBox.tradeAmount=Trade amount:
+createOffer.fundsBox.securityDeposit=Security deposit:
+createOffer.fundsBox.offerFee=Create offer fee:
+createOffer.fundsBox.networkFee=Mining fee:
+createOffer.fundsBox.total=Total:
+createOffer.fundsBox.showAdvanced=Show advanced settings
+createOffer.fundsBox.hideAdvanced=Hide advanced settings
+createOffer.fundsBox.placeOffer=Place offer
+createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ...
+createOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0}
+
+createOffer.advancedBox.title=Advanced settings
+createOffer.advancedBox.countries=Accepted countries:
+createOffer.advancedBox.languages=Accepted languages:
+createOffer.advancedBox.arbitrators=Accepted arbitrators:
+createOffer.advancedBox.txType=Payments method:
+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).
+
+createOffer.success.headline=Your offer has been published
+createOffer.success.info=You can manage your open offers in the \"Portfolio\" screen under \"My open offers\".
+   
+createOffer.error.message=An error occurred when placing the offer.\n\n{0}
+
+
+####################################################################
+# Offerbook / Take offer
+####################################################################
+
+takeOffer.amount.prompt=Enter amount in BTC
+takeOffer.price.prompt=Enter price
+takeOffer.volume.prompt=Enter amount in {0}
+takeOffer.minAmount.prompt=Enter min. amount
+
+takeOffer.amountPriceBox.title=Take offer
+takeOffer.amountPriceBox.subTitle=Buy bitcoin
+takeOffer.amountPriceBox.buy.amountDescription=Amount of bitcoin to sell
+takeOffer.amountPriceBox.sell.amountDescription=Amount of bitcoin to buy
+takeOffer.amountPriceBox.priceDescription=Price per bitcoin in {0}
+takeOffer.amountPriceBox.buy.volumeDescription=Receiving amount in {0}
+takeOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to spend
+takeOffer.amountPriceBox.amountRangeDescription=Possible amount range
+takeOffer.securityDepositBox.description=Security deposit for offer
+takeOffer.amountPriceBox.buy.info=Enter the amount of bitcoin you want to sell. You can choose an amount between the minimum amount and the amount.
+takeOffer.amountPriceBox.sell.info=Enter the amount of bitcoin you want to buy. You can choose an amount between the minimum amount and the amount.
+takeOffer.amountPriceBox.next=Next step
+takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
+takeOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount defined in the offer.
+takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher than the amount defined in the offer.
+takeOffer.validation.amountLargerThanOfferAmountMinusFee=That input amount would create dust change for the BTC seller.
+
+takeOffer.fundsBox.title=Fund your trade
+takeOffer.fundsBox.isOfferAvailable=Check if offer is available ...
+takeOffer.fundsBox.totalsNeeded=Funds needed:
+takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
+takeOffer.fundsBox.address=Trade wallet address:
+takeOffer.fundsBox.balance=Trade wallet balance:
+takeOffer.fundsBox.buy.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
+  Those funds will be paid in to a locked deposit address. At the end of a successful trade you will get back your security deposit and the bitcoin amount you sold will be transferred \
+  to the BTC buyer.
+takeOffer.fundsBox.sell.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
+  Those funds will be paid into a locked deposit address. At the end of a successful trade you will get back your security deposit.
+takeOffer.fundsBox.tradeAmount=Amount to sell:
+takeOffer.fundsBox.securityDeposit=Security deposit:
+takeOffer.fundsBox.offerFee=Take offer fee:
+takeOffer.fundsBox.networkFee=Mining fees (3x):
+takeOffer.fundsBox.total=Total:
+takeOffer.fundsBox.showAdvanced=Show advanced settings
+takeOffer.fundsBox.hideAdvanced=Hide advanced settings
+takeOffer.fundsBox.takeOffer=Take offer
+takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ...
+takeOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0}
+
+takeOffer.advancedBox.title=Advanced settings
+takeOffer.advancedBox.countries=Accepted countries:
+takeOffer.advancedBox.languages=Accepted languages:
+takeOffer.advancedBox.arbitrators=Accepted arbitrators:
+takeOffer.advancedBox.txType=Payments method:
+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.
+
+takeOffer.success.headline=You have successfully taken an offer.
+takeOffer.success.info=You can see the status of your trade at the \"Portfolio\" screen under \"Open trades\".
+takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ae.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ae.properties
index 50bd139153..efd1f4e2bf 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ae.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ae.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ba.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ba.properties
index 2496085b97..3bd48d5f1d 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ba.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ba.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_br.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_br.properties
index d061b201fe..0fc136cd85 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_br.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_br.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_cn.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_cn.properties
index a74b13256f..09945c225b 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_cn.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_cn.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_cz.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_cz.properties
index 73a06c3e86..c2325bb154 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_cz.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_cz.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_de.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_de.properties
index 9b6b9e1670..879fef7dd8 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_de.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_de.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Das Herunterfahren der Anwendung kann einige Sekunden dauern.\
 # Payment methods
 
 payment.account.no=Kontonummer:
-payment.currency=Währung:
+label.currency=Währung:
 payment.account.name=Kontoname:
 payment.payment.method=Zahlungsmethode:
 payment.account.owner=Kontoinhaber:
@@ -35,7 +35,7 @@ payment.bank.country=Land der Bank:
 payment.account.name.email=Kontoinhaber Name / E-Mail
 payment.bank.name=Name der Bank:
 payment.select.account=Konto-Typ wählen
-payment.select.currency=Währung wählen
+list.currency.select=Währung wählen
 payment.select.region=Region wählen
 payment.select.country=Land wählen
 payment.select.bank.country=Land der Bank wählen
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Akzeptierte Länder:
 createOffer.advancedBox.languages=Akzeptierte Sprachen:
 createOffer.advancedBox.arbitrators=Akzeptierte Schiedsrichter:
 createOffer.advancedBox.txType=Zahlungsmethode:
-createOffer.advancedBox.currency=Währung:
+label.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:
-takeOffer.advancedBox.currency=Währung:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_dk.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_dk.properties
index ae0c2274bb..082386a8c3 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_dk.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_dk.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties
index 31e2a928b8..3482d28a52 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_es.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_es.properties
index 278381916d..99ff7df55d 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_es.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_es.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -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:
-createOffer.advancedBox.currency=Moneda:
+label.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:
-takeOffer.advancedBox.currency=Moneda:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_fi.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_fi.properties
index 350d877b85..638653f9b8 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_fi.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_fi.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_fr.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_fr.properties
index da6525f334..e9305d7be9 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_fr.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_fr.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ge.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ge.properties
index 3d0b2ebea5..07745133dc 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ge.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ge.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_gr.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_gr.properties
index 037a1aca3b..cef0f5c857 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_gr.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_gr.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_hr.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_hr.properties
index 706594e5fc..57ed47b5e9 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_hr.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_hr.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -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:
-createOffer.advancedBox.currency=Valuta:
+label.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:
-takeOffer.advancedBox.currency=Valuta:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_hu.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_hu.properties
index a52d819211..c6202471e8 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_hu.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_hu.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_id.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_id.properties
index fd04990eb6..8960e0afed 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_id.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_id.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ie.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ie.properties
index 0dbdd8efc4..c3236d8ae9 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ie.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ie.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_in.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_in.properties
index 0320055f00..ba803a7ce9 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_in.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_in.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_is.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_is.properties
index 15bd38ded3..449125fd1e 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_is.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_is.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
index 111aa421df..9bb16a55fe 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Lo spegnimento dell'applicazione può richiedere un po' di sec
 # Payment methods
 
 payment.account.no=Account n.:
-payment.currency=Moneta:
+label.currency=Moneta:
 payment.account.name=Nome account:
 payment.payment.method=Metodo pagamento:
 payment.account.owner=Nome del titolare:
@@ -35,7 +35,7 @@ payment.bank.country=Paese della banca:
 payment.account.name.email=Nome del titolare / email
 payment.bank.name=Nome banca:
 payment.select.account=Seleziona tipo di conto
-payment.select.currency=Seleziona moneta
+list.currency.select=Seleziona moneta
 payment.select.region=Seleziona regione
 payment.select.country=Seleziona paese
 payment.select.bank.country=Seleziona paese della banca
@@ -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:
-createOffer.advancedBox.currency=Moneta:
+label.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:
-takeOffer.advancedBox.currency=Moneta:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_jp.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_jp.properties
index 41a178f13e..a14f5f5172 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_jp.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_jp.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_kg.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_kg.properties
index 14ef44b792..ea4acf212b 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_kg.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_kg.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_kr.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_kr.properties
index 1c358c4d4f..a9697033be 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_kr.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_kr.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_kz.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_kz.properties
index de7ffb16e7..d86cb14406 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_kz.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_kz.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_lt.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_lt.properties
index 9a0f824f41..1435e8f198 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_lt.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_lt.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_my.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_my.properties
index cf5b46098b..a69c8947ca 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_my.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_my.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_nl.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_nl.properties
index b0c58f7b7f..16c47c9d9b 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_nl.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_nl.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_no.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_no.properties
index 6535faf063..ed6cc09450 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_no.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_no.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_nz.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_nz.properties
index 6f440d163c..671edde073 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_nz.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_nz.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ph.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ph.properties
index b5c4f8c153..9f1dbafc3c 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ph.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ph.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_pl.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_pl.properties
index dc7153f3a7..8fd2d99f74 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_pl.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_pl.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
index 3c2411cefc..e50eb93ad9 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
@@ -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:
-createOffer.advancedBox.currency=Moeda:
+label.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:
-takeOffer.advancedBox.currency=Moeda:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ro.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ro.properties
index 87283234c5..b970e19227 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ro.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ro.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ru.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ru.properties
index 42db5c9b7f..dc220c5872 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ru.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ru.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_se.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_se.properties
index 91de488061..33fc08944e 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_se.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_se.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_th.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_th.properties
index 7a3e6777f3..4d0b10be16 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_th.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_th.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_ua.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_ua.properties
index 706715bfb8..87e7cb1724 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_ua.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_ua.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_uz.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_uz.properties
index 996165d571..844b19e5f5 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_uz.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_uz.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.
diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_vn.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_vn.properties
index 546567deea..15d2f7d3bc 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_vn.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_vn.properties
@@ -27,7 +27,7 @@ app.shutdown.text=Shutting down application can take a few seconds.\nPlease don'
 # Payment methods
 
 payment.account.no=Account no.:
-payment.currency=Currency:
+label.currency=Currency:
 payment.account.name=Account name:
 payment.payment.method=Payment method:
 payment.account.owner=Account holder name:
@@ -35,7 +35,7 @@ payment.bank.country=Country of bank:
 payment.account.name.email=Account holder name / email
 payment.bank.name=Bank name:
 payment.select.account=Select account type
-payment.select.currency=Select currency
+list.currency.select=Select currency
 payment.select.region=Select region
 payment.select.country=Select country
 payment.select.bank.country=Select country of bank
@@ -137,7 +137,7 @@ createOffer.advancedBox.countries=Accepted countries:
 createOffer.advancedBox.languages=Accepted languages:
 createOffer.advancedBox.arbitrators=Accepted arbitrators:
 createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
+label.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:
-takeOffer.advancedBox.currency=Currency:
+label.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.