From: Tom Hughes Date: Tue, 10 Sep 2024 17:35:19 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5150' X-Git-Tag: live~685 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/091e0c21efd3f4117fc6491a1b25c4d1cbc5a099?ds=sidebyside;hp=-c Merge remote-tracking branch 'upstream/pull/5150' --- 091e0c21efd3f4117fc6491a1b25c4d1cbc5a099 diff --combined config/locales/en.yml index 97d5e6f00,3d27d0256..9a383569e --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -427,10 -427,6 +427,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,6 -531,8 +531,6 @@@ 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 @@@ -602,6 -600,8 +598,6 @@@ 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: @@@ -664,6 -664,7 +660,6 @@@ geocoder: search: title: - results_from_html: 'Results from %{results_link}' latlon: Internal osm_nominatim: OpenStreetMap Nominatim osm_nominatim_reverse: OpenStreetMap Nominatim @@@ -1478,6 -1479,8 +1474,6 @@@ ignored: Ignored open: Open resolved: Resolved - older_issues: Older Issues - newer_issues: Newer Issues show: title: "%{status} Issue #%{issue_id}" reports: @@@ -1566,11 -1569,16 +1562,11 @@@ history: History export: Export issues: Issues - data: Data - export_data: Export Data gps_traces: GPS Traces - gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries edit_with: Edit with %{editor} - tag_line: The Free Wiki World Map intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. - intro_2_create_account: "Create a user account" hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}." partners_fastly: "Fastly" partners_corpmembers: "OSMF corporate members" @@@ -1579,10 -1587,14 +1575,10 @@@ 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 communities: Communities - community: Community - community_blogs: "Community Blogs" - community_blogs_title: "Blogs from members of the OpenStreetMap community" learn_more: "Learn More" more: More user_mailer: @@@ -1740,6 -1752,7 +1736,6 @@@ message_summary: unread_button: "Mark as unread" read_button: "Mark as read" - reply_button: "Reply" destroy_button: "Delete" unmute_button: "Move to Inbox" new: @@@ -1755,6 -1768,7 +1751,6 @@@ 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" @@@ -1889,27 -1903,9 +1885,27 @@@ 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: - 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" @@@ -2299,6 -2295,7 +2295,6 @@@ close: Close search: search: Search - get_directions: "Get directions" get_directions_title: "Find directions between two points" from: "From" to: "To" @@@ -2498,6 -2495,8 +2494,6 @@@ 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}" @@@ -2550,8 -2549,13 +2546,8 @@@ 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: @@@ -2803,6 -2807,8 +2799,6 @@@ 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" @@@ -2937,6 -2943,8 +2933,6 @@@ 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" @@@ -3017,6 -3025,10 +3013,10 @@@ 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: