X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/44ec0e02fc259d3a41a8e48da02ebd54f48e241b..8f7f02b025f59db466fdb22ea3686cb6c5adc400:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 72632d1e8..172c66182 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,9 +20,6 @@ en: create: Add Comment message: create: Send - client_application: - create: Register - update: Update oauth2_application: create: Register update: Update @@ -92,7 +89,7 @@ en: support_url: Support URL allow_read_prefs: read their user preferences allow_write_prefs: modify their user preferences - allow_write_diary: create diary entries, comments and make friends + allow_write_diary: create diary entries and comments allow_write_api: modify the map allow_read_gpx: read their private GPS traces allow_write_gpx: upload GPS traces @@ -245,25 +242,6 @@ 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. - recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}." - confirm_delete: Are you sure? - cancel: Cancel accounts: edit: title: "Edit account" @@ -273,13 +251,6 @@ en: 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?" contributor terms: heading: "Contributor Terms" agreed: "You have agreed to the new Contributor Terms." @@ -305,6 +276,54 @@ en: success: "User information updated successfully." destroy: success: "Account Deleted." + 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. + recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}." + confirm_delete: Are you sure? + cancel: Cancel + terms: + show: + title: "Terms" + heading: "Terms" + heading_ct: "Contributor terms" + read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button." + contributor_terms_explain: "This agreement governs the terms for your existing and future contributions." + read_ct: "I have read and agree to the above contributor terms" + tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text." + 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://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain + guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}" + readable_summary: human readable summary + informal_translations: informal translations + continue: "Continue" + cancel: "Cancel" + you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." + legale_select: "Country of residence:" + legale_names: + france: "France" + italy: "Italy" + rest_of_world: "Rest of the world" + update: + terms accepted: "Thanks for accepting the new contributor terms!" + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. + terms_declined_link: this wiki page + terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined browse: deleted_ago_by_html: "Deleted %{time_ago} by %{user}" edited_ago_by_html: "Edited %{time_ago} by %{user}" @@ -324,17 +343,13 @@ en: view_history: "View History" view_unredacted_history: "View Unredacted History" view_details: "View Details" - view_redacted_data: "View Redacted Data" - view_redaction_message: "View Redaction Message" location: "Location:" common_details: coordinates_html: "%{latitude}, %{longitude}" node: title_html: "Node: %{name}" - history_title_html: "Node History: %{name}" way: title_html: "Way: %{name}" - history_title_html: "Way History: %{name}" nodes: "Nodes" nodes_count: one: "%{count} node" @@ -344,7 +359,6 @@ en: other: "part of ways %{related_ways}" relation: title_html: "Relation: %{name}" - history_title_html: "Relation History: %{name}" members: "Members" members_count: one: "%{count} member" @@ -360,13 +374,6 @@ en: entry_role_html: "%{relation_name} (as %{relation_role})" not_found: title: Not Found - sorry: "Sorry, %{type} #%{id} could not be found." - type: - node: node - way: way - relation: relation - changeset: changeset - note: note timeout: title: Timeout Error sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve." @@ -385,6 +392,7 @@ en: relation: "relation" start_rjs: feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?" + feature_error: "Features could not be loaded: %{message}" load_data: "Load Data" loading: "Loading..." tag_details: @@ -403,27 +411,44 @@ en: introduction: "Click on the map to find nearby features." nearby: "Nearby features" enclosing: "Enclosing features" + old_elements: + index: + node: + title_html: "Node History: %{name}" + way: + title_html: "Way History: %{name}" + relation: + title_html: "Relation History: %{name}" + actions: + view_redacted_data: "View Redacted Data" + view_redaction_message: "View Redaction Message" nodes: + not_found_message: + sorry: "Sorry, node #%{id} could not be found." timeout: sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve." old_nodes: - not_found: + not_found_message: sorry: "Sorry, node #%{id} version %{version} could not be found." timeout: sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve." ways: + not_found_message: + sorry: "Sorry, way #%{id} could not be found." timeout: sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve." old_ways: - not_found: + not_found_message: sorry: "Sorry, way #%{id} version %{version} could not be found." timeout: sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve." relations: + not_found_message: + sorry: "Sorry, relation #%{id} could not be found." timeout: sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve." old_relations: - not_found: + not_found_message: sorry: "Sorry, relation #%{id} version %{version} could not be found." timeout: sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve." @@ -445,7 +470,7 @@ en: title: "Changesets" title_user: "Changesets by %{user}" title_user_link_html: "Changesets by %{user_link}" - title_friend: "Changesets by my friends" + title_followed: "Changesets by followings" title_nearby: "Changesets by nearby users" empty: "No changesets found." empty_area: "No changesets in this area." @@ -460,18 +485,6 @@ en: created: "Created" closed: "Closed" belongs_to: "Author" - subscribe: - heading: Subscribe to the following changeset discussion? - button: Subscribe to discussion - unsubscribe: - heading: Unsubscribe from the following changeset discussion? - button: Unsubscribe from discussion - heading: - title: "Changeset %{id}" - created_by_html: "Created by %{link_user} on %{created}." - no_such_entry: - heading: "No entry with the id: %{id}" - body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." show: title: "Changeset: %{id}" created: "Created: %{when}" @@ -499,8 +512,24 @@ en: ways_paginated: "Ways (%{x}-%{y} of %{count})" relations: "Relations (%{count})" relations_paginated: "Relations (%{x}-%{y} of %{count})" + not_found_message: + sorry: "Sorry, changeset #%{id} could not be found." timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." + changeset_subscriptions: + show: + subscribe: + heading: Subscribe to the following changeset discussion? + button: Subscribe to discussion + unsubscribe: + heading: Unsubscribe from the following changeset discussion? + button: Unsubscribe from discussion + heading: + title: "Changeset %{id}" + created_by_html: "Created by %{link_user} on %{created}." + no_such_entry: + heading: "No entry with the id: %{id}" + body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." dashboards: contact: km away: "%{count}km away" @@ -509,17 +538,17 @@ en: popup: your location: "Your location" nearby mapper: "Nearby mapper" - friend: "Friend" + following: "Following" 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. + followings: Followings + no followings: You have not followed any user 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" + followed_changesets: "changesets" + followed_diaries: "diary entries" nearby_changesets: "nearby user changesets" nearby_diaries: "nearby user diary entries" diary_entries: @@ -530,7 +559,7 @@ en: use_map_link: Use Map index: title: "Users' Diaries" - title_friends: "Friends' Diaries" + title_followed: "Followings' Diaries" title_nearby: "Nearby Users' Diaries" user_title: "%{user}'s Diary" in_language_title: "Diary Entries in %{language}" @@ -596,15 +625,6 @@ en: heading: Unsubscribe from the following diary entry discussion? button: Unsubscribe from discussion diary_comments: - index: - title: "Diary Comments added by %{user}" - heading: "%{user}'s Diary Comments" - subheading_html: "Diary Comments added by %{user}" - no_comments: "No diary comments" - page: - post: Post - when: When - comment: Comment new: heading: Add a comment to the following diary entry discussion? doorkeeper: @@ -651,19 +671,22 @@ en: not_found: title: File not found description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404) - friendships: - make_friend: - heading: "Add %{user} as a friend?" - button: "Add as friend" - success: "%{name} is now your friend!" - failed: "Sorry, failed to add %{name} as a friend." - already_a_friend: "You are already friends with %{name}." - limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more." - remove_friend: - heading: "Unfriend %{user}?" - button: "Unfriend" - success: "%{name} was removed from your friends." - not_a_friend: "%{name} is not one of your friends." + follows: + show: + follow: + heading: "Do you want to follow %{user}?" + button: "Follow User" + unfollow: + heading: "Do you want to unfollow %{user}?" + button: "Unfollow User" + create: + success: "You are now following %{name}!" + failed: "Sorry, your request to follow %{name} has failed." + already_followed: "You already follow %{name}." + limit_exceeded: "You have followed a lot of users recently. Please wait a while before trying to follow any more." + destroy: + success: "You successfully unfollowed %{name}." + not_followed: "You are not following %{name}." geocoder: search: title: @@ -1489,9 +1512,11 @@ en: reports: Reports last_updated: Last Updated last_updated_time_ago_user_html: "%{time_ago} by %{user}" + reporter_users: Reporter Users reports_count: one: "%{count} Report" other: "%{count} Reports" + more_reporters: "and %{count} more" reported_item: Reported Item states: ignored: Ignored @@ -1625,32 +1650,33 @@ en: header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" - friendship_notification: + follow_notification: hi: "Hi %{to_user}," - subject: "[OpenStreetMap] %{user} added you as a friend" - had_added_you: "%{user} has added you as a friend on OpenStreetMap." + subject: "[OpenStreetMap] %{user} followed you" + followed_you: "%{user} is now following you on OpenStreetMap." see_their_profile: "You can see their profile at %{userurl}." see_their_profile_html: "You can see their profile at %{userurl}." - befriend_them: "You can also add them as a friend at %{befriendurl}." - befriend_them_html: "You can also add them as a friend at %{befriendurl}." - gpx_description: - description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" - description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" - description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags" - description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags" + follow_them: "You can also follow them at %{followurl}." + follow_them_html: "You can also follow them at %{followurl}." + gpx_details: + details: "Your file details:" + filename: Filename + url: URL + description: Description + tags: Tags + total_points: Total number of points + imported_points: Number of imported points gpx_failure: hi: "Hi %{to_user}," - failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:" - more_info: "More information about GPX import failures and how to avoid them can be found at %{url}." + failed_to_import: "It looks like your file failed to be imported as a GPS trace." + verify: "Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:" + more_info: "More information about GPX import failures and how to avoid them can be found at %{url}" more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}." import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures" subject: "[OpenStreetMap] GPX Import failure" gpx_success: hi: "Hi %{to_user}," - loaded: - one: "loaded successfully with %{trace_points} out of a possible %{count} point." - other: "loaded successfully with %{trace_points} out of a possible %{count} points." - trace_location: "Your trace is available at %{trace_url}" + imported_successfully: "It looks like your file was imported successfully as a GPS trace." all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}" all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}." subject: "[OpenStreetMap] GPX Import success" @@ -1759,14 +1785,17 @@ en: destroy_button: "Delete" back: "Back" wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it." - mark: - as_read: "Message marked as read" - as_unread: "Message marked as unread" - unmute: - notice: "Message has been moved to Inbox" - error: "The message could not be moved to the Inbox." destroy: destroyed: "Message deleted" + read_marks: + create: + notice: "Message marked as read" + destroy: + notice: "Message marked as unread" + mutes: + destroy: + notice: "Message has been moved to Inbox" + error: "The message could not be moved to the Inbox." mailboxes: heading: my_inbox: "My Inbox" @@ -1834,8 +1863,6 @@ en: preferences: show: title: My Preferences - preferred_editor: Preferred Editor - preferred_languages: Preferred Languages preferred_site_color_scheme: Preferred Website Color Scheme site_color_schemes: auto: Auto @@ -1846,11 +1873,7 @@ en: auto: Auto light: Light dark: Dark - edit_preferences: Edit Preferences - edit: - title: Edit Preferences save: Update Preferences - cancel: Cancel update: failure: Couldn't update preferences. update_success_flash: @@ -1924,6 +1947,9 @@ en: preview: Preview help: Help pagination: + changeset_comments: + older: Older Comments + newer: Newer Comments diary_comments: older: Older Comments newer: Newer Comments @@ -2592,13 +2618,14 @@ en: offline: heading: "GPX Storage Offline" message: "The GPX file storage and upload system is currently unavailable." - georss: - title: "OpenStreetMap GPS Traces" - description: - description_with_count: - one: "GPX file with %{count} point from %{user}" - other: "GPX file with %{count} points from %{user}" - description_without_count: "GPX file from %{user}" + feeds: + show: + title: "OpenStreetMap GPS Traces" + description: + description_with_count: + one: "GPX file with %{count} point from %{user}" + other: "GPX file with %{count} points from %{user}" + description_without_count: "GPX file from %{user}" application: permission_denied: You do not have permission to access that action require_cookies: @@ -2662,7 +2689,7 @@ en: openid: Sign-in using OpenStreetMap read_prefs: Read user preferences write_prefs: Modify user preferences - write_diary: Create diary entries, comments and make friends + write_diary: Create diary entries and comments write_api: Modify the map read_gpx: Read private GPS traces write_gpx: Upload GPS traces @@ -2745,7 +2772,6 @@ en: contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms" contributor_terms: "contributor terms" continue: Sign Up - terms accepted: "Thanks for accepting the new contributor terms!" email_help: privacy_policy: privacy policy privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy @@ -2756,34 +2782,6 @@ en: consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain or: "or" use external auth: "or sign up with a third party" - terms: - title: "Terms" - heading: "Terms" - heading_ct: "Contributor terms" - read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button." - contributor_terms_explain: "This agreement governs the terms for your existing and future contributions." - read_ct: "I have read and agree to the above contributor terms" - tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text." - 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://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain - guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}" - readable_summary: human readable summary - informal_translations: informal translations - continue: "Continue" - declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" - cancel: "Cancel" - you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." - legale_select: "Country of residence:" - legale_names: - france: "France" - italy: "Italy" - rest_of_world: "Rest of the world" - terms_declined_flash: - terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. - terms_declined_link: this wiki page - terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: "No such user" heading: "The user %{user} does not exist" @@ -2810,8 +2808,8 @@ en: edits: Edits traces: Traces notes: Map Notes - remove as friend: Unfriend - add as friend: Add Friend + unfollow: Unfollow + follow: Follow mapper since: "Mapper since:" last map edit: "Last map edit:" no activity yet: "No activity yet" @@ -2886,6 +2884,26 @@ en: user: summary_html: "%{name} created from %{ip_address} on %{date}" summary_no_ip_html: "%{name} created on %{date}" + comments: + index: + heading_html: "%{user}'s Comments" + changesets: "Changesets" + diary_entries: "Diary entries" + no_comments: "No comments" + changeset_comments: + index: + title: "Changeset Comments added by %{user}" + page: + changeset: Changeset + when: When + comment: Comment + diary_comments: + index: + title: "Diary Comments added by %{user}" + page: + post: Post + when: When + comment: Comment suspended: title: Account Suspended heading: Account Suspended @@ -3079,9 +3097,19 @@ en: new: title: "New Note" intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." - anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} if you want to receive updates for your note." + anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} to receive updates for your note and help mappers resolve it." anonymous_warning_log_in: "log in" anonymous_warning_sign_up: "sign up" + counter_warning_html: "You have already posted at least %{x_anonymous_notes}, that's great for the community, thank you! Now we encourage you to %{contribute_by_yourself}, it is not that complicated, and %{community_can_help}." + x_anonymous_notes: + one: "%{count} anonymous note" + other: "%{count} anonymous notes" + counter_warning_guide_link: + text: "contribute by yourself" + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide + counter_warning_forum_link: + text: "the community can help you" + url: https://community.openstreetmap.org/ advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." add: Add Note new_readonly: @@ -3091,6 +3119,8 @@ en: showing_page: "Page %{page}" next: "Next" previous: "Previous" + not_found_message: + sorry: "Sorry, note #%{id} could not be found." javascripts: close: Close share: