]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Monkey patch MailDeliveryJob to work with delayed_job under ruby 3
[rails.git] / config / locales / en.yml
index eb04059a4677a8a1b7eff1d928e4a2a0466ee56b..3c8f09a489d48a2d4717efa3e1214687e804a5cd 100644 (file)
@@ -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
@@ -610,17 +609,17 @@ en:
         aeroway:
           aerodrome: "Aerodrome"
           airstrip: "Airstrip"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"
-          navigationaid: "Aviation Navigation aid"
+          navigationaid: "Aviation Navigation Aid"
           parking_position: "Parking Position"
           runway: "Runway"
           taxilane: "Taxilane"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
           windsock: "Windsock"
         amenity:
           animal_boarding: "Animal Boarding"
@@ -666,7 +665,7 @@ en:
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
-          fuel: "Fuel"
+          fuel: "Filling Station"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
           grit_bin: "Grit Bin"
@@ -675,7 +674,7 @@ en:
           ice_cream: "Ice Cream"
           internet_cafe: "Internet Cafe"
           kindergarten: "Kindergarten"
-          language_school: "Language school"
+          language_school: "Language School"
           library: "Library"
           loading_dock: "Loading Dock"
           love_hotel: "Love Hotel"
@@ -794,7 +793,7 @@ en:
           "yes": "Building"
         club:
           scout: "Scout Group Base"
-          sport: "Sportsclub"
+          sport: "Sports Club"
           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"
@@ -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"
@@ -843,6 +841,7 @@ en:
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"
+          crossing: "Crossing"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
@@ -931,9 +930,8 @@ en:
           brownfield: "Brownfield Land"
           cemetery: "Cemetery"
           commercial: "Commercial Area"
-          conservation: "Conservation"
-          construction: "Construction"
-          farm: "Farm"
+          conservation: "Conservation Area"
+          construction: "Construction Area"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
@@ -954,7 +952,7 @@ en:
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
           "yes": "Landuse"
@@ -1228,7 +1226,7 @@ en:
           deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
-          doityourself: "Do-It-Yourself"
+          doityourself: "Do-It-Yourself Shop"
           dry_cleaning: "Dry Cleaning"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
@@ -1254,7 +1252,7 @@ en:
           health_food: "Health Food Store"
           hearing_aids: "Hearing Aids"
           herbalist: "Herbalist"
-          hifi: "Hi-Fi"
+          hifi: "Hi-Fi Shop"
           houseware: "Houseware Shop"
           ice_cream: "Ice Cream Shop"
           interior_decoration: "Interior Decoration"
@@ -1314,7 +1312,7 @@ en:
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
-          cabin: "Cabin"
+          cabin: "Tourist Cabin"
           camp_pitch: "Camp Pitch"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
@@ -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
@@ -2066,7 +2068,7 @@ en:
           description: "Extracts for major world cities and their surrounding areas"
         other:
           title: "Other Sources"
-          description: "Additional sources listed on the OpenStreetMap wiki"
+          description: "Additional sources listed on the OpenStreetMap Wiki"
       options: "Options"
       format: "Format"
       scale: "Scale"
@@ -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}"