X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1303ba8c7d11b71c0366af4791af1e95f89b0211..9e98c9d41df683c131719cca60b9a8b5f3d267d9:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f97a3fb1..f7ee6d04a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -116,20 +116,36 @@ en:
         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:
+        auth_provider: Authentication Provider
+        auth_uid: Authentication UID
         email: "Email"
+        email_confirmation: "Email Confirmation"
+        new_email: "New Email Address"
         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:
       trace:
         tagstring: comma delimited
+      user_block:
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        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:
@@ -1278,7 +1294,7 @@ en:
         open: Open
         resolved: Resolved
     update:
-      new_report: Your report has been registered sucessfully
+      new_report: Your report has been registered successfully
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     show:
@@ -1349,7 +1365,7 @@ en:
           abusive_label: This note is abusive
           other_label: Other
     create:
-      successful_report: Your report has been registered sucessfully
+      successful_report: Your report has been registered successfully
       provide_details: Please provide the required details
   layouts:
     project_name:
@@ -1979,23 +1995,6 @@ en:
           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: |
@@ -2299,12 +2298,9 @@ en:
           <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:"
-      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
@@ -2409,15 +2405,13 @@ en:
     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:
-        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?"
@@ -2427,21 +2421,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: "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?"
-      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"
-        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"
@@ -2449,10 +2440,8 @@ en:
       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."
-      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
@@ -2552,20 +2541,16 @@ en:
     new:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
-      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       tried_contacting: "I have contacted the user and asked them to stop."
       tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
-      needs_view: "User needs to log in before this block will be cleared"
       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
-      reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."
       show: "View this block"
       back: "View all blocks"
-      needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       block_expired: "The block has already expired and cannot be edited."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
@@ -2668,7 +2653,7 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
-      image_size: "Image will show standard layer at "
+      image_dimensions: "Image will show standard layer at %{width} x %{height}"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
@@ -2696,6 +2681,7 @@ en:
           other: You are within %{count} feet of this point
       base:
         standard: Standard
+        cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
@@ -2710,6 +2696,7 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
       opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
@@ -2840,7 +2827,6 @@ en:
       centre_map: Centre map here
   redactions:
     edit:
-      description: "Description"
       heading: "Edit redaction"
       title: "Edit redaction"
     index:
@@ -2848,7 +2834,6 @@ en:
       heading: "List of redactions"
       title: "List of redactions"
     new:
-      description: "Description"
       heading: "Enter information for new redaction"
       title: "Creating new redaction"
     show: