X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/47e585f94fe77566bd2235b5052038313c7fb483..605703cdacaaf2160be334b759cdd7a8f6a85f65:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 9db476748..c2815d142 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,7 +21,7 @@ en: client_application: create: Register update: Update - doorkeeper_application: + oauth2_application: create: Register update: Update redaction: @@ -405,6 +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,6 +447,7 @@ en: 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." @@ -1436,6 +1438,7 @@ en: issue_comments: create: comment_created: Your comment was successfully created + issue_reassigned: Your comment was created and the issue was reassigned reports: new: title_html: "Report %{link}" @@ -1512,6 +1515,7 @@ en: help: Help about: About copyright: Copyright + communities: Communities community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" @@ -1781,7 +1785,6 @@ en: 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: @@ -1813,6 +1816,10 @@ en: 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 @@ -1912,13 +1919,13 @@ en:
  • Make clear that the data is available under the Open Database License.
    • credit_3_1_html: | - For the copyright notice, we have different requirements on how this should be - displayed, depending on how you are using our data. For example, different - rules apply on how to show the copyright notice depending on whether you have - created a browsable map, a printed map or a static image. Full details on the - requirements can be found in the - Attribution - Guidelines. + For the copyright notice, we have different requirements on how this should be + displayed, depending on how you are using our data. For example, different + rules apply on how to show the copyright notice depending on whether you have + created a browsable map, a printed map or a static image. Full details on the + requirements can be found in the + Attribution + Guidelines. credit_4_html: | To make clear that the data is available under the Open Database License, you may link to @@ -2124,8 +2131,12 @@ en: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: url: https://forum.openstreetmap.org/ - title: Forums + title: Forums (Legacy) description: Questions and discussions for those that prefer a bulletin board style interface. + community: + url: https://community.openstreetmap.org/ + title: Community forum + description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC @@ -2283,6 +2294,30 @@ en: Just go to the map and click the note icon: . This will add a marker to the map, which you can move by dragging. Add your message, then click save, and other mappers will investigate. + communities: + title: Communities + lede_text: | + People from all over the world contribute to or use OpenStreetMap. + While many participate as individuals, others have formed communities. + These groups come in a range of sizes and represent geographies from small towns to large multi-country regions. + They can also be formal or informal. + local_chapters: + title: Local Chapters + about_text: | + Local Chapters are country-level or region-level groups that have taken the formal step of + establishing not-for-profit legal entities. They represent the area's map and mappers when + dealing with local government, business, and media. They have also formed an affiliation + with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright + governing body. + list_text: | + The following communities are formally established as Local Chapters: + other_groups: + title: Other Groups + about_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. traces: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -2519,7 +2554,8 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_support_html: 'Please contact support to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + support: support about: header: Free and editable html: | @@ -2641,15 +2677,9 @@ en: title: Account Suspended heading: Account Suspended support: support - body_html: | -

    - Sorry, your account has been automatically suspended due to - suspicious activity. -

    -

    - This decision will be reviewed by an administrator shortly, or - you may contact %{webmaster} if you wish to discuss this. -

    + 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 @@ -2883,7 +2913,10 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment - report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment." + report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." + other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." + other_problems_resolved: "For all other problems, resolving is sufficient." + disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend"