Merge remote-tracking branch 'upstream/pull/3117'

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a54403e54561352f7f6bffd881541b9bb7bfa152..0939470fbf555d0b06bb05cda30e485763548db2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -147,15 +147,20 @@ en-GB:
         title: Subject
         body: Body
         recipient: Recipient
         title: Subject
         body: Body
         recipient: Recipient

+      redaction:
+        description: Description

       report:
         category: 'Select a reason for your report:'
         details: Please provide some more details about the problem (required).
       user:
         email: E-mail
       report:
         category: 'Select a reason for your report:'
         details: Please provide some more details about the problem (required).
       user:
         email: E-mail

+        new_email: New Email Address

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

-        description: Description
-        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:


@@ -163,6 +168,8 @@ en-GB:
         tagstring: comma delimited
       user_block:
         needs_view: Does the user need to log in before this block will be cleared?
         tagstring: comma delimited
       user_block:
         needs_view: Does the user need to log in before this block will be cleared?

+      user:
+        new_email: (never displayed publicly)

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -212,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


@@ -419,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


@@ -449,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


@@ -2024,15 +2031,10 @@ en-GB:
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'

-      not_displayed_publicly_html: Your address is not displayed publicly, see our
-        <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
-        policy including section on email addresses">privacy policy</a> for more information

       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'

-      password: 'Password:'
-      confirm password: 'Confirm Password:'

       use external auth: Alternatively, use a third party to login
       auth no password: With third party authentication a password is not required,
         but some extra tools or server may still need one.
       use external auth: Alternatively, use a third party to login
       auth no password: With third party authentication a password is not required,
         but some extra tools or server may still need one.


@@ -2135,15 +2137,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:'
-      new email address: 'New Email Address:'
-      email never displayed publicly: (never displayed publicly)
-      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 +2159,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,14 +2168,10 @@ 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?

-      profile description: 'Profile Description:'
-      preferred languages: 'Preferred Languages:'
-      preferred editor: 'Preferred Editor:'
-      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

-        link text: what is this?

         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image


@@ -2183,10 +2179,8 @@ 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.
       no home location: You have not entered your home location.

-      latitude: 'Latitude:'
-      longitude: 'Longitude:'

       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public
       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public


@@ -2553,7 +2547,6 @@ en-GB:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      description: Description

       heading: Edit redaction
       title: Edit redaction
     index:
       heading: Edit redaction
       title: Edit redaction
     index:


@@ -2561,7 +2554,6 @@ en-GB:
       heading: List of redactions
       title: List of redactions
     new:
       heading: List of redactions
       title: List of redactions
     new:

-      description: Description

       heading: Enter information for new redaction
       title: Creating new redaction
     show:
       heading: Enter information for new redaction
       title: Creating new redaction
     show: