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

diff --combined config/locales/en.yml
index 633e8b1eda563be1c342343ad363c345e5192d9b,7e65005ff6de7b6a4ff3abc661c882bc94e2a498..e6fde54c2625674ef5f08254454ad1e0974f73e3
--- 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,9 -346,6 +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."
@@@ -464,6 -461,9 +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: