X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/22fbd05f1f982cabc8fab60e63c545112c6e0006..b7f6b5df93bd5e66189adfdb11c484c4c1390294:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index 030fab696..96c31d469 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -239,6 +239,59 @@ en: entry: comment: Comment full: Full note + account: + deletions: + show: + title: Delete My Account + warning: Warning! The account deletion process is final, and cannot be reversed. + delete_account: Delete Account + delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:" + delete_profile: Your profile information, including your avatar, description and home location will be removed. + delete_display_name: Your display name will be removed, and can be reused by other accounts. + retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:" + retain_edits: Your edits to the map database, if any, will be retained. + retain_traces: Your uploaded traces, if any, will be retained. + retain_diary_entries: Your diary entries and diary comments, if any, will be retained but hidden from view. + retain_notes: Your map notes and note comments, if any, will be retained but hidden from view. + retain_changeset_discussions: Your changeset discussions, if any, will be retained. + retain_email: Your email address will be retained. + confirm_delete: Are you sure? + cancel: Cancel + accounts: + edit: + title: "Edit account" + my settings: My Settings + current email address: "Current Email Address" + external auth: "External Authentication" + openid: + link: "https://wiki.openstreetmap.org/wiki/OpenID" + link text: "what is this?" + public editing: + heading: "Public editing" + enabled: "Enabled. Not anonymous and can edit data." + enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" + enabled link text: "what is this?" + disabled: "Disabled and cannot edit data, all previous edits are anonymous." + disabled link text: "why can't I edit?" + public editing note: + heading: "Public editing" + html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." + contributor terms: + heading: "Contributor Terms" + agreed: "You have agreed to the new Contributor Terms." + not yet agreed: "You have not yet agreed to the new Contributor Terms." + review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." + agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." + link: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" + link text: "what is this?" + save changes button: Save Changes + make edits public button: Make all my edits public + delete_account: Delete Account... + 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." + destroy: + success: "Account Deleted." browse: created: "Created" closed: "Closed" @@ -416,6 +469,26 @@ en: title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" timeout: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + dashboards: + contact: + km away: "%{count}km away" + m away: "%{count}m away" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" + show: + title: My Dashboard + no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." + edit_your_profile: Edit your profile + my friends: My friends + no friends: You have not added any friends yet. + nearby users: "Other nearby users" + no nearby users: "There are no other users who admit to mapping nearby yet." + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" diary_entries: new: title: New Diary Entry @@ -484,7 +557,9 @@ en: title: "OpenStreetMap diary entries" description: "Recent diary entries from users of OpenStreetMap" comments: - has_commented_on: "%{display_name} has commented on the following diary entries" + title: "Diary Comments added by %{user}" + heading: "%{user}'s Diary Comments" + subheading_html: "Diary Comments added by %{user}" no_comments: "No diary comments" post: Post when: When @@ -747,6 +822,7 @@ en: window_construction: "Window Construction" winery: "Winery" "yes": "Craft Shop" + crossing: "Crossing" emergency: access_point: "Access Point" ambulance_station: "Ambulance Station" @@ -760,7 +836,6 @@ en: siren: "Emergency Siren" suction_point: "Emergency Suction Point" water_tank: "Emergency Water Tank" - "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" @@ -807,6 +882,7 @@ en: trailhead: "Trailhead" trunk: "Trunk Road" trunk_link: "Trunk Road" + turning_circle: "Turning Circle" turning_loop: "Turning Loop" unclassified: "Unclassified Road" "yes" : "Road" @@ -1002,6 +1078,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -1016,10 +1093,13 @@ en: sand: "Sand" scree: "Scree" scrub: "Scrub" + shingle: "Shingle" spring: "Spring" stone: "Stone" strait: "Strait" tree: "Tree" + tree_row: "Tree Row" + tundra: "Tundra" valley: "Valley" volcano: "Volcano" water: "Water" @@ -1084,6 +1164,7 @@ en: "yes": "Place" railway: abandoned: "Abandoned Railway" + buffer_stop: "Buffer Stop" construction: "Railway under Construction" disused: "Disused Railway" funicular: "Funicular Railway" @@ -1097,6 +1178,7 @@ en: platform: "Railway Platform" preserved: "Preserved Railway" proposed: "Proposed Railway" + rail: "Rail" spur: "Railway Spur" station: "Railway Station" stop: "Railway Stop" @@ -1105,6 +1187,7 @@ en: switch: "Railway Points" tram: "Tramway" tram_stop: "Tram Stop" + turntable: "Turntable" yard: "Railway Yard" shop: agrarian: "Agrarian Shop" @@ -1839,9 +1922,8 @@ en: credit_3_1_html: | The map tiles in the “standard style” at www.openstreetmap.org are a Produced Work by the OpenStreetMap Foundation using OpenStreetMap data - under the Open Database License. If you are using these tiles please use - the following attribution: - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + under the Open Database License. When using this map style, the same attribution is + required as for the map data. credit_4_html: | For a browsable electronic map, the credit should appear in the corner of the map. For example: @@ -1870,10 +1952,10 @@ en: Land Vorarlberg and Land Tirol (under CC BY AT with amendments). contributors_au_html: | - Australia: Contains data sourced from - PSMA Australia Limited + Australia: Incorporates or developed using Administrative Boundaries © + Geoscape Australia licensed by the Commonwealth of Australia under - CC BY 4.0. + Creative Commons Attribution 4.0 International licence (CC BY 4.0). contributors_ca_html: | Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -1931,7 +2013,7 @@ en: infringement_2_html: | If you believe that copyrighted material has been inappropriately added to the OpenStreetMap database or this site, please refer - to our takedown + to our takedown procedure or file directly at our on-line filing page. trademarks_title_html: Trademarks @@ -2343,6 +2425,8 @@ en: read_gpx: Read private GPS traces write_gpx: Upload GPS traces write_notes: Modify notes + read_email: Read user email address + skip_authorization: Auto approve application oauth_clients: new: title: "Register a new application" @@ -2459,7 +2543,7 @@ en: read_tou: "I have read and agree to the Terms of Use" 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: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" @@ -2490,6 +2574,7 @@ en: my settings: My Settings my comments: My Comments my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me edit_profile: Edit Profile @@ -2511,14 +2596,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." - edit_your_profile: Edit your profile - my friends: My friends - no friends: You have not added any friends yet. - km away: "%{count}km away" - m away: "%{count}m away" - nearby users: "Other nearby users" - no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2535,49 +2612,13 @@ en: activate_user: "Activate this User" deactivate_user: "Deactivate this User" confirm_user: "Confirm this User" + unconfirm_user: "Unconfirm this User" + unsuspend_user: "Unsuspend this User" hide_user: "Hide this User" unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" - nearby_changesets: "nearby user changesets" - nearby_diaries: "nearby user diary entries" report: Report this User - popup: - your location: "Your location" - nearby mapper: "Nearby mapper" - friend: "Friend" - account: - title: "Edit account" - my settings: My Settings - current email address: "Current Email Address" - external auth: "External Authentication" - openid: - link: "https://wiki.openstreetmap.org/wiki/OpenID" - link text: "what is this?" - public editing: - heading: "Public editing" - enabled: "Enabled. Not anonymous and can edit data." - enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" - enabled link text: "what is this?" - disabled: "Disabled and cannot edit data, all previous edits are anonymous." - disabled link text: "why can't I edit?" - public editing note: - heading: "Public editing" - html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." - contributor terms: - heading: "Contributor Terms" - agreed: "You have agreed to the new Contributor Terms." - not yet agreed: "You have not yet agreed to the new Contributor Terms." - review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." - agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." - link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" - link text: "what is this?" - save changes button: Save Changes - make edits public button: Make all my edits public - flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." - flash update success: "User information updated successfully." set_home: flash success: "Home location saved successfully" go_public: @@ -2612,6 +2653,7 @@ en: no_authorization_code: No authorization code unknown_signature_algorithm: Unknown signature algorithm invalid_scope: Invalid scope + unknown_error: Authentication failed auth_association: heading: Your ID is not associated with a OpenStreetMap account yet. option_1: |