Enable access token reuse for OAuth 2

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2e7da718e2ac3827cbcfe5c3b3d233415b3bb311..dd7d8e7f84e8a50de0f9bf67dd3a62a0fb161067 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:
       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
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address


@@ -1427,9 +1422,6 @@ en-GB:
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account

-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID

         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID


@@ -1926,7 +1918,6 @@ en-GB:
         or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
       upload_trace: Upload a trace
         or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
       upload_trace: Upload a trace

-      see_all_traces: See all traces

     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:


@@ -2047,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!
         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
     terms:
       title: Terms
       heading: Terms


@@ -2068,6 +2056,11 @@ en-GB:
         france: France
         italy: Italy
         rest_of_world: Rest of the world
         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
     no_such_user:
       title: No such user
       heading: The user %{user} does not exist


@@ -2084,7 +2077,6 @@ en-GB:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       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
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message


@@ -2324,8 +2316,8 @@ en-GB:
     show:
       title: '%{block_on} blocked by %{block_by}'
       heading_html: '%{block_on} blocked by %{block_by}'
     show:
       title: '%{block_on} blocked by %{block_by}'
       heading_html: '%{block_on} blocked by %{block_by}'

-      created: Created
-      status: Status
+      created: 'Created:'
+      status: 'Status:'

       show: Show
       edit: Edit
       revoke: Revoke!
       show: Show
       edit: Edit
       revoke: Revoke!