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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 39f425fbdec39a498ecab3090f8246ec8804d556..28698fa522787766f63afbd153c8de37c7a5d489 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,8 +38,6 @@ en:
   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:

-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable

         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:
         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:


@@ -124,7 +122,7 @@ en:
         longitude: "Longitude"
         public: "Public"
         description: "Description"
         longitude: "Longitude"
         public: "Public"
         description: "Description"

-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File

         visibility: Visibility
         tagstring: Tags
       message:
         visibility: Visibility
         tagstring: Tags
       message:


@@ -371,7 +369,7 @@ en:
         note: note
     timeout:
       title: Timeout Error
         note: note
     timeout:
       title: Timeout Error

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

       type:
         node: node
         way: way
       type:
         node: node
         way: way


@@ -405,15 +403,30 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"

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

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

+    timeout:
+      sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
+  ways:
+    timeout:
+      sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."

   old_ways:
     not_found:
       sorry: "Sorry, way #%{id} version %{version} could not be found."
   old_ways:
     not_found:
       sorry: "Sorry, way #%{id} version %{version} could not be found."

+    timeout:
+      sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
+  relations:
+    timeout:
+      sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."

   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."
   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."

+    timeout:
+      sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."

   changeset_comments:
     feeds:
       comment:
   changeset_comments:
     feeds:
       comment:


@@ -427,12 +440,7 @@ en:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:

-    changeset_paging_nav:
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"

     changeset:
     changeset:

-      anonymous: "Anonymous"

       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:


@@ -464,7 +472,6 @@ en:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:

-      title: "No such changeset"

       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:


@@ -535,8 +542,6 @@ en:
       no_entries: No diary entries
     page:
       recent_entries: "Recent diary entries"
       no_entries: No diary entries
     page:
       recent_entries: "Recent diary entries"

-      older_entries: Older Entries
-      newer_entries: Newer Entries

     edit:
       title: Edit Diary Entry
       marker_text: Diary entry location
     edit:
       title: Edit Diary Entry
       marker_text: Diary entry location


@@ -575,8 +580,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
       report: Report this comment
     location:
       location: "Location:"

-      view: "View"
-      edit: "Edit"

       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:


@@ -604,8 +607,6 @@ en:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      newer_comments: "Newer Comments"
-      older_comments: "Older Comments"

     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:
     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:


@@ -668,7 +669,6 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        results_from_html: 'Results from %{results_link}'

         latlon: Internal
         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim
         latlon: Internal
         osm_nominatim: OpenStreetMap Nominatim
         osm_nominatim_reverse: OpenStreetMap Nominatim


@@ -1445,10 +1445,6 @@ en:
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level11: "Neighbourhood Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level11: "Neighbourhood Boundary"

-      types:
-        cities: Cities
-        towns: Towns
-        places: Places

     results:
       no_results: "No results found"
       more_results: "More results"
     results:
       no_results: "No results found"
       more_results: "More results"


@@ -1483,8 +1479,6 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
         ignored: Ignored
         open: Open
         resolved: Resolved

-      older_issues: Older Issues
-      newer_issues: Newer Issues

     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:


@@ -1574,7 +1568,6 @@ en:
     export: Export
     issues: Issues
     gps_traces: GPS Traces
     export: Export
     issues: Issues
     gps_traces: GPS Traces

-    gps_traces_tooltip: Manage GPS traces

     user_diaries: User Diaries
     edit_with: Edit with %{editor}
     intro_header: Welcome to OpenStreetMap!
     user_diaries: User Diaries
     edit_with: Edit with %{editor}
     intro_header: Welcome to OpenStreetMap!


@@ -1587,7 +1580,6 @@ en:
     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."
     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."

-    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."

     help: Help
     about: About
     copyright: Copyright
     help: Help
     about: About
     copyright: Copyright


@@ -1621,13 +1613,13 @@ en:
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them_html: "You can also add them as a friend at %{befriendurl}."
     gpx_description:
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them_html: "You can also add them as a friend at %{befriendurl}."
     gpx_description:

-      description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      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: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
-      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"

     gpx_failure:
       hi: "Hi %{to_user},"
     gpx_failure:
       hi: "Hi %{to_user},"

-      failed_to_import: "failed to import. Here is the error:"
+      failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:"

       more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
       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"
       more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
       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"


@@ -1687,7 +1679,6 @@ en:
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"

-      greeting: "Hi,"

       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"


@@ -1749,7 +1740,6 @@ en:
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"

-      reply_button: "Reply"

       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:
       destroy_button: "Delete"
       unmute_button: "Move to Inbox"
     new:


@@ -1765,7 +1755,6 @@ 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"

-      actions: "Actions"

       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"


@@ -1900,9 +1889,27 @@ en:
       edit: Edit
       preview: Preview
       help: Help
       edit: Edit
       preview: Preview
       help: Help

+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      issues:
+        older: Older Issues
+        newer: Newer Issues
+      traces:
+        older: Older Traces
+        newer: Newer Traces
+      user_blocks:
+        older: Older Blocks
+        newer: Newer Blocks
+      users:
+        older: Older Users
+        newer: Newer Users

   site:
     about:
   site:
     about:

-      next: Next

       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
       copyright_symbol_html: "©"
       used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"


@@ -2292,7 +2299,6 @@ en:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

-      get_directions: "Get directions"

       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"


@@ -2373,6 +2379,9 @@ en:
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"

           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"


@@ -2381,7 +2390,6 @@ en:
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"

-          stop: "Stop"

           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"
           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"


@@ -2492,8 +2500,6 @@ en:
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated

-    trace_optionals:
-      tags: "Tags"

     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"
     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"


@@ -2546,13 +2552,8 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"

-    page:
-      older: "Older Traces"
-      newer: "Newer Traces"

     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"

-    make_public:
-      made_public: "Trace made public"

     offline_warning:
       message: "The GPX file upload system is currently unavailable"
     offline:
     offline_warning:
       message: "The GPX file upload system is currently unavailable"
     offline:


@@ -2689,7 +2690,6 @@ en:
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       tou: "terms of use"
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       tou: "terms of use"

-      external auth: "Third Party Authentication:"

       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:


@@ -2804,8 +2804,6 @@ en:
       summary_no_ip_html: "%{name} created on %{date}"
       empty: No matching users found
     page:
       summary_no_ip_html: "%{name} created on %{date}"
       empty: No matching users found
     page:

-      older: "Older Users"
-      newer: "Newer Users"

       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"


@@ -2840,15 +2838,9 @@ en:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:

-      title: Confirm role granting
-      heading: Confirm role granting

       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"

-      confirm: "Confirm"

     revoke:
     revoke:

-      title: Confirm role revoking
-      heading: Confirm role revoking

       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"

-      confirm: "Confirm"

   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."


@@ -2934,14 +2926,12 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-    blocks:
+    page:

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"

-      older: "Older Blocks"
-      newer: "Newer Blocks"

     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"


@@ -3022,6 +3012,10 @@ en:
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note

+    notes_paging_nav:
+      showing_page: "Page %{page}"
+      next: "Next"
+      previous: "Previous"

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share:


@@ -3209,6 +3203,7 @@ en:
       empty: "No redactions to show."
       heading: "List of Redactions"
       title: "List of Redactions"
       empty: "No redactions to show."
       heading: "List of Redactions"
       title: "List of Redactions"

+      new: "New Redaction"

     new:
       heading: "Enter Information for New Redaction"
       title: "Creating New Redaction"
     new:
       heading: "Enter Information for New Redaction"
       title: "Creating New Redaction"