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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index dd7d8e7f84e8a50de0f9bf67dd3a62a0fb161067..730ab9b14d2e41b3f31dfbb1a5478d53d72b60dd 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1279,6 +1279,11 @@ en-GB:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
+      success_html: We've sent a new confirmation note to %{email} and as soon as
+        you confirm your account you'll be able to get mapping.<br /><br />If you
+        use an antispam system which sends confirmation requests then please make
+        sure you whitelist %{sender} as we are unable to reply to any confirmation
+        requests.
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
@@ -2038,6 +2043,9 @@ en-GB:
         but some extra tools or server may still need one.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
+      terms declined: We are sorry that you have decided to not accept the new Contributor
+        Terms. For more information, please see <a href="%{url}">this wiki page</a>.
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: Terms
       heading: Terms
@@ -2056,11 +2064,6 @@ en-GB:
         france: France
         italy: Italy
         rest_of_world: Rest of the world
-    terms_declined_flash:
-      terms_declined_html: We are sorry that you have decided to not accept the new
-        Contributor Terms. For more information, please see <a href="%{url}">this
-        wiki page</a>.
-      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: No such user
       heading: The user %{user} does not exist
@@ -2077,6 +2080,7 @@ en-GB:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
+      oauth settings: oauth settings
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message