From c1c4451b51c42d90c79a5039431b393b7234f14f Mon Sep 17 00:00:00 2001 From: zavarza Date: Mon, 13 May 2019 12:29:32 +0300 Subject: [PATCH] #632 text updated --- ui/i18n/en_US.ts | 33 +++++++++++++++------------------ ui/i18n/ru_RU.ts | 35 ++++++++++++++++------------------- ui/model/wallet_model.cpp | 2 +- ui/view/start.qml | 2 +- ui/view/wallet.qml | 8 ++++++-- 5 files changed, 39 insertions(+), 41 deletions(-) diff --git a/ui/i18n/en_US.ts b/ui/i18n/en_US.ts index 9dbe58150..28b090cd6 100644 --- a/ui/i18n/en_US.ts +++ b/ui/i18n/en_US.ts @@ -407,17 +407,17 @@ Notifications view Notifications view - - updating - updating + + connecting + connecting online online - - connecting - connecting + + updating + updating General transaction info @@ -684,8 +684,8 @@ restore wallet - Your funds will be fully restored from the blockchain. The transaction history and your addresses are stored locally and are encrypted with your password, hence it can't be restored. - Your funds will be fully restored from the blockchain. The transaction history and your addresses are stored locally and are encrypted with your password, hence it can't be restored. + Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can't be restored. + Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can't be restored. That's the final version till the future validation and process. @@ -871,7 +871,7 @@ Node protocol error! Node protocol error! - + You are trying to connect to incompatible peer. You are trying to connect to incompatible peer. @@ -1179,16 +1179,13 @@ Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet. Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet. - - - wallet - - ok - ok - - + You cannot generate new address. Your wallet doesn't have a master key. - + You cannot generate new address. Your wallet doesn't have a master key. + + + ok + ok diff --git a/ui/i18n/ru_RU.ts b/ui/i18n/ru_RU.ts index a31b6112e..343598535 100644 --- a/ui/i18n/ru_RU.ts +++ b/ui/i18n/ru_RU.ts @@ -443,17 +443,17 @@ Notifications view Оповещения - - updating - обновление + + connecting + подключение online в сети - - connecting - подключение + + updating + обновление General transaction info @@ -716,12 +716,12 @@ восстановить кошелек - Your funds will be fully restored from the blockchain. The transaction history and your addresses are stored locally and are encrypted with your password, hence it can't be restored. - Ваши средства будут восстановлены из цепочки блоков. История ваших транзакций и ваши адреса хранятся локально, зашифрованные паролем, их восстановление невожможно + Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can't be restored. + Ваши средства будут восстановлены из цепочки блоков. История ваших транзакций и ваши адреса хранятся локально, поэтому их восстановление невожможно. That's the final version till the future validation and process. - + Вы используете последнюю версию. create new wallet @@ -903,7 +903,7 @@ Node protocol error! Ошибка протокола - + You are trying to connect to incompatible peer. Несовместимый пир @@ -1179,16 +1179,13 @@ Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet. Невозможно запустить локальный узел: время компьютера не синхронизированно. Проверьте настройки времени и перезапустите кошелек. - - - wallet - - ok - ok - - + You cannot generate new address. Your wallet doesn't have a master key. - + Вы не можете сгенерировать новый адрес. В кошельке отсутствует мастер-ключ + + + ok + Хорошо diff --git a/ui/model/wallet_model.cpp b/ui/model/wallet_model.cpp index 6d600cc01..41a476f02 100644 --- a/ui/model/wallet_model.cpp +++ b/ui/model/wallet_model.cpp @@ -53,7 +53,7 @@ QString WalletModel::GetErrorString(beam::wallet::ErrorType type) return qtTrId("wallet-model-node-protocol-error"); case wallet::ErrorType::NodeProtocolIncompatible: //% "You are trying to connect to incompatible peer." - return qtTrId("wallet-model-incompatible-peer"); + return qtTrId("wallet-model-incompatible-peer-error"); case wallet::ErrorType::ConnectionBase: //% "Connection error." return qtTrId("wallet-model-connection-base-error"); diff --git a/ui/view/start.qml b/ui/view/start.qml index 1c48c2a22..b5638e8ac 100644 --- a/ui/view/start.qml +++ b/ui/view/start.qml @@ -39,7 +39,7 @@ Item SFText { horizontalAlignment : Text.AlignHCenter width: parent.width - //% "Your funds will be fully restored from the blockchain. The transaction history and your addresses are stored locally and are encrypted with your password, hence it can't be restored." + //% "Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can't be restored." text: qsTrId("start-restore-message-line-1") color: Style.content_main font.pixelSize: 14 diff --git a/ui/view/wallet.qml b/ui/view/wallet.qml index 0e35651a2..a6438028f 100644 --- a/ui/view/wallet.qml +++ b/ui/view/wallet.qml @@ -100,7 +100,9 @@ Item { SFText { width: parent.width - text: qsTr("You cannot generate new address. Your wallet doesn't have a master key.") + // text: qsTr("You cannot generate new address. Your wallet doesn't have a master key.") + //% "You cannot generate new address. Your wallet doesn't have a master key." + text: qsTrId("can-not-generate-new-address-message") color: Style.content_main font.pixelSize: 14 font.styleName: "Bold"; font.weight: Font.Bold @@ -108,7 +110,9 @@ Item { } PrimaryButton { - text: qsTr("ok") + // text: qsTr("ok") + //% "ok" + text: qsTrId("can-not-generate-new-address-ok-button") anchors.horizontalCenter: parent.horizontalCenter icon.source: "qrc:/assets/icon-done.svg" onClicked: newAddressFailedDialog.close()