diff options
| author | Anike Arni <anikarni@gmail.com> | 2017-02-23 11:21:39 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 11:21:39 -0300 |
| commit | b06face47a2e19cc1afcda3f0e298d19f7dcb6bb (patch) | |
| tree | 1e28b3200f329f4ddbe85c399e26b05d192ea354 /web-ui/app/locales | |
| parent | 92c6a9dbc39318df48b4b3d5fae1a3888f201343 (diff) | |
| parent | 55cae8e71afec52e31401c512b8bebbb1e5ca88d (diff) | |
Merge pull request #987 from pixelated/login-errors
Adds welcome and error messages to login
Diffstat (limited to 'web-ui/app/locales')
| -rw-r--r-- | web-ui/app/locales/en_US/translation.json | 10 | ||||
| -rw-r--r-- | web-ui/app/locales/pt_BR/translation.json | 10 |
2 files changed, 16 insertions, 4 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." } } diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/app/locales/pt_BR/translation.json index b38b7535..431b8f82 100644 --- a/web-ui/app/locales/pt_BR/translation.json +++ b/web-ui/app/locales/pt_BR/translation.json @@ -65,7 +65,11 @@ "timeout": "A operação excedeu o limite de tempo", "general": "Problemas ao se comunicar com o servidor", "parse": "Obteve uma resposta inválida do servidor", - "auth": "E-mail ou senha inválidos" + "auth": "E-mail ou senha inválidos", + "login": { + "title": "Ops, algo deu errado :(", + "message": "Tente entrar novamente em alguns minutos. Se o problema persistir, contate o administrador da sua conta." + } }, "tags": { "inbox": "Caixa de Entrada", @@ -89,6 +93,8 @@ "login": { "email": "Seu e-mail", "password": "Sua senha", - "submit": "Entrar" + "submit": "Entrar", + "welcome-image-alt": "Imagem de boas vindas", + "welcome-message": "Pixelated é um e-mail que respeita a privacidade da sua informação." } } |