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 b48b8b72756079dd537dbfd1b9962de4cc1811d6..730ab9b14d2e41b3f31dfbb1a5478d53d72b60dd 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -154,13 +154,13 @@ en-GB:
         details: Please provide some more details about the problem (required).
       user:
         email: E-mail
         details: Please provide some more details about the problem (required).
       user:
         email: E-mail

-        new_email: 'New Email Address:'
+        new_email: New Email Address

         active: Active
         display_name: Display Name
         active: Active
         display_name: Display Name

-        description: Description
-        home_lat: 'Latitude:'
-        home_lon: 'Longitude:'
-        languages: Languages
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages

         pass_crypt: Password
         pass_crypt_confirmation: Confirm Password
     help:
         pass_crypt: Password
         pass_crypt_confirmation: Confirm Password
     help:


@@ -219,7 +219,7 @@ en-GB:
       description: iD (in-browser editor)
     remote:
       name: Remote Control
       description: iD (in-browser editor)
     remote:
       name: Remote Control

-      description: Remote Control (JOSM or Merkaartor)
+      description: Remote Control (JOSM, Potlatch, Merkaartor)

   auth:
     providers:
       none: None
   auth:
     providers:
       none: None


@@ -426,7 +426,7 @@ en-GB:
     new:
       title: New Diary Entry
     form:
     new:
       title: New Diary Entry
     form:

-      location: 'Location:'
+      location: Location

       use_map_link: Use map
     index:
       title: Users' diaries
       use_map_link: Use map
     index:
       title: Users' diaries


@@ -456,7 +456,7 @@ en-GB:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:

-      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
+      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}.

       updated_at_html: Last updated on %{updated}.
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       updated_at_html: Last updated on %{updated}.
       comment_link: Comment on this entry
       reply_link: Send a message to the author


@@ -1265,11 +1265,38 @@ en-GB:
       details: More details about the changeset can be found at %{url}.
       unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
         click "Unsubscribe".
       details: More details about the changeset can be found at %{url}.
       unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
         click "Unsubscribe".

+  confirmations:
+    confirm:
+      heading: Check your email!
+      introduction_1: We sent you a confirmation email.
+      introduction_2: Confirm your account by clicking on the link in the email and
+        you'll be able to start mapping.
+      press confirm button: Press the confirm button below to activate your account.
+      button: Confirm
+      success: Confirmed your account, thanks for signing up!
+      already active: This account has already been confirmed.
+      unknown token: That confirmation code has expired or does not exist.
+      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
+      press confirm button: Press the confirm button below to confirm your new e-mail
+        address.
+      button: Confirm
+      success: Confirmed your change of email address!
+      failure: An e-mail address has already been confirmed with this token.
+      unknown_token: That confirmation code has expired or does not exist.

   messages:
     inbox:
       title: Inbox
       my_inbox: My Inbox
   messages:
     inbox:
       title: Inbox
       my_inbox: My Inbox

-      outbox: outbox

       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'
       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'


@@ -1304,9 +1331,6 @@ en-GB:
       body: Sorry, there is no message with that id.
     outbox:
       title: Outbox
       body: Sorry, there is no message with that id.
     outbox:
       title: Outbox

-      my_inbox_html: My %{inbox_link}
-      inbox: inbox
-      outbox: outbox

       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages
       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages


@@ -1340,6 +1364,79 @@ en-GB:
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted

+  passwords:
+    lost_password:
+      title: Lost password
+      heading: Forgotten Password?
+      email address: E-mail address
+      new password button: Reset password
+      help_text: Enter the e-mail address you used to sign up, we will send a link
+        to it that you can use to reset your password.
+      notice email on way: Sorry you lost it :-( but an email is on its way so you
+        can reset it soon.
+      notice email cannot find: Could not find that email address, sorry.
+    reset_password:
+      title: Reset password
+      heading: Reset Password for %{user}
+      reset: Reset Password
+      flash changed: Your password has been changed.
+      flash token bad: Did not find that token, check the URL maybe?
+  sessions:
+    new:
+      title: Login
+      heading: Login
+      email or username: 'E-mail Address or Username:'
+      password: 'Password:'
+      openid_html: '%{logo} OpenID:'
+      remember: Remember me
+      lost password link: Lost your password?
+      login_button: Login
+      register now: Register now
+      with username: 'Already have an OpenStreetMap account? Please login with your
+        username and password:'
+      with external: 'Alternatively, use a third party to login:'
+      new to osm: New to OpenStreetMap?
+      to make changes: To make changes to the OpenStreetMap data, you must have an
+        account.
+      create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
+      account not active: Sorry, your account is not active yet.<br />Please use the
+        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.
+      auth failure: Sorry, could not log in with those details.
+      openid_logo_alt: Log in with an OpenID
+      auth_providers:
+        openid:
+          title: Login with OpenID
+          alt: Login with an OpenID URL
+        google:
+          title: Login with Google
+          alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
+        wordpress:
+          title: Login with Wordpress
+          alt: Login with a Wordpress OpenID
+        aol:
+          title: Login with AOL
+          alt: Login with an AOL OpenID
+    destroy:
+      title: Logout
+      heading: Logout of OpenStreetMap
+      logout_button: Logout

   site:
     about:
       next: Next
   site:
     about:
       next: Next


@@ -1700,23 +1797,6 @@ en-GB:
           bicycle_shop: Bicycle shop
           bicycle_parking: Bicycle parking
           toilets: Toilets
           bicycle_shop: Bicycle shop
           bicycle_parking: Bicycle parking
           toilets: Toilets

-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL

     welcome:
       title: Welcome!
       introduction_html: Welcome to OpenStreetMap, the free and editable map of the
     welcome:
       title: Welcome!
       introduction_html: Welcome to OpenStreetMap, the free and editable map of the


@@ -1827,7 +1907,6 @@ en-GB:
       more: more
       trace_details: View Trace Details
       view_map: View Map
       more: more
       trace_details: View Trace Details
       view_map: View Map

-      edit: edit

       edit_map: Edit Map
       public: PUBLIC
       identifiable: IDENTIFIABLE
       edit_map: Edit Map
       public: PUBLIC
       identifiable: IDENTIFIABLE


@@ -1835,7 +1914,6 @@ en-GB:
       trackable: TRACKABLE
       by: by
       in: in
       trackable: TRACKABLE
       by: by
       in: in

-      map: map

     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}


