Fix new rubocop warnings

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f8786dfeb72be0341147d53ba09c413ee4f6343..55bd1c0a85c1bbf07ef4452601127b07c5a12a7d 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)


@@ -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


@@ -152,7 +151,7 @@ en:
       trace:
         tagstring: comma delimited
       user_block:
       trace:
         tagstring: comma delimited
       user_block:

-        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms.
+        reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms.

         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
         needs_view: Does the user need to log in before this block will be cleared?
       user:
         email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'


@@ -239,6 +238,59 @@ 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"
+      my settings: My Settings
+      current email address: "Current Email Address"
+      external auth: "External Authentication"
+      openid:
+        link: "https://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"
+      public editing:
+        heading: "Public editing"
+        enabled: "Enabled. Not anonymous and can edit data."
+        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
+        enabled link text: "what is this?"
+        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
+        disabled link text: "why can't I edit?"
+      public editing note:
+        heading: "Public editing"
+        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+      contributor terms:
+        heading: "Contributor Terms"
+        agreed: "You have agreed to the new Contributor Terms."
+        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://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
+      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."
+    destroy:
+      success: "Account Deleted."

   browse:
     created: "Created"
     closed: "Closed"
   browse:
     created: "Created"
     closed: "Closed"


@@ -369,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"


@@ -416,6 +468,26 @@ en:
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
       title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
     timeout:
       sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."

+  dashboards:
+    contact:
+      km away: "%{count}km away"
+      m away: "%{count}m away"
+    popup:
+      your location: "Your location"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
+    show:
+      title: My Dashboard
+      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
+      edit_your_profile: Edit your profile
+      my friends: My friends
+      no friends: You have not added any friends yet.
+      nearby users: "Other nearby users"
+      no nearby users: "There are no other users who admit to mapping nearby yet."
+      friends_changesets: "friends' changesets"
+      friends_diaries: "friends' diary entries"
+      nearby_changesets: "nearby user changesets"
+      nearby_diaries: "nearby user diary entries"

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -423,10 +495,10 @@ en:
       location: Location
       use_map_link: Use Map
     index:
       location: Location
       use_map_link: Use Map
     index:

-      title: "Users' diaries"
-      title_friends: "Friends' diaries"
-      title_nearby: "Nearby Users' diaries"
-      user_title: "%{user}'s diary"
+      title: "Users' Diaries"
+      title_friends: "Friends' Diaries"
+      title_nearby: "Nearby Users' Diaries"
+      user_title: "%{user}'s Diary"

       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary


@@ -439,8 +511,8 @@ en:
       title: Edit Diary Entry
       marker_text: Diary entry location
     show:
       title: Edit Diary Entry
       marker_text: Diary entry location
     show:

-      title: "%{user}'s diary | %{title}"
-      user_title: "%{user}'s diary"
+      title: "%{user}'s Diary | %{title}"
+      user_title: "%{user}'s Diary"

       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"


@@ -484,7 +556,9 @@ en:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:

-      has_commented_on: "%{display_name} has commented on the following diary entries"
+      title: "Diary Comments added by %{user}"
+      heading: "%{user}'s Diary Comments"
+      subheading_html: "Diary Comments added by %{user}"

       no_comments: "No diary comments"
       post: Post
       when: When
       no_comments: "No diary comments"
       post: Post
       when: When


@@ -535,17 +609,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"


@@ -591,7 +665,7 @@ en:
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           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"


@@ -600,7 +674,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"


@@ -697,7 +771,7 @@ en:
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"
           houseboat: "Houseboat"
           hut: "Hut"
           industrial: "Industrial Building"

-          kindergarten: "Kindergarden Building"
+          kindergarten: "Kindergarten Building"

           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"
           manufacture: "Manufacturing Building"
           office: "Office Building"
           public: "Public Building"


@@ -719,7 +793,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"


@@ -760,7 +834,6 @@ en:
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"

-          "yes": "Emergency"

         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"


@@ -768,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"


@@ -807,6 +881,7 @@ en:
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"

+          turning_circle: "Turning Circle"

           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"


@@ -855,9 +930,8 @@ 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"

           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"


