Update bundle

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4046b8068024812675b63a7241b770e303981d60..45c44765d58aaa7e6234b2aaef639a90778d27ab 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1847,15 +1847,16 @@ en:
   sessions:
     new:
       title: "Log in"
-      heading: "Log in"
+      tab_title: "Log in"
+      login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Log in"
       register now: Register now
-      with external: "Alternatively, use a third party to log in:"
-      no account: Don't have an account?
+      with external: "or log in with a third party"
+      or: "or"
       auth failure: "Sorry, could not log in with those details."
     destroy:
       title: "Logout"
@@ -2575,7 +2576,6 @@ en:
       openid_logo_alt: "Log in with an OpenID"
       openid_html: "%{logo} OpenID"
       openid_login_button: "Continue"
-      with external: "Alternatively, use a third party to login:"
       openid:
         title: Log in with OpenID
         alt: Log in with an OpenID URL
@@ -2637,6 +2637,8 @@ en:
       write_redactions: Redact map data
       read_email: Read user email address
       skip_authorization: Auto approve application
+    for_roles:
+      moderator: This permission is for actions available only to moderators
   oauth_clients:
     new:
       title: "Register a new application"
@@ -2728,22 +2730,23 @@ en:
   users:
     new:
       title: "Sign Up"
+      tab_title: "Sign up"
+      signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       support: support
       about:
         header: Free and editable.
         paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
-        paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account.
+        paragraph_2: Sign up to get started contributing.
         welcome: "Welcome to OpenStreetMap"
       duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."
       display name description: "Your publicly displayed username. You can change this later in the preferences."
-      by_signing_up_html: "By signing up, you agree to our %{contributor_terms_link} and %{tou_link}."
+      by_signing_up_html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+      tou: "terms of use"
       contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
-      contributor_terms: "Contributor terms"
+      contributor_terms: "contributor terms"
       external auth: "Third Party Authentication:"
-      use external auth: "Alternatively, use a third party to log in"
-      auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
@@ -2753,6 +2756,8 @@ en:
       consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
       consider_pd: "public domain"
       consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+      or: "or"
+      use external auth: "or sign up with a third party"
     terms:
       title: "Terms"
       heading: "Terms"