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

diff --combined config/locales/en.yml
index e6fde54c2625674ef5f08254454ad1e0974f73e3,3159dd128dee630105e8379503ff631cfaf3f010..775030638a64413d56313ac1b8d4c750b5f06db9
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -204,9 -204,9 +204,9 @@@ en
          one: "%{count} year ago"
          other: "%{count} years ago"
    printable_name:
 -    with_id: "%{id}"
 -    with_version: "%{id}, v%{version}"
 +    version: "v%{version}"
      with_name_html: "%{name} (%{id})"
 +    current_and_old_links_html: "%{current_link}, %{old_link}"
    editor:
      default: "Default (currently %{name})"
      id:
@@@ -346,6 -346,9 +346,6 @@@
        comment_by_html: "Comment from %{user} %{time_ago}"
        changesetxml: "Changeset XML"
        osmchangexml: "osmChange XML"
 -      feed:
 -        title: "Changeset %{id}"
 -        title_comment: "Changeset %{id} - %{comment}"
        join_discussion: "Log in to join the discussion"
        discussion: Discussion
        still_open: "Changeset still open - discussion will open once the changeset is closed."
@@@ -461,9 -464,6 +461,9 @@@
        no_more_area: "No more changesets in this area."
        no_more_user: "No more changesets by this user."
        load_more: "Load more"
 +      feed:
 +        title: "Changeset %{id}"
 +        title_comment: "Changeset %{id} - %{comment}"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
    changeset_comments:
@@@ -576,6 -576,12 +576,12 @@@
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
+     subscribe:
+       heading: Subscribe to the following diary entry discussion?
+       button: Subscribe to discussion
+     unsubscribe:
+       heading: Unsubscribe from the following diary entry discussion?
+       button: Unsubscribe from discussion
    doorkeeper:
      errors:
        messages:
@@@ -1571,6 -1577,8 +1577,8 @@@
        header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
        footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
+       footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+       footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"
      message_notification:
        subject: "[OpenStreetMap] %{message_title}"
        hi: "Hi %{to_user},"