Merge remote-tracking branch 'upstream/pull/4490'

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6620c594f47942d98e99e39e133d1f34eb270475..a2347d4bc66c2cdfc1aca343218014fe66241679 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1753,7 +1753,7 @@ en:
     new:
       title: "Lost password"
       heading: "Forgotten Password?"
     new:
       title: "Lost password"
       heading: "Forgotten Password?"

-      email address: "Email Address:"
+      email address: "Email Address"

       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:


@@ -1811,8 +1811,8 @@ en:
     new:
       title: "Login"
       heading: "Login"
     new:
       title: "Login"
       heading: "Login"

-      email or username: "Email Address or Username:"
-      password: "Password:"
+      email or username: "Email Address or Username"
+      password: "Password"

       openid_html: "%{logo} OpenID:"
       remember: "Remember me"
       lost password link: "Lost your password?"
       openid_html: "%{logo} OpenID:"
       remember: "Remember me"
       lost password link: "Lost your password?"