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

diff --combined config/locales/en.yml
index f81c2d6bd08bf31ccfb187919b5e313bcda11c00,22d2ded9240ea1f1821d177d9be607af2bd9d6f1..335b8ad84a4bf7bf30cd66e9e9f9730b8f95fd94
--- 1/config/locales/en.yml
--- 2/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."