@@ -878,7 +952,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"


@@ -1002,6 +1076,7 @@ en:
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"
           hill: "Hill"
           hot_spring: "Hot Spring"
           island: "Island"

+          isthmus: "Isthmus"

           land: "Land"
           marsh: "Marsh"
           moor: "Moor"
           land: "Land"
           marsh: "Marsh"
           moor: "Moor"


@@ -1016,10 +1091,13 @@ en:
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
           sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"

+          shingle: "Shingle"

           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           tree: "Tree"

+          tree_row: "Tree Row"
+          tundra: "Tundra"

           valley: "Valley"
           volcano: "Volcano"
           water: "Water"
           valley: "Valley"
           volcano: "Volcano"
           water: "Water"


@@ -1084,6 +1162,7 @@ en:
           "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"
           "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"

+          buffer_stop: "Buffer Stop"

           construction: "Railway under Construction"
           disused: "Disused Railway"
           funicular: "Funicular Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
           funicular: "Funicular Railway"


@@ -1097,6 +1176,7 @@ en:
           platform: "Railway Platform"
           preserved: "Preserved Railway"
           proposed: "Proposed Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
           proposed: "Proposed Railway"

+          rail: "Rail"

           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"


@@ -1105,6 +1185,7 @@ en:
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"

+          turntable: "Turntable"

           yard: "Railway Yard"
         shop:
           agrarian: "Agrarian Shop"
           yard: "Railway Yard"
         shop:
           agrarian: "Agrarian Shop"


@@ -1145,7 +1226,7 @@ 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"
+          doityourself: "Do-It-Yourself Shop"

           dry_cleaning: "Dry Cleaning"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"
           dry_cleaning: "Dry Cleaning"
           e-cigarette: "E-Cigarette Shop"
           electronics: "Electronics Shop"


@@ -1171,7 +1252,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"


@@ -1231,7 +1312,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"


@@ -1307,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"


@@ -1356,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}"


@@ -1420,8 +1501,9 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

+    partners_fastly: "Fastly"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     tou: "Terms of Use"


@@ -1645,6 +1727,43 @@ en:
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"

+  preferences:
+    show:
+      title: My Preferences
+      preferred_editor: Preferred Editor
+      preferred_languages: Preferred Languages
+      edit_preferences: Edit Preferences
+    edit:
+      title: Edit Preferences
+      save: Update Preferences
+      cancel: Cancel
+    update:
+      failure: Couldn't update preferences.
+    update_success_flash:
+      message: Preferences updated.
+  profiles:
+    edit:
+      title: Edit Profile
+      save: Update Profile
+      cancel: Cancel
+      image: Image
+      gravatar:
+        gravatar: "Use Gravatar"
+        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
+        what_is_gravatar: "What is Gravatar?"
+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."
+      new image: "Add an image"
+      keep image: "Keep the current image"
+      delete image: "Remove the current image"
+      replace image: "Replace the current image"
+      image size hint: "(square images at least 100x100 work best)"
+      home location: "Home Location"
+      no home location: "You have not entered your home location."
+      update home location on click: "Update home location when I click on the map?"
+    update:
+      success: Profile updated.
+      failure: Couldn't update profile.

   sessions:
     new:
       title: "Login"
   sessions:
     new:
       title: "Login"


@@ -1717,7 +1836,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.


@@ -1787,26 +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. If you are using these tiles please use
-          the following attribution:
-          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;.
-        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


@@ -1832,10 +1955,10 @@ en:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
         contributors_au_html: |

-          <strong>Australia</strong>: Contains data sourced from
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>

           licensed by the Commonwealth of Australia under
           licensed by the Commonwealth of Australia under

-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.

         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -1893,7 +2016,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


@@ -1946,7 +2069,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"


@@ -2002,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


@@ -2023,7 +2150,7 @@ en:
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
     potlatch:
       removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
       desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.

-      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.

     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close


@@ -2076,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"


@@ -2181,8 +2309,8 @@ en:
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     edit:
       cancel: Cancel
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     edit:
       cancel: Cancel

