X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c..c783b5c82f5242dcc274bbae00ca2af9b537d724:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index a2429a222..4be180898 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -12,6 +12,7 @@ # Author: Eduard Popov # Author: IknowJoseph # Author: Jagwar +# Author: Jguthrie100 # Author: Kosovastar # Author: Macofe # Author: Meno25 @@ -399,8 +400,6 @@ en-GB: search: title: latlon: Results from Internal - uk_postcode: Results from NPEMap / FreeThe - Postcode ca_postcode: Results from Geocoder.CA osm_nominatim: Results from OpenStreetMap Nominatim @@ -521,6 +520,7 @@ en-GB: protected_area: Protected Area bridge: aqueduct: Aqueduct + boardwalk: Promenade suspension: Suspension Bridge swing: Swing Bridge viaduct: Viaduct @@ -675,6 +675,7 @@ en-GB: "yes": Leisure man_made: lighthouse: Lighthouse + petroleum_well: Oil Well pipeline: Pipeline tower: Tower works: Factory @@ -1462,6 +1463,7 @@ en-GB: where_am_i: Where am I? where_am_i_title: Describe the current location using the search engine submit_text: Go + reverse_directions_text: Reverse Directions key: table: entry: @@ -1593,7 +1595,6 @@ en-GB: trace_header: upload_trace: Upload a trace see_all_traces: See all traces - see_your_traces: See your traces traces_waiting: one: You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue @@ -1644,7 +1645,6 @@ en-GB: map: map list: public_traces: Public GPS traces - your_traces: Your GPS traces public_traces_from: Public GPS traces from %{user} description: Browse recent GPS track uploads tagged_with: ' tagged with %{tags}' @@ -1944,7 +1944,6 @@ en-GB: if set location: Set your home location on the %{settings_link} page to see nearby users. settings_link_text: settings - your friends: Your friends no friends: You have not added any friends yet. km away: '%{count}km away' m away: '%{count}m away' @@ -2204,20 +2203,6 @@ en-GB: period: one: 1 hour other: '%{count} hours' - partial: - show: Show - edit: Edit - revoke: Revoke! - confirm: Are you sure? - display_name: Blocked User - creator_name: Creator - reason: Reason for block - status: Status - revoker_name: Revoked by - not_revoked: (not revoked) - showing_page: Page %{page} - next: Next » - previous: « Previous helper: time_future: Ends in %{time}. until_login: Active until the user logs in. @@ -2247,6 +2232,21 @@ en-GB: back: View all blocks revoker: 'Revoker:' needs_view: The user needs to log in before this block will be cleared. + user_blocks: + block: + not_revoked: (not revoked) + show: Show + edit: Edit + revoke: Revoke! + blocks: + display_name: Blocked User + creator_name: Creator + reason: Reason for block + status: Status + revoker_name: Revoked by + showing_page: Page %{page} + next: Next » + previous: « Previous note: description: opened_at_html: Created %{when} ago @@ -2350,6 +2350,8 @@ en-GB: can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.) + 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 @@ -2380,8 +2382,16 @@ en-GB: instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} - offramp_right_without_exit: Take the sliproad on the right onto %{name} + offramp_right: Take the sliproad on the right + offramp_right_with_name: Take the sliproad on the right onto %{name} + offramp_right_with_directions: Take the sliproad on the right towards %{directions} + offramp_right_with_name_directions: Take the sliproad on the right onto %{name}, + towards %{directions} onramp_right_without_exit: Turn right on the sliproad onto %{name} + onramp_right_with_directions: Turn right onto the sliproad towards %{directions} + onramp_right_with_name_directions: Turn right on the sliproad onto %{name}, + towards %{directions} + onramp_right_without_directions: Turn right onto the sliproad endofroad_right_without_exit: At the end of the road turn right onto %{name} merge_right_without_exit: Merge right onto %{name} fork_right_without_exit: At the fork turn right onto %{name} @@ -2390,8 +2400,16 @@ en-GB: uturn_without_exit: U-turn along %{name} sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} - offramp_left_without_exit: Take the sliproad on the left onto %{name} + offramp_left: Take the sliproad on the left + offramp_left_with_name: Take the sliproad on the left onto %{name} + offramp_left_with_directions: Take the sliproad on the left towards %{directions} + offramp_left_with_name_directions: Take the sliproad on the left onto %{name}, + towards %{directions} onramp_left_without_exit: Turn left on the sliproad onto %{name} + onramp_left_with_directions: Turn left onto the sliproad towards %{directions} + onramp_left_with_name_directions: Turn left on the sliproad onto %{name}, + towards %{directions} + onramp_left_without_directions: Turn left onto the sliproad endofroad_left_without_exit: At the end of the road turn left onto %{name} merge_left_without_exit: Merge left onto %{name} fork_left_without_exit: At the fork turn left onto %{name} @@ -2401,7 +2419,7 @@ en-GB: roundabout_without_exit: At roundabout take %{name} leave_roundabout_without_exit: Leave roundabout - %{name} stay_roundabout_without_exit: Stay on roundabout - %{name} - start_without_exit: Start at end of %{name} + start_without_exit: Start on %{name} destination_without_exit: Reach destination against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name}