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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 00e8068f8911fd6fd14b43b3a5cf83a2fe400ba5..c560ded1c258b3a8d86210dabda76b7ed3cc151e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -421,7 +421,7 @@ en:
       reopened_by_html: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       reopened_by_anonymous_html: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       hidden_by_html: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      report: Report this note
+      report: report this note
       coordinates_html: "%{latitude}, %{longitude}"
     query:
       title: "Query Features"
@@ -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}"
@@ -1912,13 +1913,13 @@ en:
             <li>Make clear that the data is available under the Open Database License.</li>
           </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>. 
+         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>.
         credit_4_html: |
           To make clear that the data is available under the Open
           Database License, you may link to
@@ -2124,8 +2125,12 @@ en:
         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
@@ -2354,6 +2359,7 @@ en:
       in: "in"
     index:
       public_traces: "Public GPS Traces"
+      my_gps_traces: "My GPS Traces"
       public_traces_from: "Public GPS Traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
@@ -2882,6 +2888,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
+        report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment."
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"