Merge a final translation from i18n branch.

diff --combined config/locales/en.yml
index 06ce50027a071a206a40a96dd4db6bf4e59b01a7,66a9006989af1f4a9bab3ab384c2552f01a2a96e..7f8320cba374be7dbc18621089b4da36a81a2628
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -245,6 -245,9 +245,9 @@@ en
        hi: "Hi {{to_user}},"
        header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
        footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+     friend_notification:
+       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+       see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
      signup_confirm_plain:
        greeting: "Hi there!"
        hopefully_you: "Someone (hopefully you) would like to create an account over at"
@@@ -400,7 -403,7 +403,7 @@@
        edit: "edit"
        edit_map: "Edit Map"
        public: "PUBLIC"
 -      pritate: "PRIVATE"
 +      private: "PRIVATE"
        by: "by"
        in: "in"
    user: