From ea9196a8a27af272e7ffb359dae63c7c6db28934 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 25 Feb 2013 16:23:00 -0800 Subject: [PATCH] minor copyedits around login / email --- config/locales/client.en.yml | 4 ++-- config/locales/server.en.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 120a415c384..e0230284265 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -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 {{sentTo}}. 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 {{sentTo}}. 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: {{currentEmail}}. 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 {{currentEmail}}. 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)" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 62bcbee1e08..060124f7dc8 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -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!