yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/dev' into v10/dev

Browse Source 
# Conflicts:
#	src/Directory.Build.props
#	templates/UmbracoPackage/.template.config/template.json
#	templates/UmbracoProject/.template.config/template.json
This commit is contained in:
Bjarke Berg
2022-05-02 11:42:00 +02:00
parent 2c3953ae19 bb9fc9b4d8
commit 58cbeac39d
9 changed files with 102 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -2870,5 +2870,29 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<area alias="analytics">
<key alias="consentForAnalytics">Consent for analytics</key>
<key alias="analyticsLevelSavedSuccess">Analytics level saved!</key>
<key alias="analyticsDescription">
<![CDATA[
In order to improve Umbraco and add new functionality based on as relevant information as possible,
<br>we would like to collect system- and usage information from your installation.
<br>Aggregate data will be shared on a regular basis as well as learnings from these metrics.
<br>Hopefully, you will help us collect some valuable data.
<br>
<br>We <b>WILL NOT</b> collect any personal data such as content, code, user information, and all data will be fully anonymized.
]]>
</key>
<key alias="minimalLevelDescription">We will only send an anonymized site ID to let us know that the site exists.</key>
<key alias="basicLevelDescription">We will send an anonymized site ID, umbraco version, and packages installed</key>
<key alias="detailedLevelDescription">
<![CDATA[
<br> We will send:
<br>- Anonymized site ID, umbraco version, and packages installed.
<br>- Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.
<br>- System information: Webserver, server OS, server framework, server OS language, and database provider.
<br>- Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.
<br>
<br><i>We might change what we send on the Detailed level in the future. If so, it will be listed above.
<br>By choosing "Detailed" you agree to current and future anonymized information being collected.</i>
]]>
</key>
</area>
</language>