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

diff --combined config/locales/en.yml
index 1ee3f2378fa76c4fd97e02d0f820954327ffcd37,4f3358989f87b9c334a7d78ea7286613a9a68206..5ae211ffa0e43d865a5820bc06e732860cd3c551
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -373,7 -373,6 +373,7 @@@ en
        in_language_title: "Diary Entries in %{language}"
        new: New Diary Entry
        new_title: Compose a new entry in my user diary
 +      my_diary: My Diary
        no_entries: No diary entries
        recent_entries: "Recent diary entries"
        older_entries: Older Entries
@@@ -431,6 -430,18 +431,18 @@@
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
+   friendships:
+     make_friend:
+       heading: "Add %{user} as a friend?"
+       button: "Add as friend"
+       success: "%{name} is now your friend!"
+       failed: "Sorry, failed to add %{name} as a friend."
+       already_a_friend: "You are already friends with %{name}."
+     remove_friend:
+       heading: "Unfriend %{user}?"
+       button: "Unfriend"
+       success: "%{name} was removed from your friends."
+       not_a_friend: "%{name} is not one of your friends."
    geocoder:
      search:
        title:
@@@ -1191,7 -1202,7 +1203,7 @@@
        hi: "Hi %{to_user},"
        header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
-     friend_notification:
+     friendship_notification:
        hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] %{user} added you as a friend"
        had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@@ -2272,17 -2283,6 +2284,6 @@@
        flash success: "Home location saved successfully"
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
-     make_friend:
-       heading: "Add %{user} as a friend?"
-       button: "Add as friend"
-       success: "%{name} is now your friend!"
-       failed: "Sorry, failed to add %{name} as a friend."
-       already_a_friend: "You are already friends with %{name}."
-     remove_friend:
-       heading: "Unfriend %{user}?"
-       button: "Unfriend"
-       success: "%{name} was removed from your friends."
-       not_a_friend: "%{name} is not one of your friends."
      index:
        title: Users
        heading: Users