Underline time elements that have a title

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e8e86dd47a7a6e6c4f53904a98c654f04182f367..3fbb69c26d3ddad7a9b6f5a95d2efe1c60210345 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -11,10 +11,12 @@
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry
 # Author: Caliburn
 # Author: Captaindogfish
 # Author: Chase me ladies, I'm the Cavalry

+# Author: Danieldegroot2

 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
 # Author: Gravitystorm
 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
 # Author: Gravitystorm

+# Author: Hufkratzer

 # Author: IknowJoseph
 # Author: Jagwar
 # Author: Jguthrie100
 # Author: IknowJoseph
 # Author: Jagwar
 # Author: Jguthrie100


@@ -31,21 +33,17 @@
 # Author: Smsm1
 # Author: Tlubenov
 # Author: TomH
 # Author: Smsm1
 # Author: Tlubenov
 # Author: TomH

+# Author: Wehwei

 # Author: ديفيد
 ---
 en-GB:
 # Author: ديفيد
 ---
 en-GB:

-  html:
-    dir: ltr

   time:
     formats:
       friendly: '%e %B %Y at %H:%M'
   time:
     formats:
       friendly: '%e %B %Y at %H:%M'

-      blog: '%e %B %Y'

   helpers:
     file:
       prompt: Choose file
     submit:
   helpers:
     file:
       prompt: Choose file
     submit:

-      diary_comment:
-        create: Save

       diary_entry:
         create: Publish
         update: Update
       diary_entry:
         create: Publish
         update: Update


@@ -83,7 +81,6 @@ en-GB:
       message: Message
       node: Node
       node_tag: Node Tag
       message: Message
       node: Node
       node_tag: Node Tag

-      notifier: Notifier

       old_node: Old Node
       old_node_tag: Old Node Tag
       old_relation: Old Relation
       old_node: Old Node
       old_node_tag: Old Node Tag
       old_relation: Old Relation


@@ -126,7 +123,7 @@ en-GB:
         title: Subject
         latitude: Latitude
         longitude: Longitude
         title: Subject
         latitude: Latitude
         longitude: Longitude

-        language: Language
+        language_code: Language

       friend:
         user: User
         friend: Friend
       friend:
         user: User
         friend: Friend


@@ -209,9 +206,6 @@ en-GB:
       x_years:
         one: 1 year ago
         other: '%{count} years ago'
       x_years:
         one: 1 year ago
         other: '%{count} years ago'

-  printable_name:
-    with_version: '%{id}, v%{version}'
-    with_name_html: '%{name} (%{id})'

   editor:
     default: Default (currently %{name})
     id:
   editor:
     default: Default (currently %{name})
     id:


@@ -226,7 +220,6 @@ en-GB:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -252,15 +245,40 @@ en-GB:
       entry:
         comment: Comment
         full: Full note
       entry:
         comment: Comment
         full: Full note

+  accounts:
+    edit:
+      title: Edit account
+      my settings: My settings
+      current email address: Current Email Address
+      external auth: External Authentication
+      openid:
+        link text: what is this?
+      public editing:
+        heading: Public editing
+        enabled: Enabled. Not anonymous and can edit data.
+        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?
+      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 text: what is this?
+      save changes button: Save Changes
+    go_public:
+      heading: Public editing
+      make_edits_public_button: Make all my edits public
+    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.

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

-    created_html: Created <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Created <abbr title='%{title}'>%{time}</abbr> by %{user}
-    deleted_by_html: Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}
-    edited_by_html: Edited <abbr title='%{title}'>%{time}</abbr> by %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time}</abbr> by %{user}

     version: Version
     in_changeset: Changeset
     anonymous: anonymous
     version: Version
     in_changeset: Changeset
     anonymous: anonymous


@@ -270,8 +288,6 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
     view_history: View History
     view_details: View Details
     location: 'Location:'

-    common_details:
-      coordinates_html: '%{latitude}, %{longitude}'

     changeset:
       title: 'Changeset: %{id}'
       belongs_to: Author
     changeset:
       title: 'Changeset: %{id}'
       belongs_to: Author


@@ -282,8 +298,6 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})

-      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:


@@ -308,7 +322,6 @@ en-GB:
       history_title_html: 'Relation History: %{name}'
       members: Members
     relation_member:
       history_title_html: 'Relation History: %{name}'
       members: Members
     relation_member:

-      entry_html: '%{type} %{name}'

       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
       entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node


@@ -358,24 +371,6 @@ en-GB:
       wikimedia_commons_link: The %{page} item on Wikimedia Commons
       telephone_link: Call %{phone_number}
       colour_preview: Colour %{colour_value} preview
       wikimedia_commons_link: The %{page} item on Wikimedia Commons
       telephone_link: Call %{phone_number}
       colour_preview: Colour %{colour_value} preview

-    note:
-      title: 'Note: %{id}'
-      new_note: New Note
-      description: Description
-      open_title: 'Unresolved note #%{note_name}'
-      closed_title: 'Resolved note #%{note_name}'
-      hidden_title: 'Hidden note #%{note_name}'
-      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolved by anonymous <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
-      coordinates_html: '%{latitude}, %{longitude}'

     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.


@@ -422,6 +417,22 @@ en-GB:
     timeout:
       sorry: Sorry, the list of changeset comments you requested took too long to
         retrieve.
     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:
+      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


@@ -490,7 +501,6 @@ en-GB:
         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'

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -509,18 +519,7 @@ en-GB:
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
   geocoder:
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
   geocoder:

-    search:
-      title:
-        latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
-        ca_postcode_html: Results from <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames_html: Results from <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames_reverse_html: Results from <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
     search_osm_nominatim:

-      prefix_format: '%{name}'

       prefix:
         aerialway:
           cable_car: Cable Car
       prefix:
         aerialway:
           cable_car: Cable Car


@@ -535,15 +534,12 @@ en-GB:
         aeroway:
           aerodrome: Aerodrome
           airstrip: Airstrip
         aeroway:
           aerodrome: Aerodrome
           airstrip: Airstrip

-          apron: Apron
-          gate: Gate

           hangar: Hangar
           helipad: Helipad
           holding_position: Holding Position
           parking_position: Parking Position
           runway: Runway
           taxiway: Taxiway
           hangar: Hangar
           helipad: Helipad
           holding_position: Holding Position
           parking_position: Parking Position
           runway: Runway
           taxiway: Taxiway

-          terminal: Terminal

         amenity:
           animal_shelter: Animal Shelter
           arts_centre: Arts Centre
         amenity:
           animal_shelter: Animal Shelter
           arts_centre: Arts Centre


@@ -587,7 +583,6 @@ en-GB:
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain

-          fuel: Fuel

           gambling: Gambling
           grave_yard: Graveyard
           grit_bin: Grit Bin
           gambling: Gambling
           grave_yard: Graveyard
           grit_bin: Grit Bin


@@ -596,7 +591,6 @@ en-GB:
           ice_cream: Ice Cream
           internet_cafe: Internet Cafe
           kindergarten: Nursery School
           ice_cream: Ice Cream
           internet_cafe: Internet Cafe
           kindergarten: Nursery 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


@@ -689,7 +683,6 @@ en-GB:
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank

-          "yes": Emergency

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


@@ -771,9 +764,6 @@ en-GB:
           brownfield: Brownfield Land
           cemetery: Cemetery
           commercial: Commercial Area
           brownfield: Brownfield Land
           cemetery: Cemetery
           commercial: Commercial Area

-          conservation: Conservation
-          construction: Construction
-          farm: Farm

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


@@ -792,7 +782,6 @@ en-GB:
           reservoir: Reservoir
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
           reservoir: Reservoir
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area

-          retail: Retail

           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse


@@ -807,7 +796,7 @@ en-GB:
           fitness_station: Fitness Station
           garden: Garden
           golf_course: Golf Course
           fitness_station: Fitness Station
           garden: Garden
           golf_course: Golf Course

-          horse_riding: Horse Riding
+          horse_riding: Horse Riding Centre

           ice_rink: Ice Rink
           marina: Marina
           miniature_golf: Miniature Golf
           ice_rink: Ice Rink
           marina: Marina
           miniature_golf: Miniature Golf


@@ -1012,7 +1001,7 @@ en-GB:
           deli: Delicatessen
           department_store: Department Store
           discount: Discount Items Shop
           deli: Delicatessen
           department_store: Department Store
           discount: Discount Items Shop

-          doityourself: DIY store
+          doityourself: DIY Shop

           dry_cleaning: Dry Cleaning
           electronics: Electronics Shop
           estate_agent: Estate Agent
           dry_cleaning: Dry Cleaning
           electronics: Electronics Shop
           estate_agent: Estate Agent


@@ -1029,7 +1018,6 @@ en-GB:
           grocery: Grocery Shop
           hairdresser: Hairdresser
           hardware: Hardware Store
           grocery: Grocery Shop
           hairdresser: Hairdresser
           hardware: Hardware Store

-          hifi: Hi-Fi

           houseware: Houseware Shop
           interior_decoration: Interior Decoration
           jewelry: Jewellers
           houseware: Houseware Shop
           interior_decoration: Interior Decoration
           jewelry: Jewellers


@@ -1070,7 +1058,6 @@ en-GB:
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast

-          cabin: Cabin

           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet
           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet


@@ -1126,18 +1113,13 @@ en-GB:
     index:
       reports: Reports
   layouts:
     index:
       reports: Reports
   layouts:

-    project_name:
-      title: OpenStreetMap
-      h1: OpenStreetMap

     logo:
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logout: Log Out
     log_in: Log In
     logo:
       alt_text: OpenStreetMap logo
     home: Go to Home Location
     logout: Log Out
     log_in: Log In

-    log_in_tooltip: Log in with an existing account

     sign_up: Sign Up
     start_mapping: Start Mapping
     sign_up: Sign Up
     start_mapping: Start Mapping

-    sign_up_tooltip: Create an account for editing

     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export


@@ -1167,8 +1149,6 @@ en-GB:
     community: Community
     community_blogs: Community Blogs
     community_blogs_title: Blogs from members of the OpenStreetMap community
     community: Community
     community_blogs: Community Blogs
     community_blogs_title: Blogs from members of the OpenStreetMap community

-    foundation: Foundation
-    foundation_title: The OpenStreetMap Foundation

     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation


@@ -1196,13 +1176,8 @@ en-GB:
       befriend_them: You can also add them as a friend at %{befriendurl}.
     gpx_failure:
       failed_to_import: 'failed to import. Here is the error:'
       befriend_them: You can also add them as a friend at %{befriendurl}.
     gpx_failure:
       failed_to_import: 'failed to import. Here is the error:'

-      import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures

       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:

-      loaded_successfully:
-        one: loaded successfully with %{trace_points} out of a possible 1 point.
-        other: loaded successfully with %{trace_points} out of a possible %{possible_points}
-          points.

       subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'


@@ -1276,8 +1251,6 @@ en-GB:
       success: Confirmed your account, thanks for signing up!
       already active: This account has already been confirmed.
       unknown token: That confirmation code has expired or does not exist.
       success: Confirmed your account, thanks for signing up!
       already active: This account has already been confirmed.
       unknown token: That confirmation code has expired or does not exist.

-      reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
-        here</a>.

     confirm_resend:
       failure: User %{name} not found.
     confirm_email:
     confirm_resend:
       failure: User %{name} not found.
     confirm_email:


@@ -1313,8 +1286,6 @@ en-GB:
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}

-      subject: Subject
-      body: Body

       back_to_inbox: Back to inbox
     create:
       message_sent: Message sent
       back_to_inbox: Back to inbox
     create:
       message_sent: Message sent


@@ -1341,14 +1312,10 @@ en-GB:
         to reply.
     show:
       title: Read message
         to reply.
     show:
       title: Read message

-      from: From
-      subject: Subject
-      date: Date

       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back

-      to: To

       wrong_user: You are logged in as `%{user}' but the message you have asked to
         read was not sent by or to that user. Please login as the correct user in
         order to read it.
       wrong_user: You are logged in as `%{user}' but the message you have asked to
         read was not sent by or to that user. Please login as the correct user in
         order to read it.


@@ -1376,6 +1343,21 @@ en-GB:
       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?

+  profiles:
+    edit:
+      image: Image
+      gravatar:
+        gravatar: Use 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?

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


@@ -1387,20 +1369,8 @@ en-GB:
       lost password link: Lost your password?
       login_button: Login
       register now: Register now
       lost password link: Lost your password?
       login_button: Login
       register now: Register now

-      with username: 'Already have an OpenStreetMap account? Please login with your
-        username and password:'

       with external: 'Alternatively, use a third party to login:'
       with external: 'Alternatively, use a third party to login:'

