X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ada57d5e4b4ef063ffc533ce80539e6a74f5be3..a42b6546060227fce391c54557d7383f0291f410:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 3769543d9..b478474b2 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,7 +3,6 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
-# Author: Amire80
 # Author: Andibing
 # Author: BEANS
 # Author: Back ache
@@ -30,6 +29,7 @@
 # Author: Michel Bakni
 # Author: Mvolz
 # Author: Sampablokuper
+# Author: Samthecrazyman
 # Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
@@ -105,7 +105,6 @@ en-GB:
       client_application:
         name: Name (Required)
         url: Main Application URL (Required)
-        callback_url: 'Callback URL:'
         support_url: Support URL
         allow_read_prefs: read their user preferences
         allow_write_prefs: modify their user preferences
@@ -144,11 +143,8 @@ en-GB:
       redaction:
         description: Description
       report:
-        category: 'Select a reason for your report:'
         details: Please provide some more details about the problem (required).
       user:
-        email: E-mail
-        new_email: New Email Address
         active: Active
         display_name: Display Name
         description: Profile Description
@@ -245,7 +241,6 @@ en-GB:
     edit:
       title: Edit account
       my settings: My settings
-      current email address: Current Email Address
       external auth: External Authentication
       openid:
         link text: what is this?
@@ -269,8 +264,6 @@ en-GB:
       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:
     version: Version
@@ -425,12 +418,7 @@ en-GB:
       title: New Diary Entry
     form:
       location: Location
-      use_map_link: Use map
     index:
-      title: Users' diaries
-      title_friends: Friends' diaries
-      title_nearby: Nearby Users' diaries
-      user_title: '%{user}''s diary'
       in_language_title: Diary Entries in %{language}
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
@@ -439,11 +427,8 @@ en-GB:
     page:
       recent_entries: Recent diary entries
     edit:
-      title: Edit diary entry
       marker_text: Diary entry location
     show:
-      title: '%{user}''s diary | %{title}'
-      user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
       login_to_leave_a_comment_html: '%{login_link} to leave a comment'
     no_such_entry:
@@ -532,7 +517,7 @@ en-GB:
         amenity:
           animal_shelter: Animal Shelter
           arts_centre: Arts Centre
-          atm: ATM
+          atm: Cash Machine
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -542,11 +527,10 @@ en-GB:
           bicycle_repair_station: Bicycle Repair Station
           biergarten: Beer Garden
           blood_bank: Blood Bank
-          boat_rental: Boat Rental
+          boat_rental: Boat Hire
           brothel: Brothel
           bureau_de_change: Bureau de Change
           bus_station: Bus Station
-          cafe: Café
           car_rental: Car Hire
           car_sharing: Car Sharing
           car_wash: Car Wash
@@ -637,19 +621,16 @@ en-GB:
           viaduct: Viaduct
           "yes": Bridge
         building:
-          apartment: Apartment
-          apartments: Apartments
+          apartment: Flat
+          apartments: Flats
           bungalow: Bungalow
           cabin: Cabin
           chapel: Chapel
-          church: Church
           college: College Building
           commercial: Commercial Building
           construction: Building under Construction
           garage: Garage
           garages: Garages
-          hospital: Hospital
-          hotel: Hotel
           house: House
           industrial: Industrial Building
           roof: Roof
@@ -680,7 +661,7 @@ en-GB:
           construction: Highway under construction
           corridor: Corridor
           cycleway: Cycle Path
-          elevator: Elevator
+          elevator: Lift
           emergency_access_point: Emergency Access Point
           footway: Footpath
           ford: Ford
@@ -708,7 +689,7 @@ en-GB:
           speed_camera: Speed Camera
           steps: Steps
           stop: Stop Sign
-          street_lamp: Street Lamp
+          street_lamp: Lamp Post
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
@@ -807,7 +788,6 @@ en-GB:
         man_made:
           adit: Adit
           advertising: Advertising
-          antenna: Antenna/Antennae
           avalanche_protection: Avalanche Protection
           beacon: Beacon
           beam: Beam
@@ -964,7 +944,7 @@ en-GB:
           tram_stop: Tram Stop
           yard: Railway Yard
         shop:
-          alcohol: Off Licence
+          alcohol: Off-licence
           antiques: Antiques
           art: Art Shop
           bakery: Bakery
@@ -977,7 +957,7 @@ en-GB:
           butcher: Butcher
           car: Car Shop
           car_parts: Car Parts
-          car_repair: Car Repair
+          car_repair: Mechanic
           carpet: Carpet Shop
           charity: Charity Shop
           chemist: Chemist
@@ -1009,7 +989,7 @@ en-GB:
           hardware: Hardware Store
           houseware: Houseware Shop
           interior_decoration: Interior Decoration
-          jewelry: Jewellers
+          jewelry: Jewellery Shop
           kiosk: Kiosk Shop
           kitchen: Kitchen Shop
           laundry: Laundry
@@ -1031,7 +1011,6 @@ en-GB:
           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
-          stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor
           ticket: Ticket Shop
@@ -1039,7 +1018,7 @@ en-GB:
           toys: Toy Shop
           travel_agency: Travel Agency
           video: Video Shop
-          wine: Off Licence
+          wine: Off-licence
           "yes": Shop
         tourism:
           alpine_hut: Alpine Hut
@@ -1108,7 +1087,7 @@ en-GB:
     edit: Edit
     history: History
     export: Export
