From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Oct 2022 17:18:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3758'
X-Git-Tag: live~1579
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/59ac72b2137cbe8bf7333948b641e6e339de3bb1?ds=inline;hp=-c

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

59ac72b2137cbe8bf7333948b641e6e339de3bb1
diff --combined config/locales/en.yml
index 55bd1c0a8,9cf52ffe7..ce460a0d2
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1436,7 -1436,6 +1436,7 @@@ en
    issue_comments:
      create:
        comment_created: Your comment was successfully created
 +      issue_reassigned: Your comment was created and the issue was reassigned
    reports:
      new:
        title_html: "Report %{link}"
@@@ -1914,12 -1913,12 +1914,12 @@@
            </ul>
          credit_3_1_html: |
           For the copyright notice, we have different requirements on how this should be 
-          displayed, depending on how you are using our data. For example, different 
-          rules apply on how to show the copyright notice depending on whether you have 
-          created a browsable map, a printed map or a static image. Full details on the 
-          requirements can be found in the 
-          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution 
-          Guidelines</a>. 
+          displayed, depending on how you are using our data. For example, different
+          rules apply on how to show the copyright notice depending on whether you have
+          created a browsable map, a printed map or a static image. Full details on the
+          requirements can be found in the
+          <a href="https://wiki.osmfoundation.org/wiki/Licence/Attribution_Guidelines">Attribution
+          Guidelines</a>.
          credit_4_html: |
            To make clear that the data is available under the Open
            Database License, you may link to
@@@ -2125,12 -2124,8 +2125,12 @@@
          description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
        forums:
          url: https://forum.openstreetmap.org/
 -        title: Forums
 +        title: Forums (Legacy)
          description: Questions and discussions for those that prefer a bulletin board style interface.
 +      community:
 +        url: https://community.openstreetmap.org/
 +        title: Community forum
 +        description: A shared place for conversations about OpenStreetMap.
        irc:
          url: https://irc.openstreetmap.org/
          title: IRC