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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25794cc9fde873a5d041605d5f2db5efa7bf005a..b56fb6410c6af3c6460180e2d7921518d247ce7c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,12 +87,13 @@ en:
         url: Main Application URL (Required)
         callback_url: Callback URL
         support_url: Support URL
         url: Main Application URL (Required)
         callback_url: Callback URL
         support_url: Support URL

-        allow_read_prefs:  read their user preferences
+        allow_read_prefs: read their user preferences

         allow_write_prefs: modify their user preferences
         allow_write_diary: create diary entries and comments
         allow_write_prefs: modify their user preferences
         allow_write_diary: create diary entries and comments

-        allow_write_api:   modify the map
-        allow_read_gpx:    read their private GPS traces
-        allow_write_gpx:   upload GPS traces
+        allow_write_api: modify the map
+        allow_write_changeset_comments: comment on changesets
+        allow_read_gpx: read their private GPS traces
+        allow_write_gpx: upload GPS traces

         allow_write_notes: modify notes
       diary_comment:
         body: "Body"
         allow_write_notes: modify notes
       diary_comment:
         body: "Body"


@@ -243,9 +244,9 @@ en:
         comment: Comment
         full: Full note
   accounts:
         comment: Comment
         full: Full note
   accounts:

-    edit:
+    show:

       title: "Edit account"
       title: "Edit account"

-      my settings: My Settings
+      my_account: My Account

       current email address: "Current Email Address"
       external auth: "External Authentication"
       openid:
       current email address: "Current Email Address"
       external auth: "External Authentication"
       openid:


@@ -259,6 +260,8 @@ en:
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"

+        not_agreed_with_pd: "You haven't declared that you consider your edits to be in the Public Domain."
+        pd_link_text: "declare"

       save changes button: Save Changes
       delete_account: Delete Account...
     go_public:
       save changes button: Save Changes
       delete_account: Delete Account...
     go_public:


@@ -304,9 +307,6 @@ en:
         read_ct: "I have read and agree to the above contributor terms"
         tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
         read_tou: "I have read and agree to the Terms of Use"
         read_ct: "I have read and agree to the above contributor terms"
         tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
         read_tou: "I have read and agree to the Terms of Use"

-        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
-        consider_pd_why: "what's this?"
-        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain

         guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
         readable_summary: human readable summary
         informal_translations: informal translations
         guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
         readable_summary: human readable summary
         informal_translations: informal translations


@@ -324,6 +324,17 @@ en:
         terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
         terms_declined_link: this wiki page
         terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
         terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
         terms_declined_link: this wiki page
         terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

+    pd_declarations:
+      show:
+        title: Consider my contributions to be in the Public Domain
+        consider_pd: "I consider my contributions to be in the Public Domain"
+        consider_pd_why: "Why would I want my contributions to be Public Domain?"
+        consider_pd_why_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
+        confirm: Confirm
+      create:
+        successfully_declared: "You have successfully declared that you consider your edits to be in the Public Domain."
+        already_declared: "You have already declared that you consider your edits to be in the Public Domain."
+        did_not_confirm: "You didn't confirm that you consider your edits to be in the Public Domain."

   browse:
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
   browse:
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"


@@ -836,7 +847,7 @@ en:
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"

-          protected_area : "Protected Area"
+          protected_area: "Protected Area"

           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"
           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"


@@ -942,6 +953,7 @@ en:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"

+          busway: "Busway"

           construction: "Highway under Construction"
           corridor: "Corridor"
           crossing: "Crossing"
           construction: "Highway under Construction"
           corridor: "Corridor"
           crossing: "Crossing"


@@ -987,7 +999,7 @@ en:
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"

-          "yes" : "Road"
+          "yes": "Road"

         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"
         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"


@@ -1167,7 +1179,7 @@ en:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:

-          "yes" : "Mountain Pass"
+          "yes": "Mountain Pass"

         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"
         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"


@@ -1624,8 +1636,6 @@ en:
     partners_corpmembers: "OSMF corporate members"
     partners_partners: "partners"
     tou: "Terms of Use"
     partners_corpmembers: "OSMF corporate members"
     partners_partners: "partners"
     tou: "Terms of Use"

-    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
-    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."

     nothing_to_preview: "Nothing to preview."
     help: Help
     about: About
     nothing_to_preview: "Nothing to preview."
     help: Help
     about: About


@@ -1633,6 +1643,11 @@ en:
     communities: Communities
     learn_more: "Learn More"
     more: More
     communities: Communities
     learn_more: "Learn More"
     more: More

+    offline_flash:
+      osm_offline: "The OpenStreetMap database is currently offline while essential maintenance work is carried out."
+      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential maintenance work is carried out."
+      expected_restore_html: "Services are expected to be restored in %{time}."
+      announcement: "You can read the announcement here."

   user_mailer:
     diary_comment_notification:
       description: "OpenStreetMap Diary Entry #%{id}"
   user_mailer:
     diary_comment_notification:
       description: "OpenStreetMap Diary Entry #%{id}"


@@ -1907,7 +1922,7 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
       failure: Couldn't update profile.
   sessions:
     new:

-      tab_title: "Log in"
+      tab_title: "Log In"

       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"
       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"
       password: "Password"


@@ -2249,13 +2264,14 @@ en:
         license_url: "https://openstreetmap.org/copyright"
         project_url: "https://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
         license_url: "https://openstreetmap.org/copyright"
         project_url: "https://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"

-    edit:
+    not_public_flash:

       not_public: "You have not set your edits to be public."
       not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
       user_page_link: user page
       anon_edits_html: "(%{link})"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       not_public: "You have not set your edits to be public."
       not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
       user_page_link: user page
       anon_edits_html: "(%{link})"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."

