From: Anton Khorev Date: Tue, 4 Feb 2025 13:42:00 +0000 (+0300) Subject: Merge branch 'pull/5579' X-Git-Tag: live~338 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/06cece27fe691e321cf42a03e3ec08c464ac1444?ds=sidebyside;hp=-c Merge branch 'pull/5579' --- 06cece27fe691e321cf42a03e3ec08c464ac1444 diff --combined config/locales/en.yml index a4910a544,ac3e029e3..40b4bfa14 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -1512,7 -1512,7 +1512,7 @@@ en reports: Reports last_updated: Last Updated last_updated_time_ago_user_html: "%{time_ago} by %{user}" - reporter_users: Reporter Users + reporting_users: Reporting Users reports_count: one: "%{count} Report" other: "%{count} Reports" @@@ -3069,6 -3069,7 +3069,7 @@@ open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" + description_when_author_is_deleted: "deleted" event_opened_by_html: "Created by %{user} %{time_ago}" event_opened_by_anonymous_html: "Created by anonymous %{time_ago}" event_commented_by_html: "Comment from %{user} %{time_ago}"