Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 730ab9b14d2e41b3f31dfbb1a5478d53d72b60dd..e8e86dd47a7a6e6c4f53904a98c654f04182f367 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1279,11 +1279,6 @@ 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
@@ -2024,7 +2019,7 @@ en-GB:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
         account for you automatically.
-      contact_webmaster_html: Please contact the <a href="%{webmaster}">webmaster</a>
+      contact_support_html: Please contact the <a href="%{support}">webmaster</a>
         to arrange for an account to be created - we will try and deal with the request
         as quickly as possible.
       about:
@@ -2043,9 +2038,6 @@ 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
@@ -2064,6 +2056,10 @@ 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 %{terms_declined_link}.
+      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
@@ -2080,7 +2076,6 @@ 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
@@ -2209,7 +2204,6 @@ en-GB:
     suspended:
       title: Account Suspended
       heading: Account Suspended
-      webmaster: webmaster
       body_html: |-
         <p>
           Sorry, your account has been automatically suspended due to suspicious activity.