X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/95d99d0faf14e82aed6447fb9e92cc0e54e5e3ad..d711d3cb845eef60b26871beb203de5f62bb9344:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 083c2e42c..cde42427b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -38,8 +38,6 @@ en: 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: @@ -124,7 +122,7 @@ en: longitude: "Longitude" public: "Public" description: "Description" - gpx_file: Upload GPX File + gpx_file: Choose GPS Trace File visibility: Visibility tagstring: Tags message: @@ -371,7 +369,7 @@ en: 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 @@ -405,15 +403,30 @@ en: 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." + 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." + 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." + timeout: + sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve." 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: - changeset_paging_nav: - showing_page: "Page %{page}" - next: "Next »" - previous: "« Previous" changeset: - anonymous: "Anonymous" 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: "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: @@ -535,8 +542,6 @@ en: 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 @@ -604,8 +609,6 @@ en: 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: @@ -1444,10 +1447,6 @@ en: 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" @@ -1482,8 +1481,6 @@ en: ignored: Ignored open: Open resolved: Resolved - older_issues: Older Issues - newer_issues: Newer Issues show: title: "%{status} Issue #%{issue_id}" reports: @@ -1618,13 +1615,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: - 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}," - 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" @@ -1684,7 +1681,6 @@ en: 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" @@ -1895,6 +1891,25 @@ en: 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: heading_html: "%{copyright}OpenStreetMap %{br} contributors" @@ -2366,6 +2381,9 @@ en: 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" @@ -2374,7 +2392,6 @@ en: 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" @@ -2537,9 +2554,6 @@ en: 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" offline_warning: @@ -2678,7 +2692,6 @@ en: 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: @@ -2793,8 +2806,6 @@ en: 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" @@ -2829,15 +2840,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: - 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}'?" - confirm: "Confirm" 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}'?" - confirm: "Confirm" user_blocks: model: non_moderator_update: "Must be a moderator to create or update a block." @@ -2923,14 +2928,12 @@ en: 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" - older: "Older Blocks" - newer: "Newer Blocks" navigation: all_blocks: "All Blocks" blocks_on_me: "Blocks on Me" @@ -3011,6 +3014,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 + notes_paging_nav: + showing_page: "Page %{page}" + next: "Next" + previous: "Previous" javascripts: close: Close share: @@ -3198,6 +3205,7 @@ en: 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"