From: Andy Allan <git@gravitystorm.co.uk>
Date: Sun, 21 Jan 2018 11:20:19 +0000 (+0000)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~3092^2~60
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ae4487921350e141efed42fdf7cd3fd70d72bc97?hp=--cc

Merge branch 'master' into moderation
---

ae4487921350e141efed42fdf7cd3fd70d72bc97
diff --cc config/locales/en.yml
index f212a7575,84a967c6d..e68d44543
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -131,7 -131,7 +131,8 @@@ en
          title_comment: "Changeset %{id} - %{comment}"
        join_discussion: "Log in to join the discussion"
        discussion: Discussion
 +      report: Report this changeset?
+       still_open: "Changeset still open - discussion will open once the changeset is closed."
      node:
        title: "Node: %{name}"
        history_title: "Node History: %{name}"
@@@ -1182,9 -1114,9 +1183,9 @@@
        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='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
-         <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
 -        <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?
        paragraph_1_html: |
@@@ -1209,7 -1141,7 +1210,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.
@@@ -1219,8 -1151,8 +1220,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='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  
 -        <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: |
@@@ -1290,13 -1222,13 +1291,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='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
 -      <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="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-       Acceptable Use Policies</a> and our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-       <br> 
-       Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
++      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 and issues.
      partners_title: Partners
    notifier: