X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a98913d0cf74887180aca3520c628a52b0e7071..2d5df687fcbf2564e2f199535aed04f67953bd0e:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 0186d446d..7e4d15aaf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -289,6 +289,7 @@ en: view_history: "View history" edit: "Edit way" note: + title: "Note" open_title: "Unresolved note: %{note_name}" closed_title: "Resolved note: %{note_name}" opened: "Opened:" @@ -921,6 +922,14 @@ en: waterfall: "Waterfall" water_point: "Water Point" weir: "Weir" + admin_levels: + level2: "Country Boundary" + level4: "State Boundary" + level5: "Region Boundary" + level6: "County Boundary" + level8: "City Boundary" + level9: "Village Boundary" + level10: "Suburb Boundary" description: title: osm_nominatim: 'Location from OpenStreetMap Nominatim' @@ -1138,8 +1147,7 @@ en: subject_header: "[OpenStreetMap] %{subject}" hi: "Hi %{to_user}," header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" - footer1: "You can also read the message at %{readurl}" - footer2: "and you can reply at %{replyurl}" + footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}" friend_notification: subject: "[OpenStreetMap] %{user} added you as a friend" had_added_you: "%{user} has added you as a friend on OpenStreetMap." @@ -1170,9 +1178,8 @@ en: introductory_video: "You can watch an introductory video to OpenStreetMap here:" more_videos: "There are more videos here:" the_wiki: "Get reading about OpenStreetMap on the wiki:" - the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide" + the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide" blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:" - opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:" ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" @@ -1183,7 +1190,7 @@ en: video_to_openstreetmap: "introductory video to OpenStreetMap" more_videos: "There are %{more_videos_link}." more_videos_here: "more videos here" - get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also! + get_reading: Get reading about OpenStreetMap on the wiki, and catch up with the latest news via the OpenStreetMap blog or Twitter. ask_questions: You can ask any questions you may have about OpenStreetMap at our question and answer site. wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' @@ -1192,8 +1199,7 @@ en: subject: "[OpenStreetMap] Confirm your email address" email_confirm_plain: greeting: "Hi," - hopefully_you_1: "Someone (hopefully you) would like to change their email address over at" - hopefully_you_2: "%{server_url} to %{new_address}." + 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." email_confirm_html: greeting: "Hi," @@ -1203,8 +1209,7 @@ en: subject: "[OpenStreetMap] Password reset request" lost_password_plain: greeting: "Hi," - hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this" - hopefully_you_2: "email addresses openstreetmap.org account." + 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." lost_password_html: greeting: "Hi," @@ -1223,6 +1228,11 @@ en: subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in" your_note: "%{commenter} has resolved one of your map notes near %{place}." commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}." + reopened: + subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in" + your_note: "%{commenter} has reactivated one of your map notes near %{place}." + commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." details: "More details about the note can be found at %{url}." message: inbox: @@ -1327,8 +1337,6 @@ en: submit_text: "Go" search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..." key: - map_key: "Map Key" - map_key_tooltip: "Key for the map" table: entry: motorway: "Motorway" @@ -1454,7 +1462,9 @@ en: upload_trace: "Upload a trace" see_all_traces: "See all traces" see_your_traces: "See your traces" - traces_waiting: "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." + 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." trace_optionals: tags: "Tags" view: @@ -1604,7 +1614,7 @@ en: login_button: "Login" register now: Register now with username: "Already have an OpenStreetMap account? Please login with your username and password:" - with openid: "Alternatively please use your OpenID to login:" + with openid: "Alternatively, use OpenID to login:" new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. @@ -1996,21 +2006,22 @@ en: needs_view: "The user needs to log in before this block will be cleared." note: description: - opened_at: "Created %{when} ago" - opened_at_by: "Created %{when} ago by %{user}" - commented_at: "Updated %{when} ago" - commented_at_by: "Updated %{when} ago by %{user}" - closed_at: "Resolved %{when} ago" - closed_at_by: "Resolved %{when} ago by %{user}" - reopened_at: "Reactivated %{when} ago" - reopened_at_by: "Reactivated %{when} ago by %{user}" + opened_at_html: "Created %{when} ago" + opened_at_by_html: "Created %{when} ago by %{user}" + commented_at_html: "Updated %{when} ago" + commented_at_by_html: "Updated %{when} ago by %{user}" + closed_at_html: "Resolved %{when} ago" + closed_at_by_html: "Resolved %{when} ago by %{user}" + reopened_at_html: "Reactivated %{when} ago" + reopened_at_by_html: "Reactivated %{when} ago by %{user}" rss: title: "OpenStreetMap Notes" description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" description_item: "An rss feed for note %{id}" + opened: "new note (near %{place})" + commented: "new comment (near %{place})" closed: "closed note (near %{place})" - new: "new note (near %{place})" - comment: "new comment (near %{place})" + reopened: "reactivated note (near %{place})" entry: comment: Comment full: Full note @@ -2025,14 +2036,30 @@ en: last_changed: "Last changed" ago_html: "%{when} ago" javascripts: + close: Close + share: + title: "Share" + cancel: "Cancel" + link: "Link" + short_link: "Short Link" + long_link: "Long Link" + key: + title: "Map Key" + tooltip: "Map Key" map: + zoom: + in: Zoom In + out: Zoom Out base: standard: Standard cycle_map: Cycle Map transport_map: Transport Map mapquest: MapQuest Open - overlays: - maplint: Maplint + layers: + header: Map Layers + notes: Map Notes + data: Map Data + overlays: Enable overlays for troubleshooting the map site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map @@ -2060,6 +2087,7 @@ en: reopened_by_anonymous: "reactivated by anonymous at %{time}" hide: Hide resolve: Resolve + reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment redaction: