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

diff --combined config/locales/en.yml
index 430836bce456d4db6cf53329f959ea75ffa26aa2,93d109fab51ffa1dc2308e4c940627750768ee17..5b1686c6b81b6eddf6c2f63304d00b9428bcde85
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2060,7 -2060,7 +2060,7 @@@ en
      potlatch:
        removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
        desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
-       id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+       id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
      sidebar:
        search_results: Search Results
        close: Close
@@@ -2505,8 -2505,7 +2505,8 @@@
        spam score: "Spam Score:"
        description: Description
        user location: User location
 -      set_location_html: "<a href=\"%{edit_profile_url}\">Edit your profile</a> and set your home location to see nearby users."
 +      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
 +      edit_your_profile: Edit your profile
        my friends: My friends
        no friends: You have not added any friends yet.
        km away: "%{count}km away"