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

diff --combined config/locales/en.yml
index 94a97b98934b743977d11fddff8df33a2c6bca05,1a146701a2aad49aa2ef907cc2337ba7f4a426ed..2aca45255291e4d609731038019d52b31d777686
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -230,7 -230,7 +230,7 @@@ en
      list:
        title: "Changesets"
        title_user: "Changesets by %{user}"
-       title_friend: "Changesets by your friends"
+       title_friend: "Changesets by my friends"
        title_nearby: "Changesets by nearby users"
        empty: "No changesets found."
        empty_area: "No changesets in this area."
@@@ -259,7 -259,7 +259,7 @@@
        user_title: "%{user}'s diary"
        in_language_title: "Diary Entries in %{language}"
        new: New Diary Entry
-       new_title: Compose a new entry in your user diary
+       new_title: Compose a new entry in my user diary
        no_entries: No diary entries
        recent_entries: "Recent diary entries"
        older_entries: Older Entries
@@@ -1169,8 -1169,8 +1169,8 @@@
        paragraph_1_html: |
          OpenStreetMap has few formal rules but we expect all participants to collaborate
          with, and communicate with, the community. If you are considering
 -        any activities other than editing by hand, please read and follow the guidelines on 
 -        <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
 +        any activities other than editing by hand, please read and follow the guidelines on
 +        <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
          <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
      questions:
        title: Any questions?
@@@ -1196,7 -1196,7 +1196,7 @@@
          title: Join the community
          explanation_html: |
            If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
 -          proceed is to join the OpenStreetMap community and add or repair the data yourself. 
 +          proceed is to join the OpenStreetMap community and add or repair the data yourself.
        add_a_note:
          instructions_html: |
            Just click <a class='icon note'></a> or the same icon on the map display.
@@@ -1206,8 -1206,8 +1206,8 @@@
        title: Other concerns
        explanation_html: |
          If you have concerns about how our data is being used or about the contents please consult our
 -        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate 
 -        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  
 +        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
 +        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.
    help_page:
      title: Getting Help
      introduction: |
@@@ -1277,13 -1277,13 +1277,13 @@@
        License page</a> for details.
      legal_title: Legal
      legal_html: |
 -      This site and many other related services are formally operated by the  
 -      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
 -      on behalf of the community. Use of all OSMF operated services is subject 
 +      This site and many other related services are formally operated by the
 +      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
 +      on behalf of the community. Use of all OSMF operated services is subject
        to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
 -      <br> 
 -      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 
 +      <br>
 +      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
        if you have licensing, copyright or other legal questions.
        <br>
        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
@@@ -1611,7 -1611,7 +1611,7 @@@
      trace_header:
        upload_trace: "Upload a trace"
        see_all_traces: "See all traces"
-       see_your_traces: "See your traces"
+       see_my_traces: "See my traces"
        traces_waiting:
          one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
          other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
@@@ -1658,7 -1658,7 +1658,7 @@@
        map: "map"
      list:
        public_traces: "Public GPS traces"
-       your_traces: "Your GPS traces"
+       my_traces: "My GPS traces"
        public_traces_from: "Public GPS traces from %{user}"
        description: "Browse recent GPS trace uploads"
        tagged_with: " tagged with %{tags}"
@@@ -1923,7 -1923,7 +1923,7 @@@
        user location: User location
        if set location: "Set your home location on the %{settings_link} page to see nearby users."
        settings_link_text: settings
-       your friends: Your friends
+       my friends: My friends
        no friends: You have not added any friends yet.
        km away: "%{count}km away"
        m away: "%{count}m away"