From: Tom Hughes Date: Wed, 8 Mar 2023 17:00:48 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3962' X-Git-Tag: live~1674 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9241d9810d39607acaef19bed6f69d8f3dd38220?ds=inline;hp=-c Merge remote-tracking branch 'upstream/pull/3962' --- 9241d9810d39607acaef19bed6f69d8f3dd38220 diff --combined config/locales/en.yml index 5045542ab,54404e583..ca1d313c8 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -52,6 -52,7 +52,6 @@@ en message: "Message" node: "Node" node_tag: "Node Tag" - notifier: "Notifier" old_node: "Old Node" old_node_tag: "Old Node Tag" old_relation: "Old Relation" @@@ -1398,6 -1399,10 +1398,6 @@@ ignored: Ignored open: Open resolved: Resolved - update: - new_report: Your report has been registered successfully - successful_update: Your report has been updated successfully - provide_details: Please provide the required details show: title: "%{status} Issue #%{issue_id}" reports: @@@ -1480,8 -1485,10 +1480,8 @@@ home: Go to Home Location logout: Log Out log_in: Log In - log_in_tooltip: Log in with an existing account sign_up: Sign Up start_mapping: Start Mapping - sign_up_tooltip: Create an account for editing edit: Edit history: History export: Export @@@ -1513,6 -1520,8 +1513,6 @@@ community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" - foundation: Foundation - foundation_title: The OpenStreetMap Foundation make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@@ -1627,7 -1636,8 +1627,8 @@@ success: "Confirmed your account, thanks for signing up!" already active: "This account has already been confirmed." unknown token: "That confirmation code has expired or does not exist." - reconfirm_html: "If you need us to resend the confirmation email, click here." + resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}." + click_here: click here confirm_resend: failure: "User %{name} not found." confirm_email: @@@ -1665,6 -1675,8 +1666,6 @@@ new: title: "Send message" send_message_to_html: "Send a new message to %{name}" - subject: "Subject" - body: "Body" back_to_inbox: "Back to inbox" create: message_sent: "Message sent" @@@ -1689,10 -1701,14 +1690,10 @@@ wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." show: title: "Read message" - from: "From" - subject: "Subject" - date: "Date" reply_button: "Reply" unread_button: "Mark as unread" destroy_button: "Delete" back: "Back" - to: "To" 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 login as the correct user in order to read it." sent_message_summary: destroy_button: "Delete" @@@ -1764,8 -1780,13 +1765,8 @@@ lost password link: "Lost your password?" login_button: "Login" register now: Register now - with username: "Already have an OpenStreetMap account? Please login with your username and password:" with external: "Alternatively, use a third party 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. no account: Don't have an account? - account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@@ -1803,7 -1824,9 +1804,9 @@@ support: support shared: markdown_help: - title_html: Parsed with kramdown + heading_html: Parsed with %{kramdown_link} + kramdown_url: https://kramdown.gettalong.org/quickref.html + kramdown: kramdown headings: Headings heading: Heading subheading: Subheading @@@ -1985,7 -2008,7 +1988,7 @@@ contributors_gb_html: | United Kingdom: Contains Ordnance Survey data © Crown copyright and database right - 2010-19. + 2010-2023. contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the copyright page for more legal information, or contact the appropriate - OSMF working group. + %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}. + copyright: copyright page + working_group: OSMF working group + working_group_url: https://wiki.osmfoundation.org/wiki/Working_Groups help: title: Getting Help introduction: | @@@ -2135,8 -2163,11 +2140,11 @@@ description: Browse the wiki for in-depth OpenStreetMap documentation. 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 preferences here. + desktop_application_html: You can still use Potlatch by %{download_link}. + download: downloading the desktop application for Mac and Windows + download_url: https://www.systemed.net/potlatch/ + id_editor_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. %{change_preferences_link}. + change_preferences: Change your preferences here any_questions: title: Any questions? paragraph_1_html: | @@@ -2301,11 -2332,12 +2309,12 @@@ The following communities are formally established as Local Chapters: other_groups: title: Other Groups - about_html: | + other_groups_html: | There is no need to formally establish a group to the same extent as the Local Chapters. Indeed many groups exist very sucessfully as an informal gathering of people or as a - community group. Anyone can set up or join these. Read more on the - Communities wiki page. + community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}. + communities_wiki: Communities wiki page + communities_wiki_url: https://wiki.openstreetmap.org/wiki/User_group traces: visibility: private: "Private (only shared as anonymous, unordered points)" @@@ -2552,6 -2584,9 +2561,6 @@@ header: Free and editable paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use. paragraph_2: Sign up to get started contributing. We'll send an email to confirm your account. - email address: "Email Address:" - confirm email address: "Confirm Email Address:" - display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" use external auth: "Alternatively, use a third party to login" @@@ -2570,7 -2605,9 +2579,9 @@@ 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://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' + 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" decline: "Decline" @@@ -2591,6 -2628,7 +2602,6 @@@ deleted: "deleted" show: my diary: My Diary - new diary entry: new diary entry my edits: My Edits my traces: My Traces my notes: My Notes @@@ -2619,6 -2657,8 +2630,6 @@@ created from: "Created from:" status: "Status:" spam score: "Spam Score:" - description: Description - user location: User location role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@@ -2633,6 -2673,7 +2644,6 @@@ comments: "Comments" create_block: "Block this User" 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" @@@ -2641,6 -2682,8 +2652,6 @@@ delete_user: "Delete this User" confirm: "Confirm" report: Report this User - set_home: - flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." index: @@@ -2660,6 -2703,7 +2671,6 @@@ support: support automatically_suspended: Sorry, your account has been automatically suspended due to suspicious activity. contact_support_html: This decision will be reviewed by an administrator shortly, or you may contact %{support_link} if you wish to discuss this. - support: support auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials @@@ -2705,6 -2749,8 +2716,6 @@@ title: "Creating block on %{name}" heading_html: "Creating block on %{name}" period: "How long, starting now, the user will be blocked from the API for." - tried_contacting: "I have contacted the user and asked them to stop." - tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications." back: "View all blocks" edit: title: "Editing block on %{name}" @@@ -2716,6 -2762,8 +2727,6 @@@ block_expired: "The block has already expired and cannot be edited." block_period: "The blocking period must be one of the values selectable in the drop-down list." create: - try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond." - try_waiting: "Please try giving the user a reasonable time to respond before blocking them." flash: "Created a block on user %{name}." update: only_creator_can_edit: "Only the moderator who created this block can edit it."