-      new to osm: New to OpenStreetMap?
-      to make changes: To make changes to the OpenStreetMap data, you must have an
-        account.
-      create account minute: Create an account. It only takes a minute.

       no account: Don't have an account?
       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 the <a href="%{webmaster}">webmaster</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:
       auth failure: Sorry, could not log in with those details.
       openid_logo_alt: Log in with an OpenID
       auth_providers:


@@ -1413,7 +1383,7 @@ en-GB:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account

-        windowslive:
+        microsoft:

           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:


@@ -1435,9 +1405,6 @@ en-GB:
   site:
     about:
       next: Next
   site:
     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'

       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.


@@ -1447,24 +1414,8 @@ en-GB:
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven

-      community_driven_html: |-
-        OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
-        To learn more about the community, see the <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>user diaries</a>, <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.

       open_data_title: Open Data
       open_data_title: Open Data

-      open_data_html: |-
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
-        as long as you credit OpenStreetMap and its contributors. If you alter or
-        build upon the data in certain ways, you may distribute the result only
-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        Licence page</a> for details.

       legal_title: Legal
       legal_title: Legal

-      legal_1_html: "This site and many other related services are formally operated
-        by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
-        (OSMF) \non behalf of the community. Use of all OSMF operated services is
-        subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
-        of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
-        Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>."

       partners_title: Partners
     copyright:
       foreign:
       partners_title: Partners
     copyright:
       foreign:


@@ -1481,93 +1432,16 @@ en-GB:
         mapping_link: start mapping
       legal_babble:
         title_html: Copyright and Licence
         mapping_link: start mapping
       legal_babble:
         title_html: Copyright and Licence

-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
-          as long as you credit OpenStreetMap and its contributors. If you alter or
-          build upon our data, you may distribute the result only under the same licence.
-          The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."

         credit_title_html: How to credit OpenStreetMap
         credit_title_html: How to credit OpenStreetMap

-        credit_1_html: |-
-          We require that you use the credit &ldquo;&copy; OpenStreetMap
-          contributors&rdquo;.
-        credit_2_1_html: |-
-          You must also make it clear that the data is available under the Open
-          Database Licence, and if using our map tiles, that the cartography is
-          licensed as CC BY-SA. You may do this by linking 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 licence(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), to opendatacommons.org, and
-          if relevant, to creativecommons.org.
-        credit_4_html: |-
-          For a browsable electronic map, the credit should appear in the corner of the map.
-          For example:

         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more

-        more_1_html: |-
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |-
-          Although OpenStreetMap is open data, we cannot provide a
-          free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.

         contributors_title_html: Our contributors
         contributors_intro_html: |-
           Our contributors are thousands of individuals. We also include
           openly-licenced data from national mapping agencies
           and other sources, among them:
         contributors_title_html: Our contributors
         contributors_intro_html: |-
           Our contributors are thousands of individuals. We also include
           openly-licenced data from national mapping agencies
           and other sources, among them:

-        contributors_at_html: |-
-          <strong>Austria</strong>: Contains data from
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Contains data from the
-          National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI Licence</a>.
-        contributors_fr_html: '<strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.'
-        contributors_nl_html: '<strong>Netherlands</strong>: Contains &copy; AND data,
-          2007 (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (public information of Slovenia).
-        contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
-          from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
-          Information</a>, State copyright reserved.'
-        contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
-          Survey data &copy; Crown copyright and database right 2010-19.'
-        contributors_footer_1_html: For further details of these, and other sources
-          that have been used to help improve OpenStreetMap, please see the <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.

         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
           or accepts any liability.
         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
           or accepts any liability.


@@ -1575,20 +1449,9 @@ en-GB:
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.

-        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
-          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
-        trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
-          the Map are registered trademarks of the OpenStreetMap Foundation. If you
-          have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-          Policy</a>.

     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.

-      js_2: OpenStreetMap uses JavaScript for its slippery map.

       permalink: Permalink
       shortlink: Shortlink
       createnote: Add a note
       permalink: Permalink
       shortlink: Shortlink
       createnote: Add a note


@@ -1601,7 +1464,6 @@ en-GB:
       not_public_description_html: You can no longer edit the map unless you do so.
         You can set your edits as public from your %{user_page}.
       user_page_link: user page
       not_public_description_html: You can no longer edit the map unless you do so.
         You can set your edits as public from your %{user_page}.
       user_page_link: user page

-      anon_edits_html: (%{link})

       anon_edits_link_text: Find out why this is the case.
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
       anon_edits_link_text: Find out why this is the case.
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary


@@ -1615,8 +1477,6 @@ en-GB:
       map_image: Map Image (shows standard layer)
       embeddable_html: Embeddable HTML
       licence: Licence
       map_image: Map Image (shows standard layer)
       embeddable_html: Embeddable HTML
       licence: Licence

-      export_details_html: OpenStreetMap data is licenced under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
-        Data Commons Open Database Licence</a> (ODbL).

       too_large:
         advice: 'If the above export fails, please consider using one of the sources
           listed below:'
       too_large:
         advice: 'If the above export fails, please consider using one of the sources
           listed below:'


@@ -1634,9 +1494,6 @@ en-GB:
           title: Geofabrik Downloads
           description: Regularly-updated extracts of continents, countries, and selected
             cities
           title: Geofabrik Downloads
           description: Regularly-updated extracts of continents, countries, and selected
             cities

-        metro:
-          title: Metro Extracts
-          description: Extracts for major world cities and their surrounding areas

         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki
         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki


@@ -1661,17 +1518,8 @@ en-GB:
           explanation_html: If you have noticed a problem with our map data, for example
             a road is missing or your address, the best way to proceed is to join
             the OpenStreetMap community and add or repair the data yourself.
           explanation_html: If you have noticed a problem with our map data, for example
             a road is missing or your address, the best way to proceed is to join
             the OpenStreetMap community and add or repair the data yourself.

-        add_a_note:
-          instructions_html: Just click <a class='icon note'></a> or the same icon
-            on the map display. 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.

       other_concerns:
         title: Other concerns
       other_concerns:
         title: Other concerns

-        explanation_html: "If you have concerns about how our data is being used or
-          about the contents please consult our\n<a href='/copyright'>copyright page</a>
-          for more legal information, or contact the appropriate \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
-          working group</a>."

     help:
       title: Getting Help
       introduction: OpenStreetMap has several resources for learning about the project,
     help:
       title: Getting Help
       introduction: OpenStreetMap has several resources for learning about the project,


@@ -1682,11 +1530,9 @@ en-GB:
         title: Welcome to OpenStreetMap
         description: Start with this quick guide covering the OpenStreetMap basics.
       beginners_guide:
         title: Welcome to OpenStreetMap
         description: Start with this quick guide covering the OpenStreetMap basics.
       beginners_guide:

-        url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide

         title: Beginners' Guide
         description: Community maintained guide for beginners.
       help:
         title: Beginners' Guide
         description: Community maintained guide for beginners.
       help:

-        url: https://help.openstreetmap.org/

         title: Help Forum
         description: Ask a question or look up answers on OpenStreetMap's question-and-answer
           site.
         title: Help Forum
         description: Ask a question or look up answers on OpenStreetMap's question-and-answer
           site.


@@ -1694,10 +1540,6 @@ en-GB:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
           of topical or regional mailing lists.
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
           of topical or regional mailing lists.

-      forums:
-        title: Forums
-        description: Questions and discussions for those that prefer a bulletin board
-          style interface.

       irc:
         title: IRC
         description: Interactive chat in many different languages and on many topics.
       irc:
         title: IRC
         description: Interactive chat in many different languages and on many topics.


@@ -1706,9 +1548,10 @@ en-GB:
         description: Help for companies and organisations switching to OpenStreetMap
           based maps and other services.
       wiki:
         description: Help for companies and organisations switching to OpenStreetMap
           based maps and other services.
       wiki:

-        url: https://wiki.openstreetmap.org/

         title: OpenStreetMap Wiki
         description: Browse the wiki for in-depth OpenStreetMap documentation.
         title: OpenStreetMap Wiki
         description: Browse the wiki for in-depth OpenStreetMap documentation.

+    any_questions:
+      title: Any questions?

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


@@ -1794,52 +1637,22 @@ en-GB:
           toilets: Toilets
     welcome:
       title: Welcome!
           toilets: Toilets
     welcome:
       title: Welcome!

-      introduction_html: Welcome to OpenStreetMap, the free and editable map of the
-        world. Now that you're signed up, you're all set to get started mapping. Here's
-        a quick guide with the most important things you need to know.
+      introduction: Welcome to OpenStreetMap, the free and editable map of the world.
+        Now that you're signed up, you're all set to get started mapping. Here's a
+        quick guide with the most important things you need to know.

       whats_on_the_map:
         title: What's on the Map
       whats_on_the_map:
         title: What's on the Map

-        on_html: OpenStreetMap is a place for mapping things that are both <em>real
-          and current</em> - it includes millions of buildings, roads, and other details
-          about places. You can map whatever real-world features are interesting to
-          you.
-        off_html: What it <em>doesn't</em> include is opinionated data like ratings,
-          historical or hypothetical features, and data from copyrighted sources.
-          Unless you have special permission, don't copy from online or paper maps.

       basic_terms:
         title: Basic Terms For Mapping
       basic_terms:
         title: Basic Terms For Mapping

-        paragraph_1_html: OpenStreetMap has some of its own lingo. Here are a few
-          key words that'll come in handy.
-        editor_html: An <strong>editor</strong> is a program or website you can use
-          to edit the map.
-        node_html: A <strong>node</strong> is a point on the map, like a single restaurant
-          or a tree.
-        way_html: A <strong>way</strong> is a line or area, like a road, stream, lake
-          or building.
-        tag_html: A <strong>tag</strong> is a bit of data about a node or way, like
-          a  restaurant's name or a road's speed limit.
+        paragraph_1: OpenStreetMap has some of its own lingo. Here are a few key words
+          that'll come in handy.

       rules:
         title: Rules!
       rules:
         title: Rules!

-        paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants
-          to collaborate\nwith, and communicate with, the community. If you are considering\nany
-          activities other than editing by hand, please read and follow the guidelines
-          on \n<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a>
-          and \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated
-          Edits</a>."
-      questions:
-        title: Any questions?
-        paragraph_1_html: |-
-          OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.
-          <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>.

       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!
       start_mapping: Start Mapping
       add_a_note:
         title: No Time To Edit? Add a Note!

-        paragraph_1_html: If you just want something small fixed and don't have the
-          time to sign up and learn how to edit, it's easy to add a note.
-        paragraph_2_html: '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.'
+        para_1: If you just want something small fixed and don't have the time to
+          sign up and learn how to edit, it's easy to add a note.

   traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)
   traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)