@@ -1845,7 +1923,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:


@@ -1943,80 +2020,6 @@ en-GB:
     destroy:
       flash: Destroyed the client application registration
   users:
     destroy:
       flash: Destroyed the client application registration
   users:

-    login:
-      title: Login
-      heading: Login
-      email or username: 'E-mail Address or Username:'
-      password: 'Password:'
-      openid_html: '%{logo} OpenID:'
-      remember: Remember me
-      lost password link: Lost your password?
-      login_button: Login
-      register now: Register now
-      with username: 'Already have an OpenStreetMap account? Please login with your
-        username and password:'
-      with external: 'Alternatively, use a third party to login:'
-      new to osm: New to OpenStreetMap?
-      to make changes: To make changes to the OpenStreetMap data, you must have an
-        account.
-      create account minute: Create an account. It only takes a minute.
-      no account: Don't have an account?
-      account not active: Sorry, your account is not active yet.<br />Please use the
-        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.
-      auth failure: Sorry, could not log in with those details.
-      openid_logo_alt: Log in with an OpenID
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub 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
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID
-    logout:
-      title: Logout
-      heading: Logout of OpenStreetMap
-      logout_button: Logout
-    lost_password:
-      title: Lost password
-      heading: Forgotten Password?
-      email address: E-mail address
-      new password button: Reset password
-      help_text: Enter the e-mail address you used to sign up, we will send a link
-        to it that you can use to reset your password.
-      notice email on way: Sorry you lost it :-( but an email is on its way so you
-        can reset it soon.
-      notice email cannot find: Could not find that email address, sorry.
-    reset_password:
-      title: Reset password
-      heading: Reset Password for %{user}
-      reset: Reset Password
-      flash changed: Your password has been changed.
-      flash token bad: Did not find that token, check the URL maybe?

     new:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
     new:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an


@@ -2137,13 +2140,13 @@ en-GB:
     account:
       title: Edit account
       my settings: My settings
     account:
       title: Edit account
       my settings: My settings

-      current email address: 'Current Email Address:'
-      external auth: 'External Authentication:'
+      current email address: Current Email Address
+      external auth: External Authentication

       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: what is this?
       public editing:
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: what is this?
       public editing:

-        heading: 'Public editing:'
+        heading: Public editing

         enabled: Enabled. Not anonymous and can edit data.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: what is this?
         enabled: Enabled. Not anonymous and can edit data.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: what is this?


@@ -2159,7 +2162,7 @@ en-GB:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:

-        heading: 'Contributor Terms:'
+        heading: Contributor Terms

         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and
         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and


@@ -2168,7 +2171,7 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?

-      image: 'Image:'
+      image: Image

       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar


@@ -2179,7 +2182,7 @@ en-GB:
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)

-      home location: 'Home Location:'
+      home location: Home Location

       no home location: You have not entered your home location.
       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       no home location: You have not entered your home location.
       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes


@@ -2188,33 +2191,6 @@ en-GB:
       flash update success confirm needed: User information updated successfully.
         Check your email for a note to confirm your new email address.
       flash update success: User information updated successfully.
       flash update success confirm needed: User information updated successfully.
         Check your email for a note to confirm your new email address.
       flash update success: User information updated successfully.

-    confirm:
-      heading: Check your email!
-      introduction_1: We sent you a confirmation email.
-      introduction_2: Confirm your account by clicking on the link in the email and
-        you'll be able to start mapping.
-      press confirm button: Press the confirm button below to activate your account.
-      button: Confirm
-      success: Confirmed your account, thanks for signing up!
-      already active: This account has already been confirmed.
-      unknown token: That confirmation code has expired or does not exist.
-      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
-      press confirm button: Press the confirm button below to confirm your new e-mail
-        address.
-      button: Confirm
-      success: Confirmed your change of email address!
-      failure: An e-mail address has already been confirmed with this token.
-      unknown_token: That confirmation code has expired or does not exist.

     set_home:
       flash success: Home location saved successfully
     go_public:
     set_home:
       flash success: Home location saved successfully
     go_public:


@@ -2344,8 +2320,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!