aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-08-07 09:56:04 +0300
committerninioe <ninioe@gmail.com>2016-08-07 09:56:04 +0300
commitc1c5a5fd34402a4e9b0840a7b960c38371dd9748 (patch)
tree1c04413e2f2cc450c4be23ef459597b2b4e9f776 /web
parente26d81c7430d8668b3af1bbf15672f06a855d6d0 (diff)
parentdea7617218de2cbc7ebd930b4342aa35ffedcd8b (diff)
downloadtraccar-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.gz
traccar-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.bz2
traccar-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.zip
Merge remote-tracking branch 'refs/remotes/tananaev/master'
# Conflicts: # web/app/view/LoginController.js
Diffstat (limited to 'web')
-rw-r--r--web/app/view/Login.js4
-rw-r--r--web/l10n/en.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/web/app/view/Login.js b/web/app/view/Login.js
index 259086854..db3c55261 100644
--- a/web/app/view/Login.js
+++ b/web/app/view/Login.js
@@ -77,8 +77,8 @@ Ext.define('Traccar.view.Login', {
inputAttrTpl: ['autocomplete="on"']
}, {
xtype: 'checkboxfield',
- reference: 'rememberMeField',
- fieldLabel: Strings.rememberMe
+ reference: 'rememberField',
+ fieldLabel: Strings.userRemember
}, {
xtype: 'component',
html: '<iframe id="submitTarget" name="submitTarget" style="display:none"></iframe>'
diff --git a/web/l10n/en.json b/web/l10n/en.json
index c64d06b45..37e4537f2 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -30,7 +30,7 @@
"userEmail": "Email",
"userPassword": "Password",
"userAdmin": "Admin",
- "rememberMe": "Remember Me",
+ "userRemember": "Remember",
"loginTitle": "Login",
"loginLanguage": "Language",
"loginRegister": "Register",