@@ -1849,7 +1662,6 @@ en-GB:
         points with timestamps)
     new:
       visibility_help: what does this mean?
         points with timestamps)
     new:
       visibility_help: what does this mean?

-      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces

       help: Help
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
       help: Help
       help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:


@@ -1868,7 +1680,6 @@ en-GB:
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?

-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces

     trace_optionals:
       tags: Tags
     show:
     trace_optionals:
       tags: Tags
     show:


@@ -1891,7 +1702,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:

-      showing_page: Page %{page}

       older: Older Traces
       newer: Newer Traces
     trace:
       older: Older Traces
       newer: Newer Traces
     trace:


@@ -1914,9 +1724,6 @@ en-GB:
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track 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>.

       upload_trace: Upload a trace
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
       upload_trace: Upload a trace
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion


@@ -1939,8 +1746,6 @@ en-GB:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
     setup_user_auth:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
     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: 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
       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


@@ -2014,22 +1819,16 @@ en-GB:
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration

+  oauth2_applications:
+    new:
+      title: Register a new application

   users:
     new:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
         account for you automatically.
   users:
     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 the <a href="%{support}">webmaster</a>
-        to arrange for an account to be created - we will try and deal with the request
-        as quickly as possible.

       about:
         header: Free and editable
       about:
         header: Free and editable

-        html: |-
-          <p>Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.</p>
-          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      email address: 'Email Address:'
-      confirm email address: 'Confirm Email Address:'
-      display name: 'Display Name:'

       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'


@@ -2045,9 +1844,6 @@ en-GB:
         the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
         the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/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>'
-      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.


@@ -2059,7 +1855,6 @@ en-GB:
     terms_declined_flash:
       terms_declined_html: We are sorry that you have decided to not accept the new
         Contributor Terms. For more information, please see %{terms_declined_link}.
     terms_declined_flash:
       terms_declined_html: We are sorry that you have decided to not accept the new
         Contributor Terms. For more information, please see %{terms_declined_link}.

-      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: No such user
       heading: The user %{user} does not exist
     no_such_user:
       title: No such user
       heading: The user %{user} does not exist


