#632 text updated

BeamMW · May 13, 2019 · c1c4451 · c1c4451
1 parent 8934279
commit c1c4451
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 41 deletions.
diff --git a/ui/i18n/en_US.ts b/ui/i18n/en_US.ts
@@ -407,17 +407,17 @@
         <source>Notifications view</source>
         <translation>Notifications view</translation>
     </message>
-    <message id="status-updating">
-        <source>updating</source>
-        <translation>updating</translation>
+    <message id="status-connecting">
+        <source>connecting</source>
+        <translation>connecting</translation>
     </message>
     <message id="status-online">
         <source>online</source>
         <translation>online</translation>
     </message>
-    <message id="status-connecting">
-        <source>connecting</source>
-        <translation>connecting</translation>
+    <message id="status-updating">
+        <source>updating</source>
+        <translation>updating</translation>
     </message>
     <message id="tx-details-title">
         <source>General transaction info</source>
@@ -684,8 +684,8 @@
         <translation>restore wallet</translation>
     </message>
     <message id="start-restore-message-line-1">
-        <source>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&apos;t be restored.</source>
-        <translation>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&apos;t be restored.</translation>
+        <source>Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can&apos;t be restored.</source>
+        <translation>Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can&apos;t be restored.</translation>
     </message>
     <message id="start-restore-message-line-2">
         <source>That&apos;s the final version till the future validation and process.</source>
@@ -871,7 +871,7 @@
         <source>Node protocol error!</source>
         <translation>Node protocol error!</translation>
     </message>
-    <message id="wallet-model-incompatible-peer">
+    <message id="wallet-model-incompatible-peer-error">
         <source>You are trying to connect to incompatible peer.</source>
         <translation>You are trying to connect to incompatible peer.</translation>
     </message>
@@ -1179,16 +1179,13 @@
         <source>Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet.</source>
         <translation>Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet.</translation>
     </message>
-</context>
-<context>
-    <name>wallet</name>
-    <message>
-        <source>ok</source>
-        <translation type="unfinished">ok</translation>
-    </message>
-    <message>
+    <message id="can-not-generate-new-address-message">
         <source>You cannot generate new address. Your wallet doesn&apos;t have a master key.</source>
-        <translation type="unfinished"></translation>
+        <translation>You cannot generate new address. Your wallet doesn&apos;t have a master key.</translation>
+    </message>
+    <message id="can-not-generate-new-address-ok-button">
+        <source>ok</source>
+        <translation>ok</translation>
     </message>
 </context>
 </TS>
diff --git a/ui/i18n/ru_RU.ts b/ui/i18n/ru_RU.ts
@@ -443,17 +443,17 @@
         <source>Notifications view</source>
         <translation>Оповещения</translation>
     </message>
-    <message id="status-updating">
-        <source>updating</source>
-        <translation>обновление</translation>
+    <message id="status-connecting">
+        <source>connecting</source>
+        <translation>подключение</translation>
     </message>
     <message id="status-online">
         <source>online</source>
         <translation>в сети</translation>
     </message>
-    <message id="status-connecting">
-        <source>connecting</source>
-        <translation>подключение</translation>
+    <message id="status-updating">
+        <source>updating</source>
+        <translation>обновление</translation>
     </message>
     <message id="tx-details-title">
         <source>General transaction info</source>
@@ -716,12 +716,12 @@
         <translation>восстановить кошелек</translation>
     </message>
     <message id="start-restore-message-line-1">
-        <source>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&apos;t be restored.</source>
-        <translation>Ваши средства будут восстановлены из цепочки блоков. История ваших транзакций и ваши адреса хранятся локально, зашифрованные паролем, их восстановление невожможно</translation>
+        <source>Your funds will be fully restored from the blockchain. The transaction history and addresses are stored only locally, hence can&apos;t be restored.</source>
+        <translation>Ваши средства будут восстановлены из цепочки блоков. История ваших транзакций и ваши адреса хранятся локально, поэтому их восстановление невожможно.</translation>
     </message>
     <message id="start-restore-message-line-2">
         <source>That&apos;s the final version till the future validation and process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы используете последнюю версию.</translation>
     </message>
     <message id="start-create-button">
         <source>create new wallet</source>
@@ -903,7 +903,7 @@
         <source>Node protocol error!</source>
         <translation>Ошибка протокола</translation>
     </message>
-    <message id="wallet-model-incompatible-peer">
+    <message id="wallet-model-incompatible-peer-error">
         <source>You are trying to connect to incompatible peer.</source>
         <translation>Несовместимый пир</translation>
     </message>
@@ -1179,16 +1179,13 @@
         <source>Failed to start the integrated node: the timezone settings of your machine are out of sync. Please fix them and restart the wallet.</source>
         <translation>Невозможно запустить локальный узел: время компьютера не синхронизированно. Проверьте настройки времени и перезапустите кошелек.</translation>
     </message>
-</context>
-<context>
-    <name>wallet</name>
-    <message>
-        <source>ok</source>
-        <translation type="unfinished">ok</translation>
-    </message>
-    <message>
+    <message id="can-not-generate-new-address-message">
         <source>You cannot generate new address. Your wallet doesn&apos;t have a master key.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы не можете сгенерировать новый адрес. В кошельке отсутствует мастер-ключ</translation>
+    </message>
+    <message id="can-not-generate-new-address-ok-button">
+        <source>ok</source>
+        <translation>Хорошо</translation>
     </message>
 </context>
 </TS>
diff --git 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
@@ -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
@@ -100,15 +100,19 @@ 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
                 wrapMode: Text.WordWrap
             }
 
             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()