Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Log in / Sign in

This commit is contained in:
Jeff Atwood 2014-05-24 15:14:03 -07:00
parent 334cbea0d7
commit 64f8b8c0e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/locales/client.en.yml
View File

@ -493,12 +493,12 @@ en:
login: login:
title: "Sign In" title: "Sign In"
username: "Login" username: "User"
password: "Password" password: "Password"
email_placeholder: "email or username" email_placeholder: "email or username"
error: "Unknown error" error: "Unknown error"
reset_password: 'Reset Password' reset_password: 'Reset Password'
logging_in: "Logging In..." logging_in: "Signing In..."
or: "Or" or: "Or"
authenticating: "Authenticating..." authenticating: "Authenticating..."
awaiting_confirmation: "Your account is awaiting activation, use the forgot password link to issue another activation email." awaiting_confirmation: "Your account is awaiting activation, use the forgot password link to issue another activation email."

4
config/locales/server.en.yml
View File

@ -1199,9 +1199,9 @@ en:
We've automatically generated a username for you: **%{username}**, but you can change that any time by visiting [your user profile][prefs]. We've automatically generated a username for you: **%{username}**, but you can change that any time by visiting [your user profile][prefs].
To log in again, either: To sign in again, either:
1. Log in however you like -- but that login must resolve to the **same email address** that you received your original invitation email at. Otherwise we won't be able to tell it is you! 1. Sign in however you like -- but that login must resolve to the **same email address** that you received your original invitation email at. Otherwise we won't be able to tell it is you!
2. Create a unique password for %{site_name} on [your user profile][prefs], then log in with that. 2. Create a unique password for %{site_name} on [your user profile][prefs], then log in with that.