-      title: "Editing trace %{name}"
-      heading: "Editing trace %{name}"
+      title: "Editing Trace %{name}"
+      heading: "Editing Trace %{name}"

       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:


@@ -2190,8 +2318,8 @@ en:
     trace_optionals:
       tags: "Tags"
     show:
     trace_optionals:
       tags: "Tags"
     show:

-      title: "Viewing trace %{name}"
-      heading: "Viewing trace %{name}"
+      title: "Viewing Trace %{name}"
+      heading: "Viewing Trace %{name}"

       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"


@@ -2230,9 +2358,9 @@ en:
       by: "by"
       in: "in"
     index:
       by: "by"
       in: "in"
     index:

-      public_traces: "Public GPS traces"
-      my_traces: "My GPS traces"
-      public_traces_from: "Public GPS traces from %{user}"
+      public_traces: "Public 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}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."


@@ -2264,9 +2392,14 @@ 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."
       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:
+      account_settings: Account Settings
+      oauth1_settings: OAuth 1 settings
+      oauth2_applications: OAuth 2 applications
+      oauth2_authorizations: OAuth 2 authorizations

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2300,6 +2433,8 @@ en:
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes
       read_gpx: Read private GPS traces
       write_gpx: Upload GPS traces
       write_notes: Modify notes

+      read_email: Read user email address
+      skip_authorization: Auto approve application

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2341,7 +2476,7 @@ en:
       flash: "Destroyed the client application registration"
   oauth2_applications:
     index:
       flash: "Destroyed the client application registration"
   oauth2_applications:
     index:

-      title: "My client applications"
+      title: "My Client Applications"

       no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
       oauth_2: "OAuth 2"
       new: "Register new application"
       no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
       oauth_2: "OAuth 2"
       new: "Register new application"


@@ -2368,7 +2503,7 @@ en:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
     new:
       sorry: "Sorry, that application could not be found."
   oauth2_authorizations:
     new:

-      title: "Authorization required"
+      title: "Authorization Required"

       introduction: "Authorize %{application} to access your account with the following permissions?"
       authorize: "Authorize"
       deny: "Deny"
       introduction: "Authorize %{application} to access your account with the following permissions?"
       authorize: "Authorize"
       deny: "Deny"


@@ -2378,7 +2513,7 @@ en:
       title: "Authorization code"
   oauth2_authorized_applications:
     index:
       title: "Authorization code"
   oauth2_authorized_applications:
     index:

-      title: "My authorized applications"
+      title: "My Authorized Applications"

       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       application: "Application"
       permissions: "Permissions"
       no_applications_html: "You have not yet authorized any %{oauth2} applications."


@@ -2416,7 +2551,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"


@@ -2446,8 +2581,11 @@ en:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments

+      my_preferences: My Preferences
+      my_dashboard: My Dashboard

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me

+      edit_profile: Edit Profile

       send message: Send Message
       diary: Diary
       edits: Edits
       send message: Send Message
       diary: Diary
       edits: Edits


@@ -2466,14 +2604,6 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
-      settings_link_text: settings
-      my friends: My friends
-      no friends: You have not added any friends yet.
-      km away: "%{count}km away"
-      m away: "%{count}m away"
-      nearby users: "Other nearby users"
-      no nearby users: "There are no other users who admit to mapping nearby yet."

       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"


@@ -2490,68 +2620,13 @@ en:
       activate_user: "Activate this User"
       deactivate_user: "Deactivate this User"
       confirm_user: "Confirm this User"
       activate_user: "Activate this User"
       deactivate_user: "Deactivate this User"
       confirm_user: "Confirm this User"

+      unconfirm_user: "Unconfirm this User"
+      unsuspend_user: "Unsuspend this User"

       hide_user: "Hide this User"
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"
       hide_user: "Hide this User"
       unhide_user: "Unhide this User"
       delete_user: "Delete this User"
       confirm: "Confirm"

-      friends_changesets: "friends' changesets"
-      friends_diaries: "friends' diary entries"
-      nearby_changesets: "nearby user changesets"
-      nearby_diaries: "nearby user diary entries"

       report: Report this User
       report: Report this User

