From: Tom Hughes Date: Thu, 17 Nov 2022 17:51:46 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3805' X-Git-Tag: live~1475 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/17e87ab67a88c165a11d67a4a8ecafa9bd7a376f?ds=sidebyside;hp=-c Merge remote-tracking branch 'upstream/pull/3805' --- 17e87ab67a88c165a11d67a4a8ecafa9bd7a376f diff --combined config/locales/en.yml index c0dcb0c5b,b2d3065cb..8a0651609 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -405,6 -405,7 +405,7 @@@ en wikimedia_commons_link: "The %{page} item on Wikimedia Commons" telephone_link: "Call %{phone_number}" colour_preview: "Colour %{colour_value} preview" + email_link: "Email %{email}" note: title: "Note: %{id}" new_note: "New Note" @@@ -446,7 -447,6 +447,7 @@@ index: title: "Changesets" title_user: "Changesets by %{user}" + title_user_link_html: "Changesets by %{user_link}" title_friend: "Changesets by my friends" title_nearby: "Changesets by nearby users" empty: "No changesets found." @@@ -1783,6 -1783,7 +1784,6 @@@ 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." - account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact support if you wish to discuss this. auth failure: "Sorry, could not log in with those details." openid_logo_alt: "Log in with an OpenID" auth_providers: @@@ -1814,10 -1815,6 +1815,10 @@@ title: "Logout" heading: "Logout from OpenStreetMap" logout_button: "Logout" + suspended_flash: + suspended: Sorry, your account has been suspended due to suspicious activity. + contact_support_html: Please contact %{support_link} if you wish to discuss this. + support: support shared: markdown_help: title_html: Parsed with kramdown