From: Tom Hughes Date: Tue, 11 Mar 2025 18:31:39 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5792' X-Git-Tag: live~10 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2b49a4dfe735e395441a7639fe3443b41e604f08?hp=-c Merge remote-tracking branch 'upstream/pull/5792' --- 2b49a4dfe735e395441a7639fe3443b41e604f08 diff --combined config/locales/en.yml index 09c2045ff,164e70c8d..e136a53c2 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -1607,11 -1607,9 +1607,11 @@@ en reportable_title: diary_comment: "%{entry_title}, comment #%{comment_id}" note: "Note #%{note_id}" - reportable_dates: - created_on_html: "created on %{datetime_created}" - created_on_updated_on_html: "created on %{datetime_created}, updated on %{datetime_updated}" + reportable_heading: + diary_comment_html: "Diary Comment %{title} created on %{datetime_created}, updated on %{datetime_updated}" + diary_entry_html: "Diary Entry %{title} created on %{datetime_created}, updated on %{datetime_updated}" + note_html: "%{title} created on %{datetime_created}, updated on %{datetime_updated}" + user_html: "User %{title} created on %{datetime_created}" reporters: index: title: "Issue #%{issue_id} Reporters" @@@ -2703,8 -2701,8 +2703,8 @@@ cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." setup_user_auth: blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits." - blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." - 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." + blocked: "Your access to the API has been blocked. Please log in to the web interface to find out more." + 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 @@@ -2757,7 -2755,7 +2757,7 @@@ permissions: missing: "You have not permitted the application access to this facility" scopes: - openid: Sign-in using OpenStreetMap + openid: Sign in using OpenStreetMap read_prefs: Read user preferences write_prefs: Modify user preferences write_diary: Create diary entries and comments