-    popup:
-      your location: "Your location"
-      nearby mapper: "Nearby mapper"
-      friend: "Friend"
-    account:
-      title: "Edit account"
-      my settings: My settings
-      current email address: "Current Email Address"
-      external auth: "External Authentication"
-      openid:
-        link: "https://wiki.openstreetmap.org/wiki/OpenID"
-        link text: "what is this?"
-      public editing:
-        heading: "Public editing"
-        enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
-        enabled link text: "what is this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      public editing note:
-        heading: "Public editing"
-        html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
-      contributor terms:
-        heading: "Contributor Terms"
-        agreed: "You have agreed to the new Contributor Terms."
-        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 text: "what is this?"
-      image: Image
-      gravatar:
-        gravatar: "Use Gravatar"
-        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
-        what_is_gravatar: "What is Gravatar?"
-        disabled: "Gravatar has been disabled."
-        enabled: "Display of your Gravatar has been enabled."
-      new image: "Add an image"
-      keep image: "Keep the current image"
-      delete image: "Remove the current image"
-      replace image: "Replace the current image"
-      image size hint: "(square images at least 100x100 work best)"
-      home location: "Home Location"
-      no home location: "You have not entered your home location."
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      oauth1 settings: OAuth 1 settings
-      oauth2 applications: OAuth 2 applications
-      oauth2 authorizations: OAuth 2 authorizations
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."

     set_home:
       flash success: "Home location saved successfully"
     go_public:
     set_home:
       flash success: "Home location saved successfully"
     go_public:


@@ -2586,6 +2661,7 @@ en:
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope
       no_authorization_code: No authorization code
       unknown_signature_algorithm: Unknown signature algorithm
       invalid_scope: Invalid scope

+      unknown_error: Authentication failed

     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |
     auth_association:
       heading: Your ID is not associated with a OpenStreetMap account yet.
       option_1: |


@@ -2678,11 +2754,11 @@ en:
           other: "%{count} years"
     blocks_on:
       title: "Blocks on %{name}"
           other: "%{count} years"
     blocks_on:
       title: "Blocks on %{name}"

-      heading_html: "List of blocks on %{name}"
+      heading_html: "List of Blocks on %{name}"

       empty: "%{name} has not been blocked yet."
     blocks_by:
       title: "Blocks by %{name}"
       empty: "%{name} has not been blocked yet."
     blocks_by:
       title: "Blocks by %{name}"

-      heading_html: "List of blocks by %{name}"
+      heading_html: "List of Blocks by %{name}"

       empty: "%{name} has not made any blocks yet."
     show:
       title: "%{block_on} blocked by %{block_by}"
       empty: "%{name} has not made any blocks yet."
     show:
       title: "%{block_on} blocked by %{block_by}"


@@ -2715,7 +2791,7 @@ en:
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"

-      heading: "%{user}'s notes"
+      heading: "%{user}'s Notes"

       subheading_html: "Notes submitted or commented on by %{user}"
       no_notes: No notes
       id: "Id"
       subheading_html: "Notes submitted or commented on by %{user}"
       no_notes: No notes
       id: "Id"


@@ -2812,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"


@@ -2911,19 +2988,19 @@ en:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      heading: "Edit redaction"
-      title: "Edit redaction"
+      heading: "Edit Redaction"
+      title: "Edit Redaction"

     index:
       empty: "No redactions to show."
     index:
       empty: "No redactions to show."

-      heading: "List of redactions"
-      title: "List of redactions"
+      heading: "List of Redactions"
+      title: "List of Redactions"

     new:
     new:

-      heading: "Enter information for new redaction"
-      title: "Creating new redaction"
+      heading: "Enter Information for New Redaction"
+      title: "Creating New Redaction"

     show:
       description: "Description:"
     show:
       description: "Description:"

-      heading: "Showing redaction \"%{title}\""
-      title: "Showing redaction"
+      heading: "Showing Redaction \"%{title}\""
+      title: "Showing Redaction"

       user: "Creator:"
       edit: "Edit this redaction"
       destroy: "Remove this redaction"
       user: "Creator:"
       edit: "Edit this redaction"
       destroy: "Remove this redaction"