diff --git a/core/src/main/java/haveno/core/app/WalletAppSetup.java b/core/src/main/java/haveno/core/app/WalletAppSetup.java index 992b25ca..5ab6265f 100644 --- a/core/src/main/java/haveno/core/app/WalletAppSetup.java +++ b/core/src/main/java/haveno/core/app/WalletAppSetup.java @@ -125,7 +125,7 @@ public class WalletAppSetup { Long bestWalletHeight = walletHeight == null ? null : (Long) walletHeight; String walletHeightAsString = bestWalletHeight != null && bestWalletHeight > 0 ? String.valueOf(bestWalletHeight) : ""; if (walletDownloadPercentageD == 1) { - String synchronizedWith = Res.get("mainView.footer.xmrInfo.synchronizedWalletWith", getXmrWalletNetworkAsString(), walletHeightAsString); + String synchronizedWith = Res.get("mainView.footer.xmrInfo.syncedWith", getXmrWalletNetworkAsString(), walletHeightAsString); String feeInfo = ""; // TODO: feeService.isFeeAvailable() returns true, disable result = Res.get("mainView.footer.xmrInfo", synchronizedWith, feeInfo); getXmrSplashSyncIconId().set("image-connection-synced"); @@ -142,12 +142,12 @@ public class WalletAppSetup { Long bestChainHeight = chainHeight == null ? null : (Long) chainHeight; String chainHeightAsString = bestChainHeight != null && bestChainHeight > 0 ? String.valueOf(bestChainHeight) : ""; if (chainDownloadPercentageD == 1) { - String synchronizedWith = Res.get("mainView.footer.xmrInfo.synchronizedDaemonWith", getXmrDaemonNetworkAsString(), chainHeightAsString); + String synchronizedWith = Res.get("mainView.footer.xmrInfo.syncedWith", getXmrDaemonNetworkAsString(), chainHeightAsString); String feeInfo = ""; // TODO: feeService.isFeeAvailable() returns true, disable result = Res.get("mainView.footer.xmrInfo", synchronizedWith, feeInfo); getXmrSplashSyncIconId().set("image-connection-synced"); } else if (chainDownloadPercentageD > 0.0) { - String synchronizingWith = Res.get("mainView.footer.xmrInfo.synchronizingDaemonWith", getXmrDaemonNetworkAsString(), chainHeightAsString, FormattingUtils.formatToRoundedPercentWithSymbol(chainDownloadPercentageD)); + String synchronizingWith = Res.get("mainView.footer.xmrInfo.synchronizingWith", getXmrDaemonNetworkAsString(), chainHeightAsString, FormattingUtils.formatToRoundedPercentWithSymbol(chainDownloadPercentageD)); result = Res.get("mainView.footer.xmrInfo", synchronizingWith, ""); } else { result = Res.get("mainView.footer.xmrInfo", diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 7bb94bc6..31145795 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -268,10 +268,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Connecting to Haveno network -mainView.footer.xmrInfo.synchronizingDaemonWith=Synchronizing daemon with {0} at block: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Daemon synchronized with {0} at block {1} +mainView.footer.xmrInfo.synchronizingWith=Synchronizing with {0} at block: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Synced with {0} at block {1} mainView.footer.xmrInfo.synchronizingWalletWith=Synchronizing wallet with {0} at block: {1} / {2} -mainView.footer.xmrInfo.synchronizedWalletWith=Wallet synchronized with {0} at block {1} mainView.footer.xmrInfo.connectingTo=Connecting to mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 2703e576..d138e76f 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Aktuální poplatek: {0} sat/vB mainView.footer.xmrInfo.initializing=Připojování k síti Haveno -mainView.footer.xmrInfo.synchronizingDaemonWith=Synchronizace s {0} v bloku: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Synchronizováno s {0} v bloku {1} +mainView.footer.xmrInfo.synchronizingWith=Synchronizace s {0} na bloku: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Synchronizováno s {0} na bloku {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Synchronizace peněženky s {0} na bloku: {1} / {2} mainView.footer.xmrInfo.connectingTo=Připojování mainView.footer.xmrInfo.connectionFailed=Připojení se nezdařilo mainView.footer.xmrPeers=Monero síťové nody: {0} diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 720bf4a1..35a89f9c 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Aktuelle Gebühr: {0} sat/vB mainView.footer.xmrInfo.initializing=Verbindung mit Haveno-Netzwerk wird hergestellt -mainView.footer.xmrInfo.synchronizingDaemonWith=Synchronisierung mit {0} bei Block: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Synchronisierung mit {0} bei Block {1} +mainView.footer.xmrInfo.synchronizingWith=Synchronisierung mit {0} bei Block: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Synchronisiert mit {0} bei Block {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Synchronisierung der Brieftasche mit {0} im Block: {1} / {2} mainView.footer.xmrInfo.connectingTo=Verbinde mit mainView.footer.xmrInfo.connectionFailed=Verbindung fehlgeschlagen zu mainView.footer.xmrPeers=Monero Netzwerk Peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index 7925250b..116811e2 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/Tasas actuales: {0} sat/vB mainView.footer.xmrInfo.initializing=Conectando a la red Haveno -mainView.footer.xmrInfo.synchronizingDaemonWith=Sincronizando con {0} en el bloque: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Sincronizado con {0} en el bloque {1} +mainView.footer.xmrInfo.synchronizingWith=Sincronizando con {0} en el bloque: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Sincronizado con {0} en el bloque {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Sincronizando la billetera con {0} en el bloque: {1} / {2} mainView.footer.xmrInfo.connectingTo=Conectando a mainView.footer.xmrInfo.connectionFailed=Conexión fallida a mainView.footer.xmrPeers=Pares de Monero: {0} diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 793f398e..8bfbe396 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(لوکال هاست) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=اتصال به شبکه Haveno -mainView.footer.xmrInfo.synchronizingDaemonWith=Synchronizing with {0} at block: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Synced with {0} at block {1} +mainView.footer.xmrInfo.synchronizingWith=همگام‌سازی با {0} در بلوک: {1} / {2} +mainView.footer.xmrInfo.syncedWith=همگام‌سازی با {0} در بلوک {1} انجام شده است +mainView.footer.xmrInfo.synchronizingWalletWith=همگام‌سازی کیف‌پول با {0} در بلوک: {1} / {2} mainView.footer.xmrInfo.connectingTo=در حال ایجاد ارتباط با mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index a0d281e9..58225e91 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Taux des frais: {0} sat/vB mainView.footer.xmrInfo.initializing=Connexion au réseau Haveno en cours -mainView.footer.xmrInfo.synchronizingDaemonWith=Synchronisation avec {0} au block: {1}/ {2} -mainView.footer.xmrInfo.synchronizedDaemonWith=Synchronisé avec {0} au block {1} +mainView.footer.xmrInfo.synchronizingWith=Synchronisation avec {0} au bloc : {1} / {2} +mainView.footer.xmrInfo.syncedWith=Synchronisé avec {0} au bloc {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Synchronisation du portefeuille avec {0} au bloc : {1} / {2} mainView.footer.xmrInfo.connectingTo=Se connecte à mainView.footer.xmrInfo.connectionFailed=Échec de la connexion à mainView.footer.xmrPeers=Pairs du réseau Monero: {0} diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 2f451074..12980d03 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Connessione alla rete Haveno +mainView.footer.xmrInfo.synchronizingWith=Sincronizzazione con {0} al blocco: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Sincronizzato con {0} al blocco {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Sincronizzazione del portafoglio con {0} al blocco: {1} / {2} mainView.footer.xmrInfo.connectingTo=Connessione a mainView.footer.xmrInfo.connectionFailed=Connessione fallita mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 9e767dbd..f9ae7256 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(ローカルホスト) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ 手数料率: {0} サトシ/vB mainView.footer.xmrInfo.initializing=Havenoネットワークに接続中 -mainView.footer.xmrInfo.synchronizingDaemonWith={0}と同期中、ブロック: {1} / {2} -mainView.footer.xmrInfo.synchronizedDaemonWith={0}と同期されています、ブロック{1}に +mainView.footer.xmrInfo.synchronizingWith=ブロック {1} / {2} で {0} と同期しています +mainView.footer.xmrInfo.syncedWith=ブロック {1} で {0} と同期しました +mainView.footer.xmrInfo.synchronizingWalletWith=ブロック {1} / {2} で {0} のウォレットを同期しています mainView.footer.xmrInfo.connectingTo=接続中: mainView.footer.xmrInfo.connectionFailed=接続失敗 mainView.footer.xmrPeers=Moneroネットワークピア: {0} diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 5b708168..e76dc042 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -252,6 +252,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Conectando-se à rede Haveno +mainView.footer.xmrInfo.synchronizingWith=Sincronizando com {0} no bloco: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Sincronizado com {0} no bloco {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Sincronizando a carteira com {0} no bloco: {1} / {2} mainView.footer.xmrInfo.connectingTo=Conectando-se a mainView.footer.xmrInfo.connectionFailed=Falha na conexão à mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 47a57f58..b50b233c 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(localhost) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Conectando à rede Haveno +mainView.footer.xmrInfo.synchronizingWith=Sincronizando com {0} no bloco: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Sincronizado com {0} no bloco {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Sincronizando a carteira com {0} no bloco: {1} / {2} mainView.footer.xmrInfo.connectingTo=Conectando à mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 8464467d..dbb88864 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(локальный узел) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Подключение к сети Haveno +mainView.footer.xmrInfo.synchronizingWith=Синхронизация с {0} на блоке: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Синхронизировано с {0} на блоке {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Синхронизация кошелька с {0} на блоке: {1} / {2} mainView.footer.xmrInfo.connectingTo=Подключение к mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 3e787adb..10ae0ec1 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(แม่ข่ายเฉพาะที mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=เชื่อมต่อกับเครือข่าย Haveno +mainView.footer.xmrInfo.synchronizingWith=กำลังซิงโครไนซ์กับ {0} ที่บล็อก: {1} / {2} +mainView.footer.xmrInfo.syncedWith=ซิงค์กับ {0} ที่บล็อก {1} เสร็จสมบูรณ์ +mainView.footer.xmrInfo.synchronizingWalletWith=กำลังซิงโครไนซ์กระเป๋าสตางค์กับ {0} ที่บล็อก: {1} / {2} mainView.footer.xmrInfo.connectingTo=Connecting to mainView.footer.xmrInfo.connectionFailed=Connection failed to mainView.footer.xmrPeers=Monero network peers: {0} diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index f6019cbf..d431e8d0 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(Máy chủ nội bộ) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=Đang kết nối với mạng Haveno +mainView.footer.xmrInfo.synchronizingWith=Đang đồng bộ với {0} tại khối: {1} / {2} +mainView.footer.xmrInfo.syncedWith=Đã đồng bộ với {0} tại khối {1} +mainView.footer.xmrInfo.synchronizingWalletWith=Đang đồng bộ hóa ví với {0} tại khối: {1} / {2} 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} diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index f983ef76..ab7bbf13 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -249,8 +249,9 @@ mainView.footer.localhostMoneroNode=(本地主机) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ 矿工手费率:{0} 聪/字节 mainView.footer.xmrInfo.initializing=连接到 Haveno 网络 -mainView.footer.xmrInfo.synchronizingDaemonWith=正在通过{0}同步区块:{1}/{2} -mainView.footer.xmrInfo.synchronizedDaemonWith=已通过{0}同步至区块{1} +mainView.footer.xmrInfo.synchronizingWith=同步中,区块:{1} / {2},与 {0} 同步中 +mainView.footer.xmrInfo.syncedWith=已同步至 {0} 在区块 {1} +mainView.footer.xmrInfo.synchronizingWalletWith=同步中,区块:{1} / {2},与 {0} 的钱包同步中 mainView.footer.xmrInfo.connectingTo=连接至 mainView.footer.xmrInfo.connectionFailed=连接失败: mainView.footer.xmrPeers=Monero网络节点:{0} diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 6f3f1c5f..4f7d0cf7 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -249,6 +249,9 @@ mainView.footer.localhostMoneroNode=(本地主機) mainView.footer.xmrInfo={0} {1} mainView.footer.xmrFeeRate=/ Fee rate: {0} sat/vB mainView.footer.xmrInfo.initializing=連接到 Haveno 網路 +mainView.footer.xmrInfo.synchronizingWith=同步中,區塊:{1} / {2},與 {0} 同步中 +mainView.footer.xmrInfo.syncedWith=已同步至 {0} 在區塊 {1} +mainView.footer.xmrInfo.synchronizingWalletWith=同步中,區塊:{1} / {2},與 {0} 的錢包同步中 mainView.footer.xmrInfo.connectingTo=連接至 mainView.footer.xmrInfo.connectionFailed=連接失敗: mainView.footer.xmrPeers=Monero網絡節點:{0}