X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..21d52f2d3f3d83eb888543ec6c2a180e01d17baf:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ca88099b8..3c8f09a48 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -109,13 +109,12 @@ en:
       trace:
         user: "User"
         visible: "Visible"
-        name: "Name"
+        name: Filename
         size: "Size"
         latitude: "Latitude"
         longitude: "Longitude"
         public: "Public"
         description: "Description"
-        name: Filename
         gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags
@@ -661,7 +660,7 @@ en:
           driving_school: "Driving School"
           embassy: "Embassy"
           events_venue: "Events Venue"
-          fast_food: "Fast Food Restaurant"
+          fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"
           fire_station: "Fire Station"
           food_court: "Food Court"
@@ -822,7 +821,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
-        crossing: "Crossing"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
@@ -841,8 +839,9 @@ en:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          construction: "Road under Construction"
+          construction: "Highway under Construction"
           corridor: "Corridor"
+          crossing: "Crossing"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
@@ -933,7 +932,6 @@ en:
           commercial: "Commercial Area"
           conservation: "Conservation Area"
           construction: "Construction Area"
-          farm: "Farmland"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
@@ -1229,7 +1227,7 @@ en:
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself Shop"
-          dry_cleaning: "Dry Cleaner"
+          dry_cleaning: "Dry Cleaning"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
           erotic: "Erotic Shop"
@@ -1390,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
-      reported_user: Reported User
       reports_count:
         one: "1 Report"
         other: "%{count} Reports"
@@ -1908,25 +1905,30 @@ en:
           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: |
-          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.
-        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
@@ -2196,6 +2198,7 @@ en:
           common:
             - Common
             - meadow
+            - garden
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
@@ -2351,7 +2354,7 @@ en:
       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}"