Move duration to its own line, so that it can be clearly labelled

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c28492a27bec5e9dcb2df0ffc14201806eded5d0..f075fd00b8d8e281d4083aafb193548c7f4d8df2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,16 +116,25 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
         title: "Subject"
         body: "Body"
         recipient: "Recipient"

+      redaction:
+        title: Title
+        description: Description

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

+        auth_provider: Authentication Provider
+        auth_uid: Authentication UID

         email: "Email"
         email_confirmation: "Email Confirmation"
         email: "Email"
         email_confirmation: "Email Confirmation"

+        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
+        preferred_editor: Preferred Editor

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


@@ -136,6 +145,7 @@ en:
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: '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.'
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: '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.'

+        new_email: "(never displayed publicly)"

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


@@ -953,12 +963,14 @@ en:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:

+          atoll: "Atoll"

           bare_rock: "Bare Rock"
           bay: "Bay"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
           cliff: "Cliff"
           bare_rock: "Bare Rock"
           bay: "Bay"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
           cliff: "Cliff"

+          coastline: "Coastline"

           crater: "Crater"
           dune: "Dune"
           fell: "Fell"
           crater: "Crater"
           dune: "Dune"
           fell: "Fell"


@@ -976,6 +988,7 @@ en:
           moor: "Moor"
           mud: "Mud"
           peak: "Peak"
           moor: "Moor"
           mud: "Mud"
           peak: "Peak"

+          peninsula: "Peninsula"

           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"


@@ -1023,6 +1036,7 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
           "yes": "Office"
         place:
           allotments: "Allotments"

+          archipelago: "Archipelago"

           city: "City"
           city_block: "City Block"
           country: "Country"
           city: "City"
           city_block: "City Block"
           country: "Country"


@@ -1509,7 +1523,7 @@ en:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"

-      outbox: "outbox"
+      my_outbox: "My 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"


@@ -1542,9 +1556,8 @@ en:
       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"
+      my_inbox: "My Inbox"
+      my_outbox: "My 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"


@@ -1985,23 +1998,6 @@ en:
           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:
       title: Welcome!
       introduction_html: |


@@ -2117,7 +2113,6 @@ en:
       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"


@@ -2125,7 +2120,6 @@ en:
       trackable: "TRACKABLE"
       by: "by"
       in: "in"
       trackable: "TRACKABLE"
       by: "by"
       in: "in"

-      map: "map"

     index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
     index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"


@@ -2308,8 +2302,6 @@ en:
       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."
       continue: Sign Up
       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."
       continue: Sign Up


@@ -2414,15 +2406,13 @@ en:
     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?"


@@ -2432,21 +2422,18 @@ en:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       contributor terms:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming 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 accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
         link text: "what is this?"
         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 accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://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?"
+        what_is_gravatar: "What is Gravatar?"

         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"


@@ -2454,10 +2441,8 @@ en:
       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


@@ -2622,6 +2607,7 @@ en:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
       created: "Created"
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
       created: "Created"

+      duration: "Duration"

       status: "Status"
       show: "Show"
       edit: "Edit"
       status: "Status"
       show: "Show"
       edit: "Edit"


@@ -2843,7 +2829,6 @@ en:
       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:


@@ -2851,7 +2836,6 @@ en:
       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: