Fix new rubocop warnings

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c3e048f83d0ed2042d3f447858b2e2ae1ce4e1a1..55bd1c0a85c1bbf07ef4452601127b07c5a12a7d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -109,13 +109,12 @@ en:
       trace:
         user: "User"
         visible: "Visible"
       trace:
         user: "User"
         visible: "Visible"

-        name: "Name"
+        name: Filename

         size: "Size"
         latitude: "Latitude"
         longitude: "Longitude"
         public: "Public"
         description: "Description"
         size: "Size"
         latitude: "Latitude"
         longitude: "Longitude"
         public: "Public"
         description: "Description"

-        name: Filename

         gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags
         gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags


@@ -422,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>"
       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"
       coordinates_html: "%{latitude}, %{longitude}"
     query:
       title: "Query Features"


@@ -822,7 +821,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"

-        crossing: "Crossing"

         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"


@@ -843,6 +841,7 @@ en:
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"

+          crossing: "Crossing"

           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"


@@ -1389,7 +1388,6 @@ en:
       last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
       last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
       link_to_reports: View Reports
       last_updated_time_html: "<abbr title='%{title}'>%{time}</abbr>"
       last_updated_time_user_html: "<abbr title='%{title}'>%{time}</abbr> by %{user}"
       link_to_reports: View Reports

-      reported_user: Reported User

       reports_count:
         one: "1 Report"
         other: "%{count} Reports"
       reports_count:
         one: "1 Report"
         other: "%{count} Reports"


@@ -1438,6 +1436,7 @@ en:
   issue_comments:
     create:
       comment_created: Your comment was successfully created
   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}"
   reports:
     new:
       title_html: "Report %{link}"


@@ -1907,25 +1906,30 @@ en:
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |

-          We require that you use the credit &ldquo;&copy; OpenStreetMap
-          contributors&rdquo;.
+          Where you use OpenStreetMap data, you are required to do the following two things:

         credit_2_1_html: |
         credit_2_1_html: |

-          You must also make it clear that the data is available under the Open
-          Database License. You may do this by linking to
+          <ul>
+            <li>Provide credit to OpenStreetMap by displaying our copyright notice.</li>
+            <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>. 
+        credit_4_html: |
+          To make clear that the data is available under the Open
+          Database License, you may link to

           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address) and to opendatacommons.org.
           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address) and to opendatacommons.org.

-        credit_3_1_html: |
-          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a
-          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
-          under the Open Database License. When using this map style, the same attribution is
-          required as for the map data.
-        credit_4_html: |
-          For a browsable electronic map, the credit should appear in the corner of the map.
-          For example:
+          In this example, the credit appears in the corner of the map.

         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example


@@ -2121,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/
         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.
         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
       irc:
         url: https://irc.openstreetmap.org/
         title: IRC


@@ -2195,6 +2203,7 @@ en:
           common:
             - Common
             - meadow
           common:
             - Common
             - meadow

+            - garden

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"


@@ -2350,7 +2359,7 @@ en:
       in: "in"
     index:
       public_traces: "Public GPS Traces"
       in: "in"
     index:
       public_traces: "Public GPS Traces"

-      my_traces: "My 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}"
       public_traces_from: "Public GPS Traces from %{user}"
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"


@@ -2879,6 +2888,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
         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"
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"