From: Tom Hughes Date: Wed, 25 Sep 2024 17:26:39 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5238' X-Git-Tag: live~115 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2cb51410d8ddab6c7b61bc869de30ea25552ec52?hp=93da4252bdc0c233b78ec4b8c1cc13f9dcc2eaa2 Merge remote-tracking branch 'upstream/pull/5238' --- diff --git a/config/locales/en.yml b/config/locales/en.yml index 4e74be841..b042370dc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -432,8 +432,6 @@ en: comment: comment: "New comment on changeset #%{changeset_id} by %{author}" commented_at_by_html: "Updated %{when} by %{user}" - comments: - comment: "New comment on changeset #%{changeset_id} by %{author}" show: title_all: OpenStreetMap changeset discussion title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" @@ -1458,7 +1456,6 @@ en: not_updated: Not Updated search: Search search_guidance: "Search Issues:" - link_to_reports: View Reports states: ignored: Ignored open: Open @@ -1855,7 +1852,6 @@ en: remember: "Remember me" lost password link: "Lost your password?" login_button: "Log in" - register now: Register now with external: "or log in with a third party" or: "or" auth failure: "Sorry, could not log in with those details."