X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c..7a64ebe98265ff8ad6be5b8be9481661cd824f0f:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 036f8de35..7df06b277 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -230,7 +230,7 @@ en: list: title: "Changesets" title_user: "Changesets by %{user}" - title_friend: "Changesets by your friends" + title_friend: "Changesets by my friends" title_nearby: "Changesets by nearby users" empty: "No changesets found." empty_area: "No changesets in this area." @@ -259,7 +259,7 @@ en: user_title: "%{user}'s diary" in_language_title: "Diary Entries in %{language}" new: New Diary Entry - new_title: Compose a new entry in your user diary + new_title: Compose a new entry in my user diary no_entries: No diary entries recent_entries: "Recent diary entries" older_entries: Older Entries @@ -368,7 +368,6 @@ en: 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' geonames: 'Results from GeoNames' @@ -1170,8 +1169,8 @@ en: paragraph_1_html: | OpenStreetMap has few formal rules but we expect all participants to collaborate with, and communicate with, the community. If you are considering - any activities other than editing by hand, please read and follow the guidelines on - Imports and + any activities other than editing by hand, please read and follow the guidelines on + Imports and Automated Edits. questions: title: Any questions? @@ -1197,7 +1196,7 @@ en: title: Join the community 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. + proceed is to join the OpenStreetMap community and add or repair the data yourself. add_a_note: instructions_html: | Just click or the same icon on the map display. @@ -1207,8 +1206,8 @@ en: title: Other concerns explanation_html: | If you have concerns about how our data is being used or about the contents please consult our - copyright page for more legal information, or contact the appropriate - OSMF working group. + copyright page for more legal information, or contact the appropriate + OSMF working group. help_page: title: Getting Help introduction: | @@ -1278,13 +1277,13 @@ en: License page for details. legal_title: Legal legal_html: | - This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) - on behalf of the community. Use of all OSMF operated services is subject + This site and many other related services are formally operated by the + OpenStreetMap Foundation (OSMF) + on behalf of the community. Use of all OSMF operated services is subject to our Acceptable Use Policies and our Privacy Policy -
- Please contact the OSMF +
+ Please contact the OSMF if you have licensing, copyright or other legal questions.
OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. @@ -1612,7 +1611,7 @@ en: trace_header: upload_trace: "Upload a trace" see_all_traces: "See all traces" - see_your_traces: "See your traces" + see_my_traces: "See my 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 for other users." other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." @@ -1637,6 +1636,7 @@ en: delete_track: "Delete this trace" trace_not_found: "Trace not found!" visibility: "Visibility:" + confirm_delete: "Delete this trace?" trace_paging_nav: showing_page: "Page %{page}" older: "Older Traces" @@ -1659,9 +1659,9 @@ en: map: "map" list: public_traces: "Public GPS traces" - your_traces: "Your GPS traces" + my_traces: "My GPS traces" public_traces_from: "Public GPS traces from %{user}" - description: "Browse recent GPS track uploads" + description: "Browse recent GPS trace uploads" tagged_with: " tagged with %{tags}" empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: @@ -1924,7 +1924,7 @@ en: user location: User location if set location: "Set your home location on the %{settings_link} page to see nearby users." settings_link_text: settings - your friends: Your friends + my friends: My friends no friends: You have not added any friends yet. km away: "%{count}km away" m away: "%{count}m away" @@ -2326,12 +2326,23 @@ en: distance: "Distance" errors: no_route: "Couldn't find a route between those two places." - no_place: "Sorry - couldn't find that place." + no_place: "Sorry - couldn't locate '%{place}'." instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} - offramp_right_without_exit: Take the ramp on the right onto %{name} + offramp_right: Take the ramp on the right + offramp_right_with_exit: Take exit %{exit} on the right + offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name} + offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions} + offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions} + offramp_right_with_name: Take the ramp on the right onto %{name} + offramp_right_with_directions: Take the ramp on the right towards %{directions} + offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions} onramp_right_without_exit: Turn right on the ramp onto %{name} + onramp_right_with_directions: Turn right onto the ramp towards %{directions} + onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions} + onramp_right_without_directions: Turn right onto the ramp + onramp_right: Turn right onto the ramp 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} @@ -2340,18 +2351,29 @@ en: 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 ramp on the left onto %{name} + offramp_left: Take the ramp on the left + offramp_left_with_exit: Take exit %{exit} on the left + offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name} + offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions} + offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions} + offramp_left_with_name: Take the ramp on the left onto %{name} + offramp_left_with_directions: Take the ramp on the left towards %{directions} + offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions} onramp_left_without_exit: Turn left on the ramp onto %{name} + onramp_left_with_directions: Turn left onto the ramp towards %{directions} + onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions} + onramp_left_without_directions: Turn left onto the ramp + onramp_left: Turn left onto the ramp 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} 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 %{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 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}