+    edit:

       id_not_configured: "iD has not been configured"
     export:
       title: "Export"
       id_not_configured: "iD has not been configured"
     export:
       title: "Export"


@@ -2366,6 +2382,14 @@ en:
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
       reverse_directions_text: "Reverse Directions"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
       reverse_directions_text: "Reverse Directions"

+      modes:
+        bicycle: "Bicycle"
+        car: "Car"
+        foot: "Foot"
+      providers:
+        fossgis_osrm: "OSRM"
+        graphhopper: "GraphHopper"
+        fossgis_valhalla: "Valhalla"

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -2637,8 +2661,8 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       account_settings: Account Settings
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       account_settings: Account Settings

-      oauth2_applications: OAuth 2 applications
-      oauth2_authorizations: OAuth 2 authorizations
+      oauth2_applications: OAuth 2 Applications
+      oauth2_authorizations: OAuth 2 Authorizations

       muted_users: Muted Users
     auth_providers:
       openid_url: "OpenID URL"
       muted_users: Muted Users
     auth_providers:
       openid_url: "OpenID URL"


@@ -2692,10 +2716,12 @@ en:
       write_prefs: Modify user preferences
       write_diary: Create diary entries and comments
       write_api: Modify the map
       write_prefs: Modify user preferences
       write_diary: Create diary entries and comments
       write_api: Modify the map

+      write_changeset_comments: Comment on changesets

       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       write_redactions: Redact map data
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       write_redactions: Redact map data

+      write_blocks: Create and revoke user blocks

       read_email: Read user email address
       consume_messages: Read, update status and delete user messages
       send_messages: Send private messages to other users
       read_email: Read user email address
       consume_messages: Read, update status and delete user messages
       send_messages: Send private messages to other users


@@ -2753,7 +2779,7 @@ en:
   users:
     new:
       title: "Sign Up"
   users:
     new:
       title: "Sign Up"

-      tab_title: "Sign up"
+      tab_title: "Sign Up"

       signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
       signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}."
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'


@@ -2778,9 +2804,6 @@ en:
         privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
         privacy_policy_title: OSMF privacy policy including section on email addresses
         html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
         privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
         privacy_policy_title: OSMF privacy policy including section on email addresses
         html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'

-      consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
-      consider_pd: "public domain"
-      consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain

       or: "or"
       use external auth: "or sign up with a third party"
     no_such_user:
       or: "or"
       use external auth: "or sign up with a third party"
     no_such_user:


@@ -2795,7 +2818,7 @@ en:
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile

-      my settings: My Settings
+      my_account: My Account

       my comments: My Comments
       my_preferences: My Preferences
       my_dashboard: My Dashboard
       my comments: My Comments
       my_preferences: My Preferences
       my_dashboard: My Dashboard


@@ -2875,13 +2898,23 @@ en:
       show:
         title: Users
         heading: Users
       show:
         title: Users
         heading: Users

-        empty: No matching users found
+        select_status: Select Status
+        states:
+          pending: Pending
+          active: Active
+          confirmed: Confirmed
+          suspended: Suspended
+          deleted: Deleted
+        name_or_email: Name or Email
+        ip_address: IP Address
+        search: Search

       page:
         found_users:
           one: "%{count} user found"
           other: "%{count} users found"
         confirm: Confirm Selected Users
         hide: Hide Selected Users
       page:
         found_users:
           one: "%{count} user found"
           other: "%{count} users found"
         confirm: Confirm Selected Users
         hide: Hide Selected Users

+        empty: No matching users found

       user:
         summary_html: "%{name} created from %{ip_address} on %{date}"
         summary_no_ip_html: "%{name} created on %{date}"
       user:
         summary_html: "%{name} created from %{ip_address} on %{date}"
         summary_no_ip_html: "%{name} created on %{date}"


@@ -2889,7 +2922,7 @@ en:
       index:
         heading_html: "%{user}'s Comments"
         changesets: "Changesets"
       index:
         heading_html: "%{user}'s Comments"
         changesets: "Changesets"

-        diary_entries: "Diary entries"
+        diary_entries: "Diary Entries"

         no_comments: "No comments"
     changeset_comments:
       index:
         no_comments: "No comments"
     changeset_comments:
       index:


@@ -3071,6 +3104,7 @@ en:
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"

+      description_when_there_is_no_opening_comment: "unknown"

       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"
       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"


@@ -3203,16 +3237,6 @@ en:
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"

-      engines:
-        fossgis_osrm_bike: "Bicycle (OSRM)"
-        fossgis_osrm_car: "Car (OSRM)"
-        fossgis_osrm_foot: "Foot (OSRM)"
-        graphhopper_bicycle: "Bicycle (GraphHopper)"
-        graphhopper_car: "Car (GraphHopper)"
-        graphhopper_foot: "Foot (GraphHopper)"
-        fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
-        fossgis_valhalla_car: "Car (Valhalla)"
-        fossgis_valhalla_foot: "Foot (Valhalla)"

       descend: "Descend"
       directions: "Directions"
       distance: "Distance"
       descend: "Descend"
       directions: "Directions"
       distance: "Distance"


@@ -3288,6 +3312,8 @@ en:
           ninth: "9th"
           tenth: "10th"
       time: "Time"
           ninth: "9th"
           tenth: "10th"
       time: "Time"

+      download: "Download route as GeoJSON"
+      filename: "route"

     query:
       node: Node
       way: Way
     query:
       node: Node
       way: Way


@@ -3302,6 +3328,9 @@ en:
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here

+    home:
+      marker_title: My home location
+      not_set: Home location is not set for your account

   redactions:
     edit:
       heading: "Edit Redaction"
   redactions:
     edit:
       heading: "Edit Redaction"