]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into HEAD
[rails.git] / config / locales / en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2cbc8091800c1106b0bdc828890ec1651d30c6a9..ca88099b8e39a3be7c1c3f05f2329f1338a853fb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,7 +38,7 @@ en:
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
-    # Translates all the model names, which is used in error handling on the web site
+    # Translates all the model names, which is used in error handling on the website
     models:
       acl: "Access Control List"
       changeset: "Changeset"
     models:
       acl: "Access Control List"
       changeset: "Changeset"
@@ -75,8 +75,8 @@ en:
       way: "Way"
       way_node: "Way Node"
       way_tag: "Way Tag"
       way: "Way"
       way_node: "Way Node"
       way_tag: "Way Tag"
-    # Translates all the model attributes, which is used in error handling on the web site
-    # Only the ones that are used on the web site are translated at the moment
+    # Translates all the model attributes, which is used in error handling on the website
+    # Only the ones that are used on the website are translated at the moment
     attributes:
       client_application:
         name: Name (Required)
     attributes:
       client_application:
         name: Name (Required)
@@ -239,6 +239,24 @@ en:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note
+  account:
+    deletions:
+      show:
+        title: Delete My Account
+        warning: Warning! The account deletion process is final, and cannot be reversed.
+        delete_account: Delete Account
+        delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:"
+        delete_profile: Your profile information, including your avatar, description and home location will be removed.
+        delete_display_name: Your display name will be removed, and can be reused by other accounts.
+        retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:"
+        retain_edits: Your edits to the map database, if any, will be retained.
+        retain_traces: Your uploaded traces, if any, will be retained.
+        retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view.
+        retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
+        retain_changeset_discussions: Your changeset discussions, if any, will be retained.
+        retain_email: Your email address will be retained.
+        confirm_delete: Are you sure?
+        cancel: Cancel
   accounts:
     edit:
       title: "Edit account"
   accounts:
     edit:
       title: "Edit account"
@@ -264,13 +282,16 @@ en:
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
-        link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         link text: "what is this?"
       save changes button: Save Changes
       make edits public button: Make all my edits public
         link text: "what is this?"
       save changes button: Save Changes
       make edits public button: Make all my edits public
+      delete_account: Delete Account...
     update:
       success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       success: "User information updated successfully."
     update:
       success_confirm_needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       success: "User information updated successfully."
+    destroy:
+      success: "Account Deleted."
   browse:
     created: "Created"
     closed: "Closed"
   browse:
     created: "Created"
     closed: "Closed"
@@ -589,17 +610,17 @@ en:
         aeroway:
           aerodrome: "Aerodrome"
           airstrip: "Airstrip"
         aeroway:
           aerodrome: "Aerodrome"
           airstrip: "Airstrip"
-          apron: "Apron"
-          gate: "Gate"
+          apron: "Airport Apron"
+          gate: "Airport Gate"
           hangar: "Hangar"
           helipad: "Helipad"
           holding_position: "Holding Position"
           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"
           parking_position: "Parking Position"
           runway: "Runway"
           taxilane: "Taxilane"
           taxiway: "Taxiway"
-          terminal: "Terminal"
+          terminal: "Airport Terminal"
           windsock: "Windsock"
         amenity:
           animal_boarding: "Animal Boarding"
           windsock: "Windsock"
         amenity:
           animal_boarding: "Animal Boarding"
@@ -640,12 +661,12 @@ en:
           driving_school: "Driving School"
           embassy: "Embassy"
           events_venue: "Events Venue"
           driving_school: "Driving School"
           embassy: "Embassy"
           events_venue: "Events Venue"
-          fast_food: "Fast Food"
+          fast_food: "Fast Food Restaurant"
           ferry_terminal: "Ferry Terminal"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           ferry_terminal: "Ferry Terminal"
           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"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
           grit_bin: "Grit Bin"
@@ -654,7 +675,7 @@ en:
           ice_cream: "Ice Cream"
           internet_cafe: "Internet Cafe"
           kindergarten: "Kindergarten"
           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"
           library: "Library"
           loading_dock: "Loading Dock"
           love_hotel: "Love Hotel"
@@ -773,7 +794,7 @@ en:
           "yes": "Building"
         club:
           scout: "Scout Group Base"
           "yes": "Building"
         club:
           scout: "Scout Group Base"
-          sport: "Sportsclub"
+          sport: "Sports Club"
           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"
           "yes": "Club"
         craft:
           beekeeper: "Beekeeper"
@@ -820,7 +841,7 @@ en:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          construction: "Highway under Construction"
+          construction: "Road under Construction"
           corridor: "Corridor"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           corridor: "Corridor"
           cycleway: "Cycle Path"
           elevator: "Elevator"
@@ -910,9 +931,9 @@ en:
           brownfield: "Brownfield Land"
           cemetery: "Cemetery"
           commercial: "Commercial Area"
           brownfield: "Brownfield Land"
           cemetery: "Cemetery"
           commercial: "Commercial Area"
-          conservation: "Conservation"
-          construction: "Construction"
-          farm: "Farm"
+          conservation: "Conservation Area"
+          construction: "Construction Area"
+          farm: "Farmland"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
@@ -933,7 +954,7 @@ en:
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
           reservoir: "Reservoir"
           reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
-          retail: "Retail"
+          retail: "Retail Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
           "yes": "Landuse"
           village_green: "Village Green"
           vineyard: "Vineyard"
           "yes": "Landuse"
@@ -1207,8 +1228,8 @@ en:
           deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
           deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
-          doityourself: "Do-It-Yourself"
-          dry_cleaning: "Dry Cleaning"
+          doityourself: "Do-It-Yourself Shop"
+          dry_cleaning: "Dry Cleaner"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
           erotic: "Erotic Shop"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
           erotic: "Erotic Shop"
@@ -1233,7 +1254,7 @@ en:
           health_food: "Health Food Store"
           hearing_aids: "Hearing Aids"
           herbalist: "Herbalist"
           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"
           houseware: "Houseware Shop"
           ice_cream: "Ice Cream Shop"
           interior_decoration: "Interior Decoration"
@@ -1293,7 +1314,7 @@ en:
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
           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"
           camp_pitch: "Camp Pitch"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
@@ -1817,7 +1838,7 @@ en:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"
+      used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.
       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.
@@ -1992,7 +2013,7 @@ en:
         infringement_2_html: |
           If you believe that copyrighted material has been inappropriately
           added to the OpenStreetMap database or this site, please refer
         infringement_2_html: |
           If you believe that copyrighted material has been inappropriately
           added to the OpenStreetMap database or this site, please refer
-          to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+          to our <a href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">takedown
           procedure</a> or file directly at our
           <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
           procedure</a> or file directly at our
           <a href="https://dmca.openstreetmap.org/">on-line filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
@@ -2045,7 +2066,7 @@ en:
           description: "Extracts for major world cities and their surrounding areas"
         other:
           title: "Other Sources"
           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"
       options: "Options"
       format: "Format"
       scale: "Scale"
@@ -2363,7 +2384,7 @@ en:
     require_admin:
       not_an_admin: You need to be an admin to perform that action.
     setup_user_auth:
     require_admin:
       not_an_admin: You need to be an admin to perform that action.
     setup_user_auth:
-      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
     settings_menu:
@@ -2522,7 +2543,7 @@ en:
       read_tou: "I have read and agree to the Terms of Use"
       consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       read_tou: "I have read and agree to the Terms of Use"
       consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
-      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
       continue: Continue
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
       continue: Continue
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
The OpenStreetMap web site