X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2c93b6e8e10ded721d2a9a088dbcf3158f46f1b1..54a158aef39a6a1bdca4ce030170d6f89fc06994:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index fce1f8913..db77a816e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -416,6 +416,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 @@ -423,10 +443,10 @@ en: location: Location use_map_link: Use Map index: - title: "Users' diaries" - title_friends: "Friends' diaries" - title_nearby: "Nearby Users' diaries" - user_title: "%{user}'s diary" + title: "Users' Diaries" + title_friends: "Friends' Diaries" + title_nearby: "Nearby Users' Diaries" + user_title: "%{user}'s Diary" in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in my user diary @@ -439,8 +459,8 @@ en: title: Edit Diary Entry marker_text: Diary entry location show: - title: "%{user}'s diary | %{title}" - user_title: "%{user}'s diary" + title: "%{user}'s Diary | %{title}" + user_title: "%{user}'s Diary" leave_a_comment: "Leave a comment" login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Login" @@ -484,7 +504,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 +769,7 @@ en: window_construction: "Window Construction" winery: "Winery" "yes": "Craft Shop" + crossing: "Crossing" emergency: access_point: "Access Point" ambulance_station: "Ambulance Station" @@ -760,7 +783,6 @@ en: siren: "Emergency Siren" suction_point: "Emergency Suction Point" water_tank: "Emergency Water Tank" - "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" @@ -1002,6 +1024,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -1016,10 +1039,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" @@ -1420,8 +1446,9 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" + partners_fastly: "Fastly" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" tou: "Terms of Use" @@ -1645,6 +1672,43 @@ en: reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" + preferences: + show: + title: My Preferences + preferred_editor: Preferred Editor + preferred_languages: Preferred Languages + edit_preferences: Edit Preferences + edit: + title: Edit Preferences + save: Update Preferences + cancel: Cancel + update: + failure: Couldn't update preferences. + update_success_flash: + message: Preferences updated. + profiles: + edit: + title: Edit Profile + save: Update Profile + cancel: Cancel + image: Image + gravatar: + gravatar: "Use Gravatar" + link: "https://wiki.openstreetmap.org/wiki/Gravatar" + what_is_gravatar: "What is Gravatar?" + disabled: "Gravatar has been disabled." + enabled: "Display of your Gravatar has been enabled." + new image: "Add an image" + keep image: "Keep the current image" + delete image: "Remove the current image" + replace image: "Replace the current image" + image size hint: "(square images at least 100x100 work best)" + home location: "Home Location" + no home location: "You have not entered your home location." + update home location on click: "Update home location when I click on the map?" + update: + success: Profile updated. + failure: Couldn't update profile. sessions: new: title: "Login" @@ -1801,9 +1865,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: @@ -1832,10 +1895,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 @@ -2023,7 +2086,7 @@ en: potlatch: removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser. desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows. - id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here. + id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here. sidebar: search_results: Search Results close: Close @@ -2181,8 +2244,8 @@ en: 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." edit: cancel: Cancel - title: "Editing trace %{name}" - heading: "Editing trace %{name}" + title: "Editing Trace %{name}" + heading: "Editing Trace %{name}" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" update: @@ -2190,8 +2253,8 @@ en: trace_optionals: tags: "Tags" show: - title: "Viewing trace %{name}" - heading: "Viewing trace %{name}" + title: "Viewing Trace %{name}" + heading: "Viewing Trace %{name}" pending: "PENDING" filename: "Filename:" download: "download" @@ -2230,9 +2293,9 @@ en: by: "by" in: "in" index: - public_traces: "Public GPS traces" - my_traces: "My GPS traces" - public_traces_from: "Public GPS traces from %{user}" + public_traces: "Public GPS Traces" + my_traces: "My GPS Traces" + public_traces_from: "Public GPS Traces from %{user}" 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." @@ -2267,6 +2330,11 @@ en: blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." + settings_menu: + account_settings: Account Settings + oauth1_settings: OAuth 1 settings + oauth2_applications: OAuth 2 applications + oauth2_authorizations: OAuth 2 authorizations oauth: authorize: title: "Authorize access to your account" @@ -2300,6 +2368,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" @@ -2341,7 +2411,7 @@ en: flash: "Destroyed the client application registration" oauth2_applications: index: - title: "My client applications" + title: "My Client Applications" no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service." oauth_2: "OAuth 2" new: "Register new application" @@ -2368,7 +2438,7 @@ en: sorry: "Sorry, that application could not be found." oauth2_authorizations: new: - title: "Authorization required" + title: "Authorization Required" introduction: "Authorize %{application} to access your account with the following permissions?" authorize: "Authorize" deny: "Deny" @@ -2378,7 +2448,7 @@ en: title: "Authorization code" oauth2_authorized_applications: index: - title: "My authorized applications" + title: "My Authorized Applications" application: "Application" permissions: "Permissions" no_applications_html: "You have not yet authorized any %{oauth2} applications." @@ -2446,8 +2516,11 @@ en: my profile: My Profile 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 send message: Send Message diary: Diary edits: Edits @@ -2466,14 +2539,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users." - settings_link_text: settings - 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" @@ -2494,18 +2559,10 @@ en: 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 + my settings: My Settings current email address: "Current Email Address" external auth: "External Authentication" openid: @@ -2529,27 +2586,8 @@ en: 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?" - image: Image - gravatar: - gravatar: "Use Gravatar" - link: "https://wiki.openstreetmap.org/wiki/Gravatar" - what_is_gravatar: "What is Gravatar?" - disabled: "Gravatar has been disabled." - enabled: "Display of your Gravatar has been enabled." - new image: "Add an image" - keep image: "Keep the current image" - delete image: "Remove the current image" - replace image: "Replace the current image" - image size hint: "(square images at least 100x100 work best)" - home location: "Home Location" - no home location: "You have not entered your home location." - update home location on click: "Update home location when I click on the map?" save changes button: Save Changes make edits public button: Make all my edits public - return to profile: Return to profile - oauth1 settings: OAuth 1 settings - oauth2 applications: OAuth 2 applications - oauth2 authorizations: OAuth 2 authorizations 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: @@ -2586,6 +2624,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: | @@ -2678,11 +2717,11 @@ en: other: "%{count} years" blocks_on: title: "Blocks on %{name}" - heading_html: "List of blocks on %{name}" + heading_html: "List of Blocks on %{name}" empty: "%{name} has not been blocked yet." blocks_by: title: "Blocks by %{name}" - heading_html: "List of blocks by %{name}" + heading_html: "List of Blocks by %{name}" empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" @@ -2715,7 +2754,7 @@ en: notes: index: title: "Notes submitted or commented on by %{user}" - heading: "%{user}'s notes" + heading: "%{user}'s Notes" subheading_html: "Notes submitted or commented on by %{user}" no_notes: No notes id: "Id" @@ -2911,19 +2950,19 @@ en: centre_map: Centre map here redactions: edit: - heading: "Edit redaction" - title: "Edit redaction" + heading: "Edit Redaction" + title: "Edit Redaction" index: empty: "No redactions to show." - heading: "List of redactions" - title: "List of redactions" + heading: "List of Redactions" + title: "List of Redactions" new: - heading: "Enter information for new redaction" - title: "Creating new redaction" + heading: "Enter Information for New Redaction" + title: "Creating New Redaction" show: description: "Description:" - heading: "Showing redaction \"%{title}\"" - title: "Showing redaction" + heading: "Showing Redaction \"%{title}\"" + title: "Showing Redaction" user: "Creator:" edit: "Edit this redaction" destroy: "Remove this redaction"