diff --git a/core/src/main/java/haveno/core/app/P2PNetworkSetup.java b/core/src/main/java/haveno/core/app/P2PNetworkSetup.java index 1144accd14..bd52aab41c 100644 --- a/core/src/main/java/haveno/core/app/P2PNetworkSetup.java +++ b/core/src/main/java/haveno/core/app/P2PNetworkSetup.java @@ -89,13 +89,13 @@ public class P2PNetworkSetup { p2PNetworkInfoBinding = EasyBind.combine(bootstrapState, bootstrapWarning, p2PService.getNumConnectedPeers(), connectionService.numPeersProperty(), hiddenServicePublished, initialP2PNetworkDataReceived, - (state, warning, numP2pPeers, numBtcPeers, hiddenService, dataReceived) -> { + (state, warning, numP2pPeers, numXmrPeers, hiddenService, dataReceived) -> { String result; int p2pPeers = (int) numP2pPeers; if (warning != null && p2pPeers == 0) { result = warning; } else { - String p2pInfo = Res.get("mainView.footer.p2pInfo", numBtcPeers, numP2pPeers); + String p2pInfo = ((int) numXmrPeers > 0 ? Res.get("mainView.footer.xmrPeers", numXmrPeers) + " / " : "") + Res.get("mainView.footer.p2pPeers", numP2pPeers); if (dataReceived && hiddenService) { result = p2pInfo; } else if (p2pPeers == 0) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 868bb540d9..46cd2eba68 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -272,7 +272,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Connecting to mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Monero network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 27dee2845c..e6862dd084 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizace s {0} v bloku: {1} / {2} mainView.footer.btcInfo.synchronizedWith=Synchronizováno s {0} v bloku {1} mainView.footer.btcInfo.connectingTo=Připojování mainView.footer.btcInfo.connectionFailed=Připojení se nezdařilo -mainView.footer.p2pInfo=Bitcoin síťové nody: {0} / Haveno síťové nody: {1} +mainView.footer.xmrPeers=Monero síťové nody: {0} +mainView.footer.p2pPeers=Haveno síťové nody: {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) Připojování do sítě Tor... mainView.bootstrapState.torNodeCreated=(2/4) Tor node vytvořen diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 00e2a21078..5e1347892c 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronisierung mit {0} bei Block: {1 mainView.footer.btcInfo.synchronizedWith=Synchronisierung mit {0} bei Block {1} mainView.footer.btcInfo.connectingTo=Verbinde mit mainView.footer.btcInfo.connectionFailed=Verbindung fehlgeschlagen zu -mainView.footer.p2pInfo=Bitcoin Netzwerk Peers: {0} / Haveno Netzwerk Peers: {1} +mainView.footer.xmrPeers=Monero Netzwerk Peers: {0} +mainView.footer.p2pPeers=Haveno Netzwerk Peers: {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 351622d699..31d885378a 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Sincronizando con {0} en el bloque: {1 mainView.footer.btcInfo.synchronizedWith=Sincronizado con {0} en el bloque {1} mainView.footer.btcInfo.connectingTo=Conectando a mainView.footer.btcInfo.connectionFailed=Conexión fallida a -mainView.footer.p2pInfo=Pares de Bitcoin: {0} / Pares de la red de Haveno: {1} +mainView.footer.xmrPeers=Pares de Monero: {0} +mainView.footer.p2pPeers=Pares de la red de Haveno: {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 b54ff03586..041f0d025a 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=در حال ایجاد ارتباط با mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 12d570e23c..380b8c7105 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronisation avec {0} au block: {1} mainView.footer.btcInfo.synchronizedWith=Synchronisé avec {0} au block {1} mainView.footer.btcInfo.connectingTo=Se connecte à mainView.footer.btcInfo.connectionFailed=Échec de la connexion à -mainView.footer.p2pInfo=Pairs du réseau bitcoin: {0} / pairs du réseau Haveno: {1} +mainView.footer.xmrPeers=Pairs du réseau Monero: {0} +mainView.footer.p2pPeers=Pairs du réseau Haveno: {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 7f429fb041..269aef15e6 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Connessione a mainView.footer.btcInfo.connectionFailed=Connessione fallita -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 0c03b6e632..fcb74d1fca 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith={0}と同期中、ブロック: {1} / mainView.footer.btcInfo.synchronizedWith={0}と同期されています、ブロック{1}に mainView.footer.btcInfo.connectingTo=接続中: mainView.footer.btcInfo.connectionFailed=接続失敗 -mainView.footer.p2pInfo=ビットコインネットワークピア: {0} / Havenoネットワークピア: {1} +mainView.footer.xmrPeers=Moneroネットワークピア: {0} +mainView.footer.p2pPeers=Havenoネットワークピア: {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 a8a7b0bacc..1d00e58911 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -256,7 +256,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Conectando-se a mainView.footer.btcInfo.connectionFailed=Falha na conexão à -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 f4620b89d9..480661fe7a 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Conectando à mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 07d38b9eb4..e0fc9d90c3 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Подключение к mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 e93a1b7247..d9fdb4a437 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Connecting to mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {0} mainView.bootstrapState.connectionToTorNetwork=(1/4) เชื่อมต่อไปยัง Tor network... mainView.bootstrapState.torNodeCreated=(2/4) Tor node ถูกสร้างแล้ว diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 33e96080db..653aa29298 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=Đang kết nối với mainView.footer.btcInfo.connectionFailed=Connection failed to -mainView.footer.p2pInfo=Bitcoin network peers: {0} / Haveno network peers: {1} +mainView.footer.xmrPeers=Monero network peers: {0} +mainView.footer.p2pPeers=Haveno network peers: {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 eb70b4d2cf..3677c613e0 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=正在通过{0}同步区块:{1}/{2} mainView.footer.btcInfo.synchronizedWith=已通过{0}同步至区块{1} mainView.footer.btcInfo.connectingTo=连接至 mainView.footer.btcInfo.connectionFailed=连接失败: -mainView.footer.p2pInfo=比特币网络节点:{0} / Haveno 网络节点:{1} +mainView.footer.xmrPeers=Monero网络节点:{0} +mainView.footer.p2pPeers=Haveno 网络节点:{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 59d6c047d2..2cc4b0faae 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -253,7 +253,8 @@ mainView.footer.btcInfo.synchronizingWith=Synchronizing with {0} at block: {1} / mainView.footer.btcInfo.synchronizedWith=Synced with {0} at block {1} mainView.footer.btcInfo.connectingTo=連接至 mainView.footer.btcInfo.connectionFailed=連接失敗: -mainView.footer.p2pInfo=比特幣網絡節點:{0} / Haveno 網絡節點:{1} +mainView.footer.xmrPeers=Monero網絡節點:{0} +mainView.footer.p2pPeers=Haveno 網絡節點:{0} mainView.bootstrapState.connectionToTorNetwork=(1/4) 連接至 Tor 網絡... mainView.bootstrapState.torNodeCreated=(2/4) Tor 節點已創建