]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Merge remote-tracking branch 'upstream/pull/5408'
[rails.git] / config / locales / en-GB.yml
index 47b53b774583a3edc2a974e8f5b7dafa81494ab2..5dbdabe23fdc420b3694dc4b9c1a50714fbaad8c 100644 (file)
@@ -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
@@ -66,10 +66,6 @@ en-GB:
         create: Create block
         update: Update block
   activerecord:
-    errors:
-      messages:
-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable
     models:
       acl: Access Control List
       changeset: Changeset
@@ -109,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
@@ -138,7 +133,6 @@ en-GB:
         longitude: Longitude
         public: Public
         description: Description
-        gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags
       message:
@@ -149,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
@@ -250,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?
@@ -274,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
@@ -308,7 +296,6 @@ en-GB:
         way: Way
         relation: Relation
     containing_relation:
-      entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found
@@ -321,7 +308,6 @@ en-GB:
         note: note
     timeout:
       title: Timeout Error
-      sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
       type:
         node: node
         way: way
@@ -359,8 +345,6 @@ en-GB:
       comment:
         comment: 'New comment on changeset #%{changeset_id} by %{author}'
         commented_at_by_html: Updated %{when} by %{user}
-      comments:
-        comment: 'New comment on changeset #%{changeset_id} by %{author}'
       show:
         title_all: OpenStreetMap changeset discussion
         title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
@@ -368,12 +352,7 @@ en-GB:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:
-    changeset_paging_nav:
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous
     changeset:
-      anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
     index:
@@ -438,12 +417,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
@@ -451,14 +425,9 @@ en-GB:
       no_entries: No diary entries
     page:
       recent_entries: Recent diary entries
-      older_entries: Older Entries
-      newer_entries: Newer 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:
@@ -487,8 +456,6 @@ en-GB:
       report: Report this comment
     location:
       location: 'Location:'
-      view: View
-      edit: Edit
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
@@ -504,8 +471,6 @@ en-GB:
       post: Post
       when: When
       comment: Comment
-      newer_comments: Newer Comments
-      older_comments: Older Comments
   doorkeeper:
     errors:
       messages:
@@ -551,7 +516,7 @@ en-GB:
         amenity:
           animal_shelter: Animal Shelter
           arts_centre: Arts Centre
-          atm: ATM
+          atm: Cash Machine
           bank: Bank
           bar: Bar
           bbq: BBQ
@@ -561,11 +526,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
@@ -656,19 +620,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
@@ -699,7 +660,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
@@ -727,7 +688,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
@@ -826,7 +787,6 @@ en-GB:
         man_made:
           adit: Adit
           advertising: Advertising
-          antenna: Antenna/Antennae
           avalanche_protection: Avalanche Protection
           beacon: Beacon
           beam: Beam
@@ -983,7 +943,7 @@ en-GB:
           tram_stop: Tram Stop
           yard: Railway Yard
         shop:
-          alcohol: Off Licence
+          alcohol: Off-licence
           antiques: Antiques
           art: Art Shop
           bakery: Bakery
@@ -996,7 +956,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
@@ -1028,7 +988,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
@@ -1050,7 +1010,6 @@ en-GB:
           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
-          stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor
           ticket: Ticket Shop
@@ -1058,7 +1017,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
@@ -1110,10 +1069,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
-      types:
-        cities: Cities
-        towns: Towns
-        places: Places
     results:
       no_results: No results found
       more_results: More results
@@ -1131,7 +1086,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!
@@ -1168,7 +1123,6 @@ en-GB:
       see_their_profile: You can see their profile at %{userurl}.
       befriend_them: You can also add them as a friend at %{befriendurl}.
     gpx_failure:
-      failed_to_import: 'failed to import. Here is the error:'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       subject: '[OpenStreetMap] GPX Import success'
@@ -1183,14 +1137,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
@@ -1219,7 +1169,6 @@ en-GB:
           on. The note is near %{place}.'
     changeset_comment_notification:
       hi: Hi %{to_user},
-      greeting: Hi,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset
@@ -1231,10 +1180,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!
@@ -1247,7 +1192,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:
@@ -1311,7 +1255,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.
@@ -1343,12 +1286,22 @@ en-GB:
       password: Password
       remember: Remember me
       lost password link: Lost your password?
-      register now: Register now
       auth failure: Sorry, could not log in with those details.
     destroy:
       title: Logout
       heading: Logout of OpenStreetMap
       logout_button: Logout
+  shared:
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      traces:
+        older: Older Traces
+        newer: Newer Traces
   site:
     about:
       lede_text: OpenStreetMap is built by a community of mappers that contribute
@@ -1446,7 +1399,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:
@@ -1486,7 +1438,6 @@ en-GB:
       title: Any questions?
     sidebar:
       search_results: Search Results
-      close: Close
     search:
       search: Search
       get_directions_title: Find directions between two points
@@ -1515,7 +1466,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
@@ -1596,20 +1547,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?
-    trace_optionals:
-      tags: Tags
     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:'
@@ -1634,18 +1578,11 @@ 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
-    page:
-      older: Older Traces
-      newer: Newer Traces
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
-    make_public:
-      made_public: Trace made public
     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:
@@ -1681,7 +1618,6 @@ en-GB:
         account for you automatically.
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
-      external auth: 'Third Party Authentication:'
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
     terms:
@@ -1690,8 +1626,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
-      decline: Decline
       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:'
@@ -1748,7 +1682,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
@@ -1780,21 +1713,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:
-      title: Confirm role granting
-      heading: Confirm role granting
-      are_you_sure: Are you sure you want to grant the role `%{role}' to the user
-        `%{name}'?
-      confirm: Confirm
-    revoke:
-      title: Confirm role revoking
-      heading: Confirm role revoking
-      are_you_sure: Are you sure you want to revoke the role `%{role}' from the user
-        `%{name}'?
-      confirm: Confirm
   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.
@@ -1834,37 +1754,29 @@ 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}'
       heading_html: '%{block_on} blocked by %{block_by}'
       created: 'Created:'
       status: 'Status:'
-      show: Show
       edit: Edit
-      confirm: Are you sure?
       reason: 'Reason for block:'
       revoker: 'Revoker:'
-      needs_view: The user needs to log in before this block will be cleared.
     block:
-      not_revoked: (not revoked)
       show: Show
       edit: Edit
-    blocks:
+    page:
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       status: Status
-      revoker_name: Revoked by
   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
@@ -1892,6 +1804,8 @@ en-GB:
       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
+    notes_paging_nav:
+      showing_page: Page %{page}
   javascripts:
     close: Close
     share:
@@ -1997,7 +1911,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}
@@ -2034,20 +1947,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