@@ -2068,7 +1863,6 @@ en-GB:
       deleted: deleted
     show:
       my diary: My Diary
       deleted: deleted
     show:
       my diary: My Diary

-      new diary entry: new diary entry

       my edits: My Edits
       my traces: My Traces
       my notes: My Notes
       my edits: My Edits
       my traces: My Traces
       my notes: My Notes


@@ -2094,16 +1888,6 @@ en-GB:
       created from: 'Created from:'
       status: 'Status:'
       spam score: 'Spam Score:'
       created from: 'Created from:'
       status: 'Status:'
       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
-      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


@@ -2118,76 +1902,11 @@ en-GB:
       comments: Comments
       create_block: Block this User
       activate_user: Activate this User
       comments: Comments
       create_block: Block this User
       activate_user: Activate this User

-      deactivate_user: Deactivate this User

       confirm_user: Confirm this user
       hide_user: Hide this User
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
       confirm_user: Confirm this user
       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
-    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 e-mail 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: http://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
-        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
-      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:
       flash success: All your edits are now public, and you are now allowed to edit.
     index:
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
     index:


@@ -2204,13 +1923,6 @@ en-GB:
     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended

-      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 the %{webmaster} if you wish to discuss this.
-        </p>

     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials


@@ -2258,9 +1970,6 @@ en-GB:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
       period: How long, starting now, the user will be blocked from the API for.
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
       period: How long, starting now, the user will be blocked from the API for.

-      tried_contacting: I have contacted the user and asked them to stop.
-      tried_waiting: I have given a reasonable amount of time for the user to respond
-        to those communications.

       back: View all blocks
     edit:
       title: Editing block on %{name}
       back: View all blocks
     edit:
       title: Editing block on %{name}


@@ -2273,10 +1982,6 @@ en-GB:
       block_period: The blocking period must be one of the values selectable in the
         drop-down list.
     create:
       block_period: The blocking period must be one of the values selectable in the
         drop-down list.
     create:

-      try_contacting: Please try contacting the user before blocking them and giving
-        them a reasonable time to respond.
-      try_waiting: Please try giving the user a reasonable time to respond before
-        blocking them.

       flash: Created a block on user %{name}.
     update:
       only_creator_can_edit: Only the moderator who created this block can edit it.
       flash: Created a block on user %{name}.
     update:
       only_creator_can_edit: Only the moderator who created this block can edit it.


@@ -2348,6 +2053,27 @@ en-GB:
       description: Description
       created_at: Created at
       last_changed: Last changed
       description: Description
       created_at: Created at
       last_changed: Last changed

+    show:
+      title: 'Note: %{id}'
+      description: Description
+      open_title: 'Unresolved note #%{note_name}'
+      closed_title: 'Resolved note #%{note_name}'
+      hidden_title: 'Hidden note #%{note_name}'
+      anonymous_warning: This note includes comments from anonymous users which should
+        be independently verified.
+      hide: Hide
+      resolve: Resolve
+      reactivate: Reactivate
+      comment_and_resolve: Comment & Resolve
+      comment: Comment
+    new:
+      title: New Note
+      intro: Spotted a mistake or something missing? Let other mappers know so we
+        can fix it. Move the marker to the correct position and type a note to explain
+        the problem.
+      advice: Your note is public and may be used to update the map, so don't enter
+        personal information or information from copyrighted maps or directory listings.
+      add: Add Note

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share:


@@ -2393,8 +2119,6 @@ en-GB:
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers

-      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
-      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Make a Donation</a>

     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map


@@ -2411,22 +2135,6 @@ en-GB:
         unsubscribe: Unsubscribe
         hide_comment: hide
         unhide_comment: unhide
         unsubscribe: Unsubscribe
         hide_comment: hide
         unhide_comment: unhide

-    notes:
-      new:
-        intro: Spotted a mistake or something missing? Let other mappers know so we
-          can fix it. Move the marker to the correct position and type a note to explain
-          the problem.
-        advice: Your note is public and may be used to update the map, so don't enter
-          personal information or information from copyrighted maps or directory listings.
-        add: Add Note
-      show:
-        anonymous_warning: This note includes comments from anonymous users which
-          should be independently verified.
-        hide: Hide
-        resolve: Resolve
-        reactivate: Reactivate
-        comment_and_resolve: Comment & Resolve
-        comment: Comment

     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions: