summaryrefslogtreecommitdiff
path: root/web-ui/app/locales/en_US
diff options
context:
space:
mode:
authorAnike Arni <anikarni@gmail.com>2017-02-23 11:21:39 -0300
committerGitHub <noreply@github.com>2017-02-23 11:21:39 -0300
commitb06face47a2e19cc1afcda3f0e298d19f7dcb6bb (patch)
tree1e28b3200f329f4ddbe85c399e26b05d192ea354 /web-ui/app/locales/en_US
parent92c6a9dbc39318df48b4b3d5fae1a3888f201343 (diff)
parent55cae8e71afec52e31401c512b8bebbb1e5ca88d (diff)
Merge pull request #987 from pixelated/login-errors
Adds welcome and error messages to login
Diffstat (limited to 'web-ui/app/locales/en_US')
-rw-r--r--web-ui/app/locales/en_US/translation.json10
1 files changed, 8 insertions, 2 deletions
diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json
index 7aad4fe8..3f050e67 100644
--- a/web-ui/app/locales/en_US/translation.json
+++ b/web-ui/app/locales/en_US/translation.json
@@ -65,7 +65,11 @@
"timeout": "A timeout occurred",
"general": "Problems talking to server",
"parse": "Got invalid response from server",
- "auth": "Invalid email or password"
+ "auth": "Invalid email or password",
+ "login": {
+ "title": "Oh, something went wrong :(",
+ "message": "Try to login again in a few minutes. If the problem persists, contact your account administrator."
+ }
},
"tags": {
"inbox": "Inbox",
@@ -89,6 +93,8 @@
"login": {
"email": "Your email",
"password": "Your password",
- "submit": "Login"
+ "submit": "Login",
+ "welcome-image-alt": "Welcome image",
+ "welcome-message": "Pixelated is an email that respects the privacy of your information."
}
}