Merge remote-tracking branch 'upstream/pull/2991' into master

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f416f3259dd4e4a54feb299a171c288b2499eff7..31b23e3b8104d2dc7edbe6a0fc16acf4e95f6ab4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,7 +20,7 @@ en:
         create: Send
       client_application:
         create: Register
         create: Send
       client_application:
         create: Register

-        update: Edit
+        update: Update

       redaction:
         create: Create redaction
         update: Save redaction
       redaction:
         create: Create redaction
         update: Save redaction


@@ -75,6 +75,18 @@ en:
     # Translates all the model attributes, which is used in error handling on the web site
     # Only the ones that are used on the web site are translated at the moment
     attributes:
     # Translates all the model attributes, which is used in error handling on the web site
     # Only the ones that are used on the web site are translated at the moment
     attributes:

+      client_application:
+        name: Name (Required)
+        url: Main Application URL (Required)
+        callback_url: Callback URL
+        support_url: Support URL
+        allow_read_prefs:  read their user preferences
+        allow_write_prefs: modify their user preferences
+        allow_write_diary: create diary entries, comments and make friends
+        allow_write_api:   modify the map
+        allow_read_gpx:    read their private GPS traces
+        allow_write_gpx:   upload GPS traces
+        allow_write_notes: modify notes

       diary_comment:
         body: "Body"
       diary_entry:
       diary_comment:
         body: "Body"
       diary_entry:


@@ -104,6 +116,9 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
         title: "Subject"
         body: "Body"
         recipient: "Recipient"

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

       user:
         email: "Email"
         active: "Active"
       user:
         email: "Email"
         active: "Active"


@@ -111,6 +126,7 @@ en:
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"
         description: "Description"
         languages: "Languages"
         pass_crypt: "Password"

+        pass_crypt_confirmation: "Confirm Password"

     help:
       trace:
         tagstring: comma delimited
     help:
       trace:
         tagstring: comma delimited


@@ -216,10 +232,18 @@ en:
     anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"
     anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"

+    part_of_relations:
+      one: 1 relation
+      other: "%{count} relations"
+    part_of_ways:
+      one: 1 way
+      other: "%{count} ways"

     download_xml: "Download XML"
     view_history: "View History"
     view_details: "View Details"
     location: "Location:"
     download_xml: "Download XML"
     view_history: "View History"
     view_details: "View Details"
     location: "Location:"

+    common_details:
+      coordinates_html: "%{latitude}, %{longitude}"

     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"
     changeset:
       title: "Changeset: %{id}"
       belongs_to: "Author"


@@ -230,8 +254,8 @@ en:
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       comment: "Comments (%{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       comment: "Comments (%{count})"

-      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_commented_by_html: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:


@@ -247,6 +271,8 @@ en:
       title_html: "Way: %{name}"
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       title_html: "Way: %{name}"
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"

+      nodes_count:
+        other: "%{count} nodes"

       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"
       also_part_of_html:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"


@@ -254,6 +280,9 @@ en:
       title_html: "Relation: %{name}"
       history_title_html: "Relation History: %{name}"
       members: "Members"
       title_html: "Relation: %{name}"
       history_title_html: "Relation History: %{name}"
       members: "Members"

+      members_count:
+        one: 1 member
+        other: "%{count} members"

     relation_member:
       entry_html: "%{type} %{name}"
       entry_role_html: "%{type} %{name} as %{role}"
     relation_member:
       entry_html: "%{type} %{name}"
       entry_role_html: "%{type} %{name} as %{role}"


@@ -265,6 +294,7 @@ en:
       entry_html: "Relation %{relation_name}"
       entry_role_html: "Relation %{relation_name} (as %{relation_role})"
     not_found:
       entry_html: "Relation %{relation_name}"
       entry_role_html: "Relation %{relation_name} (as %{relation_role})"
     not_found:

+      title: Not Found

       sorry: "Sorry, %{type} #%{id} could not be found."
       type:
         node: node
       sorry: "Sorry, %{type} #%{id} could not be found."
       type:
         node: node


@@ -273,6 +303,7 @@ en:
         changeset: changeset
         note: note
     timeout:
         changeset: changeset
         note: note
     timeout:

+      title: Timeout Error

       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
         node: node
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
         node: node


@@ -308,16 +339,17 @@ en:
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"

-      opened_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      opened_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
-      hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_html: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_anonymous_html: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_html: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      commented_by_anonymous_html: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_html: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      closed_by_anonymous_html: "Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"

       report: Report this note
       report: Report this note

+      coordinates_html: "%{latitude}, %{longitude}"

     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."


@@ -401,7 +433,8 @@ en:
       heading: "No entry with the id: %{id}"
       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:
       heading: "No entry with the id: %{id}"
       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
       comment_count:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:


@@ -423,6 +456,7 @@ en:
       location: "Location:"
       view: "View"
       edit: "Edit"
       location: "Location:"
       view: "View"
       edit: "Edit"

+      coordinates: "%{latitude}; %{longitude}"

     feed:
       user:
         title: "OpenStreetMap diary entries for %{user}"
     feed:
       user:
         title: "OpenStreetMap diary entries for %{user}"


@@ -1211,16 +1245,15 @@ en:
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"

+        level3: "Region Boundary"

         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"
         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"

+        level7: "Municipality Boundary"

         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"

-    description:
-      title:
-        osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
+        level11: "Neighbourhood Boundary"

       types:
         cities: Cities
         towns: Towns
       types:
         cities: Cities
         towns: Towns


@@ -1299,8 +1332,6 @@ en:
     new:
       title_html: "Report %{link}"
       missing_params: "Cannot create a new report"
     new:
       title_html: "Report %{link}"
       missing_params: "Cannot create a new report"

-      details: Please provide some more details about the problem (required).
-      select: "Select a reason for your report:"

       disclaimer:
         intro: "Before sending your report to the site moderators, please ensure that:"
         not_just_mistake: You are certain that the problem is not just a mistake
       disclaimer:
         intro: "Before sending your report to the site moderators, please ensure that:"
         not_just_mistake: You are certain that the problem is not just a mistake


@@ -1382,7 +1413,7 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
       text: Make a Donation
     learn_more: "Learn More"
     more: More

-  notifier:
+  user_mailer:

     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"


@@ -1399,23 +1430,21 @@ en:
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
       befriend_them: "You can also add them as a friend at %{befriendurl}."

-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
-      and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
-        failed_to_import: "failed to import. Here is the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
-        more_info_2: "them can be found at:"
-        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
-        subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully:
-          one: loaded successfully with %{trace_points} out of a possible 1 point.
-          other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+    gpx_description:
+      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+    gpx_failure:
+      hi: "Hi %{to_user},"
+      failed_to_import: "failed to import. Here is the error:"
+      more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
+      import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      subject: "[OpenStreetMap] GPX Import failure"
+    gpx_success:
+      hi: "Hi %{to_user},"
+      loaded_successfully:
+        one: loaded successfully with %{trace_points} out of a possible 1 point.
+        other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+      subject: "[OpenStreetMap] GPX Import success"

     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"


@@ -1610,7 +1639,7 @@ en:
           full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
         intro_3_1_html: |
           full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
         intro_3_1_html: |

-          Our documentation is licensed under the 
+          Our documentation is licensed under the

           <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: How to credit OpenStreetMap
           <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: How to credit OpenStreetMap


@@ -1627,11 +1656,11 @@ en:
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address) and to opendatacommons.org.
         credit_3_1_html: |
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address) and to opendatacommons.org.
         credit_3_1_html: |

-          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a 
-          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data 
-          under the Open Database License. If you are using these tiles please use 
-          the following attribution: 
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;. 
+          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a
+          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
+          under the Open Database License. If you are using these tiles please use
+          the following attribution:
+          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;.

         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         credit_4_html: |
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:


@@ -2043,6 +2072,7 @@ en:
       uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"

+      coordinates_html: "%{latitude}; %{longitude}"

       map: "map"
       edit: "edit"
       owner: "Owner:"
       map: "map"
       edit: "edit"
       owner: "Owner:"


@@ -2153,13 +2183,6 @@ en:
       delete: "Delete Client"
       confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"
       delete: "Delete Client"
       confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"

-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."

     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"


@@ -2173,19 +2196,7 @@ en:
       registered_apps: "You have the following client applications registered:"
       register_new: "Register your application"
     form:
       registered_apps: "You have the following client applications registered:"
       register_new: "Register your application"
     form:

-      name: "Name"
-      required: "Required"
-      url: "Main Application URL"
-      callback_url: "Callback URL"
-      support_url: "Support URL"

       requests: "Request the following permissions from the user:"
       requests: "Request the following permissions from the user:"

-      allow_read_prefs:  "read their user preferences."
-      allow_write_prefs: "modify their user preferences."
-      allow_write_diary: "create diary entries, comments and make friends."
-      allow_write_api:   "modify the map."
-      allow_read_gpx:    "read their private GPS traces."
-      allow_write_gpx:   "upload GPS traces."
-      allow_write_notes: "modify notes."

     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:


@@ -2258,8 +2269,6 @@ en:
     reset_password:
       title: "Reset password"
       heading: "Reset Password for %{user}"
     reset_password:
       title: "Reset password"
       heading: "Reset Password for %{user}"

-      password: "Password:"
-      confirm password: "Confirm Password:"

       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"


@@ -2273,7 +2282,6 @@ en:
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
           and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
           and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>

-      license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'

       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'
       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'


@@ -2449,7 +2457,7 @@ en:
       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:
       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: "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."
+      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 email address
       failure: "User %{name} not found."
     confirm_email:
       heading: Confirm a change of email address


@@ -2566,10 +2574,10 @@ en:
       revoke: "Revoke!"
       flash: "This block has been revoked."
     helper:
       revoke: "Revoke!"
       flash: "This block has been revoked."
     helper:

-      time_future: "Ends in %{time}."
+      time_future_html: "Ends in %{time}."

       until_login: "Active until the user logs in."
       until_login: "Active until the user logs in."

-      time_future_and_until_login: "Ends in %{time} and after the user has logged in."
-      time_past: "Ended %{time}."
+      time_future_and_until_login_html: "Ends in %{time} and after the user has logged in."
+      time_past_html: "Ended %{time}."

       block_duration:
         hours:
           one: "1 hour"
       block_duration:
         hours:
           one: "1 hour"