Move profile-related settings to their own form

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index dd7d8e7f84e8a50de0f9bf67dd3a62a0fb161067..062486f2a14ec3c867015359f4ed3927e8d8b66f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1399,8 +1399,8 @@ en-GB:
         link in the account confirmation email to activate your account, or <a href="%{reconfirm}">request
         a new confirmation email</a>.
       account is suspended: Sorry, your account has been suspended due to suspicious
-        activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if
-        you wish to discuss this.
+        activity.<br />Please contact <a href="%{webmaster}">support</a> if you wish
+        to discuss this.
       auth failure: Sorry, could not log in with those details.
       openid_logo_alt: Log in with an OpenID
       auth_providers:
@@ -2019,9 +2019,9 @@ 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>
-        to arrange for an account to be created - we will try and deal with the request
-        as quickly as possible.
+      contact_support_html: Please contact <a href="%{support}">support</a> to arrange
+        for an account to be created - we will try and deal with the request as quickly
+        as possible.
       about:
         header: Free and editable
         html: |-
@@ -2058,8 +2058,7 @@ en-GB:
         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>.
+        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
@@ -2205,13 +2204,12 @@ 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.
         </p>
         <p>
-          This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this.
+          This decision will be reviewed by an administrator shortly, or you may contact %{webmaster} if you wish to discuss this.
         </p>
     auth_failure:
       connection_failed: Connection to authentication provider failed