From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Jan 2024 19:12:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4449'
X-Git-Tag: live~920
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c95e2870f3310a68f8287bddcec6d0117b5f8961?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/pull/4449'
---

c95e2870f3310a68f8287bddcec6d0117b5f8961
diff --combined config/locales/en.yml
index f81c2d6bd,22d2ded92..335b8ad84
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2306,7 -2306,6 +2306,7 @@@ en
            cycleway_national: "National cycleway"
            cycleway_regional: "Regional cycleway"
            cycleway_local: "Local cycleway"
 +          cycleway_mtb: "Mountain bike route"
            footway: "Footway"
            rail: "Railway"
            train: "Train"
@@@ -2322,8 -2321,6 +2322,8 @@@
            taxiway: "Taxiway"
            apron_only: "Airport apron"
            admin: "Administrative boundary"
 +          capital: "Capital"
 +          city: "City"
            orchard_only: "Orchard"
            vineyard: "Vineyard"
            forest_only: "Forest"
@@@ -3008,6 -3005,7 +3008,7 @@@
        reactivate: Reactivate
        comment_and_resolve: Comment & Resolve
        comment: Comment
+       log_in_to_comment: "Log in to comment on this note"
        report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
        other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
        other_problems_resolved: "For all other problems, resolving is sufficient."