X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6d7d581de1a271b69620aad76964efd42f173451..ed74bc036b3203bb14c3fbb986c077f2958d004d:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index da906b9a0..06a60f977 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: @@ -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,10 +440,6 @@ 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)" @@ -535,8 +544,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 +611,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: @@ -1482,8 +1487,6 @@ en: ignored: Ignored open: Open resolved: Resolved - older_issues: Older Issues - newer_issues: Newer Issues show: title: "%{status} Issue #%{issue_id}" reports: @@ -1573,7 +1576,6 @@ en: 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! @@ -1586,7 +1588,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." - donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." help: Help about: About copyright: Copyright @@ -1897,6 +1898,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" @@ -2288,7 +2308,6 @@ en: close: Close search: search: Search - get_directions: "Get directions" get_directions_title: "Find directions between two points" from: "From" to: "To" @@ -2369,6 +2388,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" @@ -2377,7 +2399,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" @@ -2488,8 +2509,6 @@ en: 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}" @@ -2542,13 +2561,8 @@ 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" - make_public: - made_public: "Trace made public" offline_warning: message: "The GPX file upload system is currently unavailable" offline: @@ -2800,8 +2814,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" @@ -2836,15 +2848,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." @@ -2930,14 +2936,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" @@ -3018,6 +3022,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: @@ -3205,6 +3213,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"