From e0b43d8b99274cd9b529ef00b7b55bd97a02a670 Mon Sep 17 00:00:00 2001
From: Scurious <happyconcepts.com@gmail.com>
Date: Mon, 23 Oct 2017 01:28:24 -0700
Subject: [PATCH] 622 Harmonized login (#629)

* Update README.md

* Issue 315 - Add Chart Clamp To Settings Dropdown (#373)

* Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.

* resolve conflict

* Update README.md

* Local Wallet Login
---
 app/assets/locales/locale-en.json           | 4 ++--
 app/components/Wallet/WalletUnlockModal.jsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
index c6a74fe388..a3fced38b4 100644
--- a/app/assets/locales/locale-en.json
+++ b/app/assets/locales/locale-en.json
@@ -33,7 +33,7 @@
     "create_asset": "Create Asset",
     "update_asset": "Update Asset",
     "lock": "Log out (lock the local wallet)",
-    "unlock": "Log in (unlock the local wallet)",
+    "unlock": "Local Wallet Login",
     "unlock_password": "Cloud Wallet Login",
     "unlock_short": "Login",
     "help": "Help",
@@ -1041,7 +1041,7 @@
     "done": "Done",
     "verify": "I've written it down",
     "invalid_format": "Invalid Format",
-    "enter_password": "Enter Password",
+    "enter_password": "Password",
     "confirm_password": "Confirm Password",
     "pass_incorrect": "Incorrect password",
     "confirm_error": "The confirmation does not match the password",
diff --git a/app/components/Wallet/WalletUnlockModal.jsx b/app/components/Wallet/WalletUnlockModal.jsx
index 3d6ab6bfc7..c4a2710512 100644
--- a/app/components/Wallet/WalletUnlockModal.jsx
+++ b/app/components/Wallet/WalletUnlockModal.jsx
@@ -165,7 +165,7 @@ class WalletUnlockModal extends React.Component {
 
                 <div>
                     <div className="button-group">
-                        <button className="button" data-place="bottom" data-html data-tip={counterpart.translate("tooltip.login")} onClick={this.onPasswordEnter}><Translate content="header.unlock" /></button>
+                        <button className="button" data-place="bottom" data-html data-tip={counterpart.translate("tooltip.login")} onClick={this.onPasswordEnter}><Translate content="header.unlock_short" /></button>
                         <Trigger close={this.props.modalId}>
                             <div className=" button"><Translate content="account.perm.cancel" /></div>
                         </Trigger>