X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0bcc60682aa120399ac0eb1312a000966dd3b75..a11e156f56e767b08eef3c1992610e1050c205ec:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e6906c0d..0d52e59a7 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
@@ -406,6 +405,7 @@ en:
       wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
       telephone_link: "Call %{phone_number}"
       colour_preview: "Colour %{colour_value} preview"
+      email_link: "Email %{email}"
     note:
       title: "Note: %{id}"
       new_note: "New Note"
@@ -422,7 +422,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"
@@ -447,6 +447,7 @@ en:
     index:
       title: "Changesets"
       title_user: "Changesets by %{user}"
+      title_user_link_html: "Changesets by %{user_link}"
       title_friend: "Changesets by my friends"
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
@@ -610,8 +611,8 @@ en:
         aeroway:
           aerodrome: "Aerodrome"
           airstrip: "Airstrip"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"
@@ -620,7 +621,7 @@ en:
           runway: "Runway"
           taxilane: "Taxilane"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
           windsock: "Windsock"
         amenity:
           animal_boarding: "Animal Boarding"
@@ -666,7 +667,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"
@@ -822,7 +823,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
-        crossing: "Crossing"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
@@ -843,6 +843,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 +932,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 +954,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 +1228,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 +1254,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 +1314,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 +1390,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"
@@ -1439,6 +1438,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}"
@@ -1515,6 +1515,7 @@ en:
     help: Help
     about: About
     copyright: Copyright
+    communities: Communities
     community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@ -1784,7 +1785,6 @@ en:
       create account minute: Create an account. It only takes a minute.
       no account: Don't have an account?
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact <a href="%{webmaster}">support</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
       openid_logo_alt: "Log in with an OpenID"
       auth_providers:
@@ -1816,6 +1816,10 @@ en:
       title: "Logout"
       heading: "Logout from OpenStreetMap"
       logout_button: "Logout"
+    suspended_flash:
+      suspended: Sorry, your account has been suspended due to suspicious activity.
+      contact_support_html: Please contact %{support_link} if you wish to discuss this.
+      support: support
   shared:
     markdown_help:
       title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
@@ -1908,25 +1912,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
@@ -2122,8 +2131,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
@@ -2196,6 +2209,7 @@ en:
           common:
             - Common
             - meadow
+            - garden
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
@@ -2280,6 +2294,30 @@ en:
           Just go to <a href='%{map_url}'>the map</a> and click the note icon:
           <span class='icon note'></span>. This will add a marker to the map, which you can move
           by dragging. Add your message, then click save, and other mappers will investigate.
+    communities:
+      title: Communities
+      lede_text: |
+        People from all over the world contribute to or use OpenStreetMap.
+        While many participate as individuals, others have formed communities.
+        These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
+        They can also be formal or informal.
+      local_chapters:
+        title: Local Chapters
+        about_text: |
+          Local Chapters are country-level or region-level groups that have taken the formal step of
+          establishing not-for-profit legal entities. They represent the area's map and mappers when
+          dealing with local government, business, and media. They have also formed an affiliation
+          with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
+          governing body.
+        list_text: |
+          The following communities are formally established as Local Chapters:
+      other_groups:
+        title: Other Groups
+        about_html: |
+          There is no need to formally establish a group to the same extent as the Local Chapters.
+          Indeed many groups exist very sucessfully as an informal gathering of people or as a
+          community group. Anyone can set up or join these. Read more on the
+          <a href="https://wiki.openstreetmap.org/wiki/User_group">Communities wiki page</a>.
   traces:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -2351,7 +2389,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}"
@@ -2516,7 +2554,8 @@ en:
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_support_html: 'Please contact <a href="%{support}">support</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      support: support
       about:
         header: Free and editable
         html: |
@@ -2638,15 +2677,9 @@ en:
       title: Account Suspended
       heading: Account Suspended
       support: support
-      body_html: |
-        <p>
-          Sorry, your account has been automatically suspended due to
-          suspicious activity.
-        </p>
-        <p>
-          This decision will be reviewed by an administrator shortly, or
-          you may contact %{webmaster} if you wish to discuss this.
-        </p>
+      automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity.
+      contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this.
+      support: support
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
@@ -2880,6 +2913,10 @@ 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}."
+        other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
+        other_problems_resolved: "For all other problems, resolving is sufficient."
+        disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}."
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"