Merge branch 'pull/5512'

diff --combined config/locales/en.yml
index 42e3f637e9e7bce7b6517c5d0e114e3eaae4021c,510ee218c0acdc4fe924a55e43fe0dd75a7b339b..a112f3b0dee17d495fc794888118f392c0b76b39
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -251,6 -251,13 +251,6 @@@ en
        openid:
          link: "https://wiki.openstreetmap.org/wiki/OpenID"
          link text: "what is this?"
 -      public editing:
 -        heading: "Public editing"
 -        enabled: "Enabled. Not anonymous and can edit data."
 -        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
 -        enabled link text: "what is this?"
 -        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
 -        disabled link text: "why can't I edit?"
        contributor terms:
          heading: "Contributor Terms"
          agreed: "You have agreed to the new Contributor Terms."
@@@ -540,7 -547,7 +540,7 @@@
        title: My Dashboard
        no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
        edit_your_profile: Edit your profile
-       followings: Followings  
+       followings: Followings
        no followings: You have not followed any user yet.
        nearby users: "Other nearby users"
        no nearby users: "There are no other users who admit to mapping nearby yet."
@@@ -1654,7 -1661,7 +1654,7 @@@
        header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
        footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
-     friendship_notification:
+     follow_notification:
        hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] %{user} followed you"
        followed_you: "%{user} is now following you on OpenStreetMap."