]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Preload traces for the selected points
[rails.git] / config / locales / en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 36623479e042c26f39c59168b8a99189ca2d819d..8016960c4fefaa4dd7e01caa3b1806159a03aa97 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -4,6 +4,7 @@
 # Author: Abijeet Patro
 # Author: Andibing
 # Author: BEANS
 # Author: Abijeet Patro
 # Author: Andibing
 # Author: BEANS
+# Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
@@ -20,11 +21,13 @@
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
 # Author: Kosovastar
 # Author: Macofe
 # Author: Meno25
+# Author: Michel Bakni
 # Author: Mvolz
 # Author: Sampablokuper
 # Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
 # Author: Mvolz
 # Author: Sampablokuper
 # Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
+# Author: Tlubenov
 # Author: TomH
 # Author: ديفيد
 ---
 # Author: TomH
 # Author: ديفيد
 ---
@@ -36,6 +39,8 @@ en-GB:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
   helpers:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: Choose file
     submit:
       diary_comment:
         create: Save
     submit:
       diary_comment:
         create: Save
@@ -48,7 +53,7 @@ en-GB:
         create: Send
       client_application:
         create: Register
         create: Send
       client_application:
         create: Register
-        update: Edit
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
       redaction:
         create: Create redaction
         update: Save redaction
@@ -71,6 +76,7 @@ en-GB:
       diary_comment: Diary Comment
       diary_entry: Diary Entry
       friend: Friend
       diary_comment: Diary Comment
       diary_entry: Diary Entry
       friend: Friend
+      issue: Issue
       language: Language
       message: Message
       node: Node
       language: Language
       message: Message
       node: Node
@@ -87,6 +93,7 @@ en-GB:
       relation: Relation
       relation_member: Relation Member
       relation_tag: Relation Tag
       relation: Relation
       relation_member: Relation Member
       relation_tag: Relation Tag
+      report: Report
       session: Session
       trace: Trace
       tracepoint: Trace Point
       session: Session
       trace: Trace
       tracepoint: Trace Point
@@ -98,6 +105,12 @@ en-GB:
       way_node: Way Node
       way_tag: Way Tag
     attributes:
       way_node: Way Node
       way_tag: Way Tag
     attributes:
+      client_application:
+        callback_url: Callback URL
+        support_url: Support URL
+        allow_write_api: modify the map
+        allow_read_gpx: read their private GPS traces
+        allow_write_gpx: upload GPS traces
       diary_comment:
         body: Body
       diary_entry:
       diary_comment:
         body: Body
       diary_entry:
@@ -112,12 +125,15 @@ en-GB:
       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
+        gpx_file: Upload GPX File
+        visibility: Visibility
+        tagstring: Tags
       message:
         sender: Sender
         title: Subject
       message:
         sender: Sender
         title: Subject
@@ -130,6 +146,9 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
         description: Description
         languages: Languages
         pass_crypt: Password
+    help:
+      trace:
+        tagstring: comma delimited
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -186,6 +205,14 @@ en-GB:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  auth:
+    providers:
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
   api:
     notes:
       comment:
@@ -227,6 +254,8 @@ 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
@@ -237,8 +266,8 @@ 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: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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:
@@ -318,16 +347,17 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      opened_by: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      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
       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.
@@ -414,7 +444,7 @@ en-GB:
     diary_entry:
       posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
       comment_link: Comment on this entry
     diary_entry:
       posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: '%{count} comment'
       comment_count:
         zero: No comments
         one: '%{count} comment'
@@ -451,6 +481,18 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
+  friendships:
+    make_friend:
+      heading: Add %{user} as a friend?
+      button: Add as friend
+      success: '%{name} is now your friend!'
+      failed: Sorry, failed to add %{name} as a friend.
+      already_a_friend: You are already friends with %{name}.
+    remove_friend:
+      heading: Unfriend %{user}?
+      button: Unfriend
+      success: '%{name} was removed from your friends.'
+      not_a_friend: '%{name} is not one of your friends.'
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:
@@ -532,14 +574,16 @@ en-GB:
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
+          internet_cafe: Internet Cafe
           kindergarten: Nursery School
           kindergarten: Nursery School
+          language_school: Language school
           library: Library
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           library: Library
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
+          music_school: Music School
           nightclub: Night Club
           nursing_home: Nursing Home
           nightclub: Night Club
           nursing_home: Nursing Home
-          office: Office
           parking: Parking
           parking_entrance: Parking Entrance
           parking_space: Parking Space
           parking: Parking
           parking_entrance: Parking Entrance
           parking_space: Parking Space
@@ -548,20 +592,15 @@ en-GB:
           police: Police
           post_box: Post Box
           post_office: Post Office
           police: Police
           post_box: Post Box
           post_office: Post Office
-          preschool: Pre-School
           prison: Prison
           pub: Pub
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
           prison: Prison
           pub: Pub
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
           school: School
           shelter: Shelter
           school: School
           shelter: Shelter
-          shop: Shop
           shower: Shower
           social_centre: Social Centre
           shower: Shower
           social_centre: Social Centre
-          social_club: Social Club
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimming Pool
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimming Pool
@@ -577,12 +616,12 @@ en-GB:
           waste_basket: Waste Bin
           waste_disposal: Waste Disposal
           water_point: Water Point
           waste_basket: Waste Bin
           waste_disposal: Waste Disposal
           water_point: Water Point
-          youth_centre: Youth Centre
         boundary:
           administrative: Administrative Boundary
           census: Census Boundary
           national_park: National Park
           protected_area: Protected Area
         boundary:
           administrative: Administrative Boundary
           census: Census Boundary
           national_park: National Park
           protected_area: Protected Area
+          "yes": Boundary
         bridge:
           aqueduct: Aqueduct
           boardwalk: Promenade
         bridge:
           aqueduct: Aqueduct
           boardwalk: Promenade
@@ -591,6 +630,17 @@ en-GB:
           viaduct: Viaduct
           "yes": Bridge
         building:
           viaduct: Viaduct
           "yes": Bridge
         building:
+          apartment: Apartment
+          apartments: Apartments
+          cabin: Cabin
+          college: College Building
+          commercial: Commercial Building
+          construction: Building under Construction
+          garage: Garage
+          garages: Garages
+          house: House
+          industrial: Industrial Building
+          roof: Roof
           "yes": Building
         craft:
           brewery: Brewery
           "yes": Building
         craft:
           brewery: Brewery
@@ -652,7 +702,6 @@ en-GB:
           tertiary_link: Tertiary Road
           track: Track
           traffic_signals: Traffic Signals
           tertiary_link: Tertiary Road
           track: Track
           traffic_signals: Traffic Signals
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
           turning_loop: Turning Loop
           trunk: Trunk Road
           trunk_link: Trunk Road
           turning_loop: Turning Loop
@@ -671,7 +720,6 @@ en-GB:
           fort: Fort
           heritage: Heritage Site
           house: House
           fort: Fort
           heritage: Heritage Site
           house: House
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
           manor: Manor
           memorial: Memorial
           mine: Mine
@@ -716,7 +764,6 @@ en-GB:
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
           retail: Retail
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
           retail: Retail
-          road: Road Area
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
@@ -873,7 +920,6 @@ en-GB:
           subdivision: Subdivision
           suburb: Suburb
           town: Town
           subdivision: Subdivision
           suburb: Suburb
           town: Town
-          unincorporated_area: Unincorporated Area
           village: Village
           "yes": Place
         railway:
           village: Village
           "yes": Place
         railway:
@@ -899,6 +945,7 @@ en-GB:
           switch: Railway Points
           tram: Tramway
           tram_stop: Tram Stop
           switch: Railway Points
           tram: Tramway
           tram_stop: Tram Stop
+          yard: Railway Yard
         shop:
           alcohol: Off Licence
           antiques: Antiques
         shop:
           alcohol: Off Licence
           antiques: Antiques
@@ -932,12 +979,10 @@ en-GB:
           estate_agent: Estate Agent
           farm: Farm Shop
           fashion: Fashion Shop
           estate_agent: Estate Agent
           farm: Farm Shop
           fashion: Fashion Shop
-          fish: Fishmonger
           florist: Florist
           food: Food Shop
           funeral_directors: Funeral Directors
           furniture: Furniture
           florist: Florist
           food: Food Shop
           funeral_directors: Funeral Directors
           furniture: Furniture
-          gallery: Gallery
           garden_centre: Garden Centre
           general: General Store
           gift: Gift Shop
           garden_centre: Garden Centre
           general: General Store
           gift: Gift Shop
@@ -954,7 +999,6 @@ en-GB:
           laundry: Laundry
           lottery: Lottery
           mall: Mall
           laundry: Laundry
           lottery: Lottery
           mall: Mall
-          market: Market
           massage: Massage
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           massage: Massage
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
@@ -966,7 +1010,6 @@ en-GB:
           paint: Paint Shop
           pawnbroker: Pawnbroker
           pet: Pet Shop
           paint: Paint Shop
           pawnbroker: Pawnbroker
           pet: Pet Shop
-          pharmacy: Pharmacy
           photo: Photo Shop
           seafood: Seafood
           second_hand: Second-hand Shop
           photo: Photo Shop
           seafood: Seafood
           second_hand: Second-hand Shop
@@ -1033,11 +1076,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
-    description:
-      title:
-        osm_nominatim: Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Cities
         towns: Towns
       types:
         cities: Cities
         towns: Towns
@@ -1045,6 +1083,9 @@ en-GB:
     results:
       no_results: No results found
       more_results: More results
     results:
       no_results: No results found
       more_results: More results
+  issues:
+    index:
+      reports: Reports
   layouts:
     project_name:
       title: OpenStreetMap
   layouts:
     project_name:
       title: OpenStreetMap
@@ -1094,22 +1135,22 @@ en-GB:
       text: Make a Donation
     learn_more: Learn More
     more: More
       text: Make a Donation
     learn_more: Learn More
     more: More
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
       header: '%{from_user} has commented on the OpenStreetMap diary entry with the
         subject %{subject}:'
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
       header: '%{from_user} has commented on the OpenStreetMap diary entry with the
         subject %{subject}:'
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
-        or reply at %{replyurl}
+        or send a message to the author at %{replyurl}
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hi %{to_user},
       header: '%{from_user} has sent you a message through OpenStreetMap with the
         subject %{subject}:'
     message_notification:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hi %{to_user},
       header: '%{from_user} has sent you a message through OpenStreetMap with the
         subject %{subject}:'
-      footer_html: You can also read the message at %{readurl} and you can reply at
-        %{replyurl}
-    friend_notification:
+      footer_html: You can also read the message at %{readurl} and you can send a
+        message to the author at %{replyurl}
+    friendship_notification:
       hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
       hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
@@ -1129,8 +1170,10 @@ en-GB:
         import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[OpenStreetMap] GPX Import success'
         import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[OpenStreetMap] GPX Import success'
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible
-          %{possible_points} points.
+        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.
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       greeting: Hi there!
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       greeting: Hi there!
@@ -1283,8 +1326,8 @@ en-GB:
     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} powers map data on thousands of web sites, mobile apps,
-        and hardware devices'
+      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.
@@ -1338,18 +1381,16 @@ en-GB:
           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.
           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_html: |-
-          The cartography in our map tiles, and our documentation, are
-          licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
+        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_1_html: |-
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |-
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
+        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
           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
-          licenced as CC BY-SA. You may do this by linking to
+          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
           <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
@@ -1357,7 +1398,7 @@ en-GB:
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address), to opendatacommons.org, and
           if relevant, to creativecommons.org.
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address), to opendatacommons.org, and
           if relevant, to creativecommons.org.
-        credit_3_html: |-
+        credit_4_html: |-
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
@@ -1725,11 +1766,6 @@ en-GB:
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
     new:
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
     new:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Help
       visibility_help: what does this mean?
       visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
       help: Help
@@ -1749,18 +1785,6 @@ en-GB:
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
-      filename: 'Filename:'
-      download: download
-      uploaded_at: 'Uploaded:'
-      points: 'Points:'
-      start_coord: 'Start coordinate:'
-      map: map
-      edit: edit
-      owner: 'Owner:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
@@ -1887,13 +1911,6 @@ en-GB:
       delete: Delete Client
       confirm: Are you sure?
       requests: 'Requesting the following permissions from the user:'
       delete: Delete Client
       confirm: Are you sure?
       requests: 'Requesting the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     index:
       title: My OAuth Details
       my_tokens: My Authorised Applications
     index:
       title: My OAuth Details
       my_tokens: My Authorised Applications
@@ -1909,19 +1926,7 @@ en-GB:
       registered_apps: 'You have the following client applications registered:'
       register_new: Register your application
     form:
       registered_apps: 'You have the following client applications registered:'
       register_new: Register your application
     form:
-      name: Name
-      required: Required
-      url: Main Application URL
-      callback_url: Callback URL
-      support_url: Support URL
       requests: 'Request the following permissions from the user:'
       requests: 'Request the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     not_found:
       sorry: Sorry, that %{type} could not be found.
     create:
     not_found:
       sorry: Sorry, that %{type} could not be found.
     create:
@@ -2002,8 +2007,6 @@ en-GB:
     reset_password:
       title: Reset password
       heading: Reset Password for %{user}
     reset_password:
       title: Reset password
       heading: Reset Password for %{user}
-      password: 'Password:'
-      confirm password: 'Confirm Password:'
       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?
@@ -2019,9 +2022,6 @@ en-GB:
         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>
         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>
-      license_agreement: When you confirm your account you will need to agree to the
-        <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor
-        terms</a>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
       not_displayed_publicly_html: Your address is not displayed publicly, see our
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
       not_displayed_publicly_html: Your address is not displayed publicly, see our
@@ -2207,10 +2207,11 @@ en-GB:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
-      success: We've sent a new confirmation note to %{email} and as soon as you confirm
-        your account you'll be able to get mapping.<br /><br />If you use an antispam
-        system which sends confirmation requests then please make sure you whitelist
-        %{sender} as we are unable to reply to any confirmation requests.
+      success_html: We've sent a new confirmation note to %{email} and as soon as
+        you confirm your account you'll be able to get mapping.<br /><br />If you
+        use an antispam system which sends confirmation requests then please make
+        sure you whitelist %{sender} as we are unable to reply to any confirmation
+        requests.
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
@@ -2224,17 +2225,6 @@ en-GB:
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
-    make_friend:
-      heading: Add %{user} as a friend?
-      button: Add as friend
-      success: '%{name} is now your friend!'
-      failed: Sorry, failed to add %{name} as a friend.
-      already_a_friend: You are already friends with %{name}.
-    remove_friend:
-      heading: Unfriend %{user}?
-      button: Unfriend
-      success: '%{name} was removed from your friends.'
-      not_a_friend: '%{name} is not one of your friends.'
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users
@@ -2350,10 +2340,11 @@ en-GB:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
-      time_future: Ends in %{time}.
+      time_future_html: Ends in %{time}.
       until_login: Active until the user logs in.
       until_login: Active until the user logs in.
-      time_future_and_until_login: Ends in %{time} and after the user has logged in.
-      time_past: Ended %{time}.
+      time_future_and_until_login_html: Ends in %{time} and after the user has logged
+        in.
+      time_past_html: Ended %{time}.
       block_duration:
         hours:
           one: 1 hour
       block_duration:
         hours:
           one: 1 hour
@@ -2394,7 +2385,7 @@ en-GB:
       next: Next »
       previous: « Previous
   notes:
       next: Next »
       previous: « Previous
   notes:
-    mine:
+    index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
       subheading_html: Notes submitted or commented on by %{user}
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
       subheading_html: Notes submitted or commented on by %{user}
@@ -2437,7 +2428,6 @@ en-GB:
         out: Zoom Out
       locate:
         title: Show My Location
         out: Zoom Out
       locate:
         title: Show My Location
-        popup: You are within {distance} {unit} of this point
       base:
         standard: Standard
         cycle_map: Cycle Map
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -2546,6 +2536,17 @@ en-GB:
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
+        exit_counts:
+          first: 1st
+          second: 2nd
+          third: 3rd
+          fourth: 4th
+          fifth: 5th
+          sixth: 6th
+          seventh: 7th
+          eighth: 8th
+          ninth: 9th
+          tenth: 10th
       time: Time
     query:
       node: Node
       time: Time
     query:
       node: Node
@@ -2591,4 +2592,6 @@ en-GB:
         this redaction before destroying it.
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
         this redaction before destroying it.
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
+  validations:
+    invalid_characters: contains invalid characters
 ...
 ...
The OpenStreetMap web site