wavesplatform · OlyaKanishcheva · May 19, 2021 · May 21, 2021
diff --git a/build-wallet/Dockerfile b/build-wallet/Dockerfile
@@ -1,9 +1,3 @@
-FROM node:lts-alpine as trading-view-${jenkinsPlatform}
-ARG trading_view_token
-WORKDIR /root
-RUN echo "//registry.npmjs.org/:_authToken=\$trading_view_token" > /root/.npmrc && \
-    npm i @waves/trading-view
-
 FROM node:lts-alpine as static-${jenkinsPlatform}
 RUN apk update && apk add git
 
@@ -31,7 +25,7 @@ RUN  mkdir -p /etc/nginx/sites-enabled && \
     apk update && \
     apk add gettext libintl
 WORKDIR /srv/www
-COPY --from=trading-view-${jenkinsPlatform} /root/node_modules node_modules
+#COPY --from=trading-view-${jenkinsPlatform} /root/node_modules node_modules
 COPY --from=static-${jenkinsPlatform} /srv/www .
 COPY ./nginx/default.conf /etc/nginx/sites-available/default.conf
 COPY ./info.html /srv/www/info

diff --git a/locale/en/app.migrate.json b/locale/en/app.migrate.json
@@ -50,9 +50,10 @@
             "desc": "To offer users a better experience and wider range of tools, the exchange has moved from Waves DEX to"
         },
         "oldUser": {
-            "desc": "To continue working with your existing accounts, assets and the exchange, you should move your accounts to the new Waves.Exchange. We strongly recommend that you do this ASAP. The migration process is fast, easy, and absolutely secure."
+            "desc": "If you want to continue working with your accounts, tokens, and exchange, please transfer your accounts to Waves.Exchange. To do this, you need to export your account and then import it into Waves.Exchange. This process is completely simple and safe."
         },
-        "title": "We’re no longer operating this service. For additional information please contact [Waves.Exchange](https://waves.exchange/)"
+        "title": "We no longer support this service. For more information contact [Waves.Exchange](https://waves.exchange/)",
+        "export": "Export account"
     },
     "faq": {
         "attention": {
@@ -146,7 +147,7 @@
         },
         "modalTitle": {
             "moving": "We're moving!",
-            "plate": "Don’t worry! All of your tokens, seed phrases and passwords are safe.",
+            "plate": "Don’t worry! All of your tokens, seed phrases, and passwords are safe.",
             "redirected": "You have been redirected to"
         },
         "signIn": "Sign in",

diff --git a/locale/en/app.signUp.json b/locale/en/app.signUp.json
@@ -13,4 +13,4 @@
         },
         "termsAgreement": "I have read and agree with the [Terms and Conditions](https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf), [Privacy Policy](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf)."
     }
-}
+}
diff --git a/locale/en/app.ui.json b/locale/en/app.ui.json
@@ -156,7 +156,10 @@
         "repeat": "Confirm password",
         "secure": "secure password",
         "title": "Protect Your Account with a New Password",
-        "warn": "easy, add a digit or symbol"
+        "warn": "easy, add a digit or symbol",
+        "createForSaveAcc": "Create Password for Saved Accounts",
+        "confirm": "Confirm Passwords",
+        "notMatch": "Password does not match"
     },
     "qrCodeRead": {
         "closeRead": "Cancel"
@@ -329,4 +332,4 @@
         }
     },
     "whitespace": "&nbsp;"
-}
+}
diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json
@@ -668,8 +668,8 @@
                 "accounts": "Accounts",
                 "export": "Export",
                 "selectAll": "Select all",
-                "title": "Please select account",
-                "unselectAll": "Unselect all"
+                "title": "Please, select accounts",
+                "unselectAll": "Cancel all"
             },
             "general": {
                 "auto": "Auto",
@@ -1028,4 +1028,4 @@
         "sec": "s",
         "startMoving": "Safe moving"
     }
-}
+}
diff --git a/locale/ru/app.migrate.json b/locale/ru/app.migrate.json
@@ -50,9 +50,10 @@
             "desc": "Чтобы улучшить пользовательский опыт и предложить более широкий набор инструментов, биржа переехала с Waves DEX на"
         },
         "oldUser": {
-            "desc": "Если Вы хотите продолжить работать со своими аккаунтами, токенами и биржей, перенесите свои аккаунты на Waves.Exchange. Настоятельно рекомендуем сделать это как можно скорее. Процесс миграции – быстрый, простой и абсолютно безопасный."
+            "desc": "Если Вы хотите продолжить работать со своими аккаунтами, токенами и биржей, перенесите свои аккаунты на Waves.Exchange. Для этого, вам необходимо экспортировать ваш аккаунт и, затем, импортировать его в Waves.Exchange. Данный процесс абсолютно простой и безопасный."
         },
-        "title": "Мы больше не поддерживаем этот сервис. За дополнительной информацией обратитесь в [Waves.Exchange](https://waves.exchange/)"
+        "title": "Мы больше не поддерживаем этот сервис. За дополнительной информацией обратитесь в [Waves.Exchange](https://waves.exchange/)",
+        "export": "Экспортировать аккаунт"
     },
     "faq": {
         "attention": {

diff --git a/locale/ru/app.ui.json b/locale/ru/app.ui.json
@@ -156,7 +156,10 @@
         "repeat": "Подтвердите пароль",
         "secure": "надёжный пароль",
         "title": "Защитите ваш кошелёк паролем",
-        "warn": "очень простой пароль, добавьте цифру или символ"
+        "warn": "очень простой пароль, добавьте цифру или символ",
+        "createForSaveAcc": "Создайте пароль для сохраняемых аккаунтов",
+        "confirm": "Подтвердите пароль",
+        "notMatch": "Пароли не совпадают"
     },
     "qrCodeRead": {
         "closeRead": "Отмена"
@@ -329,4 +332,4 @@
         }
     },
     "whitespace": "&nbsp;"
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ @@
             },
             "termsAgreement": "I have read and agree with the [Terms and Conditions](https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf), [Privacy Policy](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf)."
         }
-    }
+    }