github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 11:13:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

minor copyedits around login / email

Browse Source
This commit is contained in:
Jeff Atwood 2013-02-25 16:23:00 -08:00
parent e28594b94e
commit ea9196a8a2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,9 +233,9 @@ en:
authenticating: "Authenticating..."
awaiting_confirmation: "Your account is awaiting activation, use the forgot password link to issue another activation email."
awaiting_approval: "Your account has not been approved by a moderator yet. You will receive an email when it is approved."
not_activated: "You can't log in yet. We sent an activation email to you at <b>{{sentTo}}</b>. Please follow the instructions in the email to activate your account."
not_activated: "You can't log in yet. We previously sent an activation email to you at <b>{{sentTo}}</b>. Please follow the instructions in that email to activate your account."
resend_activation_email: "Click here to send the activation email again."
sent_activation_email_again: "We sent another activation email to you at your current email address: <b>{{currentEmail}}</b>. It might take a few minutes for it to arrive. Be sure to check your spam folder."
sent_activation_email_again: "We sent another activation email to you at <b>{{currentEmail}}</b>. It might take a few minutes for it to arrive; be sure to check your spam folder."
google:
title: "Log In with Google"
message: "Authenticating with Google (make sure pop up blockers are not enabled)"

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

@ -470,7 +470,7 @@ en:
- Have you checked to make sure the IPs of the server the mail originates from are [not on any email blacklists][4]?
- Have you verified that your email server is *definitely* sending a fully qualified hostname in its HELO message? This will cause your email to be rejected by many mail services.
- Have you verified that your email server is *definitely* sending a fully-qualified hostname that resolves in DNS in its HELO message? If not, this will cause your email to be rejected by many mail services.
We hope you received this email deliverability test OK!