-    gps_traces: GPS Traces
+    gps_traces: GPS Tracks
     user_diaries: User Diaries
     edit_with: Edit with %{editor}
     intro_header: Welcome to OpenStreetMap!
@@ -1159,14 +1138,10 @@ en-GB:
     email_confirm:
       subject: '[OpenStreetMap] Confirm your e-mail address'
       greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address
-        over at %{server_url} to %{new_address}.
       click_the_link: If this is you, please click the link below to confirm the change.
     lost_password:
       subject: '[OpenStreetMap] Password reset request'
       greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset
-        on this email address's openstreetmap.org account.
       click_the_link: If this is you, please click the link below to reset your password.
     note_comment_notification:
       anonymous: An anonymous user
@@ -1206,10 +1181,6 @@ en-GB:
         partial_changeset_without_comment: without comment
   confirmations:
     confirm:
-      heading: Check your email!
-      introduction_1: We sent you a confirmation email.
-      introduction_2: Confirm your account by clicking on the link in the email and
-        you'll be able to start mapping.
       press confirm button: Press the confirm button below to activate your account.
       button: Confirm
       success: Confirmed your account, thanks for signing up!
@@ -1222,7 +1193,6 @@ en-GB:
       press confirm button: Press the confirm button below to confirm your new e-mail
         address.
       button: Confirm
-      success: Confirmed your change of email address!
       failure: An e-mail address has already been confirmed with this token.
       unknown_token: That confirmation code has expired or does not exist.
   messages:
@@ -1286,7 +1256,6 @@ en-GB:
     new:
       title: Lost password
       heading: Forgotten Password?
-      email address: E-mail Address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
@@ -1431,7 +1400,6 @@ en-GB:
           description: Additional sources listed on the OpenStreetMap wiki
       export_button: Export
     fixthemap:
-      title: Report a problem/Fix the map
       how_to_help:
         title: How to Help
         join_the_community:
@@ -1499,7 +1467,7 @@ en-GB:
           rail: Railway
           subway: Subway
           cable_car: Cable car
-          chair_lift: Chair lift
+          chair_lift: Chairlift
           runway: Airport Runway
           taxiway: Taxiway
           apron: Airport apron
@@ -1580,18 +1548,13 @@ en-GB:
           for these to finish before uploading any more, so as not to block the queue
           for other users.
     edit:
-      title: Editing trace %{name}
-      heading: Editing trace %{name}
       visibility_help: what does this mean?
     show:
-      title: Viewing trace %{name}
-      heading: Viewing trace %{name}
       pending: PENDING
       filename: 'Filename:'
       download: download
       uploaded: 'Uploaded:'
       points: 'Points:'
-      start_coordinates: 'Start coordinate:'
       map: map
       edit: edit
       owner: 'Owner:'
@@ -1616,8 +1579,6 @@ en-GB:
       private: PRIVATE
       trackable: TRACKABLE
     index:
-      public_traces: Public GPS traces
-      public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace
@@ -1666,7 +1627,6 @@ en-GB:
       consider_pd: In addition to the above, I consider my contributions to be in
         the Public Domain
       consider_pd_why: what's this?
-      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       legale_select: 'Country of residence:'
@@ -1723,7 +1683,6 @@ en-GB:
       comments: Comments
       create_block: Block this User
       activate_user: Activate this User
-      confirm_user: Confirm this user
       hide_user: Hide this User
       unhide_user: Unhide this User
       delete_user: Delete this User
@@ -1755,15 +1714,8 @@ en-GB:
         using the form below.
   user_role:
     filter:
-      not_a_role: The string `%{role}' is not a valid role.
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
-    grant:
-      are_you_sure: Are you sure you want to grant the role `%{role}' to the user
-        `%{name}'?
-    revoke:
-      are_you_sure: Are you sure you want to revoke the role `%{role}' from the user
-        `%{name}'?
   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.
@@ -1803,11 +1755,9 @@ en-GB:
           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
-      heading_html: List of blocks on %{name}
       empty: '%{name} has not been blocked yet.'
     blocks_by:
       title: Blocks by %{name}
-      heading_html: List of blocks by %{name}
       empty: '%{name} has not made any blocks yet.'
     show:
       title: '%{block_on} blocked by %{block_by}'
@@ -1830,7 +1780,6 @@ en-GB:
   notes:
     index:
       title: Notes submitted or commented on by %{user}
-      heading: '%{user}''s notes'
       subheading_html: Notes %{submitted} or %{commented} by %{user}
       id: Id
       creator: Creator
@@ -1965,7 +1914,6 @@ en-GB:
         slight_left_without_exit: Slight left onto %{name}
         via_point_without_exit: (via point)
         follow_without_exit: Follow %{name}
-        roundabout_without_exit: At roundabout take exit onto %{name}
         leave_roundabout_without_exit: Leave roundabout - %{name}
         stay_roundabout_without_exit: Stay on roundabout - %{name}
         start_without_exit: Start on %{name}
@@ -2002,20 +1950,10 @@ en-GB:
       query_features: Query features
       centre_map: Centre map here
   redactions:
-    edit:
-      heading: Edit redaction
-      title: Edit redaction
     index:
       empty: No redactions to show.
-      heading: List of redactions
-      title: List of redactions
-    new:
-      heading: Enter information for new redaction
-      title: Creating new redaction
     show:
       description: 'Description:'
-      heading: Showing redaction "%{title}"
-      title: Showing redaction
       user: 'Creator:'
       edit: Edit this redaction
       destroy: Remove this redaction