X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6403cb9b08dfb7b0411c88515da34f27a813dd4a..a539efd4e5f1664bbde664b2470ce54291724c65:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5b439fdae..68fd34ee9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -162,6 +162,7 @@ en: way: way relation: relation changeset: changeset + note: note timeout: sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve." type: @@ -169,6 +170,7 @@ en: way: way relation: relation changeset: changeset + note: note redacted: redaction: "Redaction %{id}" message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." @@ -248,6 +250,7 @@ en: diary_entry: new: title: New Diary Entry + publish_button: "Publish" list: title: "Users' diaries" title_friends: "Friends' diaries" @@ -842,7 +845,7 @@ en: "yes": "Shop" tourism: alpine_hut: "Alpine Hut" - apartment: "Apartment" + apartment: "Holiday Apartment" artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" @@ -953,10 +956,6 @@ en: text: Make a Donation learn_more: "Learn More" more: More - donate_header: Support OpenStreetMap - donate_line_1: Bigger Servers for a - donate_line_2: Growing OpenStreetMap - donate_line_3: Hardware Funding Drive 2015 license_page: foreign: title: About this translation @@ -1084,7 +1083,7 @@ en: on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: | - OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. + OpenStreetMap and the magnifying glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the Licence Working Group. welcome_page: title: Welcome! introduction_html: | @@ -1198,7 +1197,7 @@ en: about_page: next: Next copyright_html: ©OpenStreetMap
contributors - used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices" + used_by: "%{name} powers map data on 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. @@ -1426,13 +1425,12 @@ en: table: entry: motorway: "Motorway" + main_road: "Main road" trunk: "Trunk road" primary: "Primary road" secondary: "Secondary road" unclassified: "Unclassified road" - unsurfaced: "Unsurfaced road" track: "Track" - byway: "Byway" bridleway: "Bridleway" cycleway: "Cycleway" footway: "Footway" @@ -1456,7 +1454,6 @@ en: golf: "Golf course" park: "Park" resident: "Residential area" - tourist: "Tourist attraction" common: - Common - meadow @@ -1486,7 +1483,6 @@ en: tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" - permissive: "Permissive access" destination: "Destination access" construction: "Roads under construction" richtext_area: @@ -1635,6 +1631,7 @@ en: allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." allow_write_notes: "modify notes." + grant_access: "Grant Access" oauthorize_success: title: "Authorization request allowed" allowed: "You have granted application %{app_name} access to your account." @@ -1788,16 +1785,6 @@ en: confirm password: "Confirm Password:" use external auth: "Alternatively, use a third party to login" auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." - auth association: | -

Your ID is not associated with a OpenStreetMap account yet.

- continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." @@ -2012,6 +1999,15 @@ en: no_authorization_code: No authorization code unknown_signature_algorithm: Unknown signature algorithm invalid_scope: Invalid scope + auth_association: + heading: Your ID is not associated with a OpenStreetMap account yet. + option_1: | + If you are new to OpenStreetMap, please create a new account + using the form below. + option_2: | + If you already have an account, you can login to your account + using your username and password and then associate the account + with your ID in your user settings. user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@ -2236,31 +2232,34 @@ en: mapquest_car: "Car (MapQuest)" mapquest_foot: "Foot (MapQuest)" osrm_car: "Car (OSRM)" + mapzen_bicycle: "Bicycle (Mapzen)" + mapzen_car: "Car (Mapzen)" + mapzen_foot: "Foot (Mapzen)" directions: "Directions" distance: "Distance" errors: no_route: "Couldn't find a route between those two places." no_place: "Sorry - couldn't find that place." instructions: - continue_on: Continue on - slight_right: Slight right onto - turn_right: Turn right onto - sharp_right: Sharp right onto - uturn: U-turn along - sharp_left: Sharp left onto - turn_left: Turn left onto - slight_left: Slight left onto - via_point: (via point) - follow: Follow - roundabout: At roundabout take - leave_roundabout: Leave roundabout - - stay_roundabout: Stay on roundabout - - start: Start at end of - destination: Reach destination - against_oneway: Go against one-way on - end_oneway: End of one-way on - exit: exit %{exit} - unnamed: "(unnamed)" + continue_without_exit: Continue on %{name} + slight_right_without_exit: Slight right onto %{name} + turn_right_without_exit: Turn right onto %{name} + sharp_right_without_exit: Sharp right onto %{name} + uturn_without_exit: U-turn along %{name} + sharp_left_without_exit: Sharp left onto %{name} + turn_left_without_exit: 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} + leave_roundabout_without_exit: Leave roundabout - %{name} + stay_roundabout_without_exit: Stay on roundabout - %{name} + start_without_exit: Start at end of %{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} + roundabout_with_exit: At roundabout take exit %{exit} onto %{name} + unnamed: "unnamed road" courtesy: "Directions courtesy of %{link}" time: "Time" query: