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

diff --combined config/locales/en.yml
index 3fe583d5fe36ad2073095209041265d45256bb5d,00c27dfc72e8eb4d4de8ded7a121966be4132f70..d664826393916b840376a283ea6e157c9aa6bc95
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -342,7 -342,6 +342,6 @@@ en
        way_paginated: "Ways (%{x}-%{y} of %{count})"
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
-       comment: "Comments (%{count})"
        hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
        comment_by_html: "Comment from %{user} %{time_ago}"
        changesetxml: "Changeset XML"
@@@ -524,7 -523,6 +523,7 @@@
      show:
        title: "%{user}'s Diary | %{title}"
        user_title: "%{user}'s Diary"
 +      discussion: "Discussion"
        leave_a_comment: "Leave a comment"
        login_to_leave_a_comment_html: "%{login_link} to leave a comment"
        login: "Login"