diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index a3822beefa..ea559c6aa0 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -277,6 +277,7 @@ mainView.footer.xmrInfo.connectingTo=Connecting to mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Version {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Connecting to Tor network... mainView.bootstrapState.torNodeCreated=(2/4) Tor node created diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index abe0678d01..da0f4177db 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -277,6 +277,7 @@ mainView.footer.xmrInfo.connectingTo=Připojování mainView.footer.xmrInfo.connectionFailed=Připojení se nezdařilo mainView.footer.xmrPeers=Monero síťové uzly: {0} mainView.footer.p2pPeers=Haveno síťové uzly: {0} +mainView.footer.version=Verze {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Připojování do sítě Tor... mainView.bootstrapState.torNodeCreated=(2/4) Tor uzel vytvořen diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 90b0950a8e..5a4a8f1b11 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Verbinde mit mainView.footer.xmrInfo.connectionFailed=Verbindung fehlgeschlagen zu mainView.footer.xmrPeers=Monero Netzwerk Peers: {0} mainView.footer.p2pPeers=Haveno Netzwerk Peers: {0} +mainView.footer.version=Version {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Verbinde mit Tor-Netzwerk... mainView.bootstrapState.torNodeCreated=(2/4) Tor-Knoten erstellt diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 4bd8d75632..f88afdd52d 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Conectando a mainView.footer.xmrInfo.connectionFailed=Conexión fallida a mainView.footer.xmrPeers=Pares de Monero: {0} mainView.footer.p2pPeers=Pares de la red de Haveno: {0} +mainView.footer.version=Versión {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando a la red Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nodo Tor creado diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index d2a8f705ff..ad28899ecd 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=در حال ایجاد ارتباط با mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=نسخه {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) در حال ارتباط با شبکه Tor ... mainView.bootstrapState.torNodeCreated=(2/4) گره Tor ایجاد شد diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 8c15770a4c..02feadc14a 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Se connecte à mainView.footer.xmrInfo.connectionFailed=Échec de la connexion à mainView.footer.xmrPeers=Pairs du réseau Monero: {0} mainView.footer.p2pPeers=Pairs du réseau Haveno: {0} +mainView.footer.version=Version {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Connection au réseau Tor... mainView.bootstrapState.torNodeCreated=(2/4) Noeud Tor créé diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 1086ecc1f5..2a633b60dc 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Connessione a mainView.footer.xmrInfo.connectionFailed=Connessione fallita mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Versione {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Connessione alla rete Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nodo Tor creato diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 090f3ae4fd..8bab115bb7 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=接続中: mainView.footer.xmrInfo.connectionFailed=接続失敗 mainView.footer.xmrPeers=Moneroネットワークピア: {0} mainView.footer.p2pPeers=Havenoネットワークピア: {0} +mainView.footer.version=バージョン {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Torネットワークに接続中... mainView.bootstrapState.torNodeCreated=(2/4) Torノードが作成されました diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index c4d1c79fec..7ae6e8f243 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -261,6 +261,7 @@ mainView.footer.xmrInfo.connectingTo=Conectando-se a mainView.footer.xmrInfo.connectionFailed=Falha na conexão à mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Versão {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando-se à rede Tor... mainView.bootstrapState.torNodeCreated=(2/4) Nó da rede Tor criado diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index e99478ee0e..113d8a7867 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Conectando à mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Versão {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Conectando à rede Tor.... mainView.bootstrapState.torNodeCreated=(2/4) Nó da rede Tor criado diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 86026ebf46..667fad12c7 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Подключение к mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Версия {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Подключение к сети Tor... mainView.bootstrapState.torNodeCreated=(2/4) Создан узел Tor diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index b43ca1df6b..aaa8f20a91 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Connecting to mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=เวอร์ชัน {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) เชื่อมต่อไปยัง Tor network... mainView.bootstrapState.torNodeCreated=(2/4) Tor node ถูกสร้างแล้ว diff --git a/core/src/main/resources/i18n/displayStrings_tr.properties b/core/src/main/resources/i18n/displayStrings_tr.properties index 0b1ec445a6..cf031cbbbd 100644 --- a/core/src/main/resources/i18n/displayStrings_tr.properties +++ b/core/src/main/resources/i18n/displayStrings_tr.properties @@ -276,6 +276,7 @@ mainView.footer.xmrInfo.connectingTo=Bağlanıyor mainView.footer.xmrInfo.connectionFailed=Bağlantı başarısız oldu mainView.footer.xmrPeers=Monero ağ eşleri: {0} mainView.footer.p2pPeers=Haveno ağ eşleri: {0} +mainView.footer.version=Sürüm {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Tor ağına bağlanılıyor... mainView.bootstrapState.torNodeCreated=(2/4) Tor düğümü oluşturuldu diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 1cab9b6b9c..a296c7de1e 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=Đang kết nối với mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} mainView.footer.p2pPeers=Haveno network peers: {0} +mainView.footer.version=Phiên bản {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Kết nối với mạng ... mainView.bootstrapState.torNodeCreated=(2/4) Nút Tor được tạo diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index d2829aa002..e1a5edbd6a 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=连接至 mainView.footer.xmrInfo.connectionFailed=连接失败: mainView.footer.xmrPeers=Monero网络节点:{0} mainView.footer.p2pPeers=Haveno 网络节点:{0} +mainView.footer.version=版本 {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) 连接至 Tor 网络... mainView.bootstrapState.torNodeCreated=(2/4) Tor 节点已创建 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 64c83dad50..7971e05fcd 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -258,6 +258,7 @@ mainView.footer.xmrInfo.connectingTo=連接至 mainView.footer.xmrInfo.connectionFailed=連接失敗: mainView.footer.xmrPeers=Monero網絡節點:{0} mainView.footer.p2pPeers=Haveno 網絡節點:{0} +mainView.footer.version=版本 {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) 連接至 Tor 網絡... mainView.bootstrapState.torNodeCreated=(2/4) Tor 節點已創建 diff --git a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java index c6217cfe09..1d4a3a60d2 100644 --- a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java +++ b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java @@ -23,6 +23,7 @@ import haveno.common.app.Version; import haveno.common.crypto.IncorrectPasswordException; import haveno.core.app.AvoidStandbyModeService; import haveno.core.app.HavenoExecutable; +import haveno.core.locale.Res; import haveno.desktop.common.UITimer; import haveno.desktop.common.view.guice.InjectorViewFactory; import haveno.desktop.setup.DesktopPersistedDataHost; @@ -212,7 +213,7 @@ public class HavenoAppMain extends HavenoExecutable { errorMessageField.setTextFill(Color.color(1, 0, 0)); // Create the version field - Label versionField = new Label("v" + Version.VERSION); + Label versionField = new Label(Res.get("mainView.footer.version", Version.VERSION)); // Set the dialog content VBox vbox = new VBox(10); diff --git a/desktop/src/main/java/haveno/desktop/main/MainView.java b/desktop/src/main/java/haveno/desktop/main/MainView.java index cedad685e1..150ada1c9e 100644 --- a/desktop/src/main/java/haveno/desktop/main/MainView.java +++ b/desktop/src/main/java/haveno/desktop/main/MainView.java @@ -671,7 +671,7 @@ public class MainView extends InitializableView { splashP2PNetworkBox.setPrefHeight(40); splashP2PNetworkBox.getChildren().addAll(splashP2PNetworkLabel, splashP2PNetworkBusyAnimation, splashP2PNetworkIcon, showTorNetworkSettingsButton); - Label versionLabel = new Label("v" + Version.VERSION); + Label versionLabel = new Label(Res.get("mainView.footer.version", Version.VERSION)); vBox.getChildren().addAll(logo, blockchainSyncBox, xmrSyncIndicator, splashP2PNetworkBox, versionLabel); return vBox; diff --git a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java index 473b18d331..a79ea05430 100644 --- a/desktop/src/main/java/haveno/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/MainViewModel.java @@ -526,12 +526,12 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener havenoSetup.setFilterWarningHandler(warning -> new Popup().warning(warning).show()); - this.footerVersionInfo.setValue("v" + Version.VERSION); + this.footerVersionInfo.setValue(Res.get("mainView.footer.version", Version.VERSION)); this.getNewVersionAvailableProperty().addListener((observable, oldValue, newValue) -> { if (newValue) { - this.footerVersionInfo.setValue("v" + Version.VERSION + " " + Res.get("mainView.version.update")); + this.footerVersionInfo.setValue(Res.get("mainView.footer.version", Version.VERSION) + " " + Res.get("mainView.version.update")); } else { - this.footerVersionInfo.setValue("v" + Version.VERSION); + this.footerVersionInfo.setValue(Res.get("mainView.footer.version", Version.VERSION)); } });