Text Changes: Update mentions of “web site” to “website” for consistency.
While “web site” was the original spelling, this variant has become rarely used, and “website” is now the standard spelling, already used throughout most of the WordPress core. Reference: [https://en.wikipedia.org/wiki/Website Wikipedia: Website]. Props LiamMcArthur, cafenoirdesign, sabbirshouvo, sabernhardt, ironprogrammer, mukesh27. Fixes #59853, #54276. Built from https://develop.svn.wordpress.org/trunk@57131 git-svn-id: http://core.svn.wordpress.org/trunk@56642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
parent
dd3b952a10
commit
a0504e8091
|
|
@ -529,7 +529,7 @@ final class WP_Privacy_Policy_Content {
|
|||
|
||||
if ( $description ) {
|
||||
/* translators: Privacy policy tutorial. */
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your website uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
|
||||
} else {
|
||||
/* translators: Default privacy policy text. */
|
||||
$strings[] = '<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>';
|
||||
|
|
@ -577,7 +577,7 @@ final class WP_Privacy_Policy_Content {
|
|||
|
||||
if ( $description ) {
|
||||
/* translators: Privacy policy tutorial. */
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the website. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
|
||||
} else {
|
||||
/* translators: Default privacy policy text. */
|
||||
$strings[] = '<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>';
|
||||
|
|
@ -641,14 +641,14 @@ final class WP_Privacy_Policy_Content {
|
|||
/* translators: Default privacy policy heading. */
|
||||
$strings[] = '<h2>' . __( 'What third parties we receive data from' ) . '</h2>';
|
||||
/* translators: Privacy policy tutorial. */
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your website receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
|
||||
}
|
||||
|
||||
if ( $description ) {
|
||||
/* translators: Default privacy policy heading. */
|
||||
$strings[] = '<h2>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h2>';
|
||||
/* translators: Privacy policy tutorial. */
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
|
||||
$strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your website provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
|
||||
}
|
||||
|
||||
if ( $description ) {
|
||||
|
|
|
|||
|
|
@ -1008,7 +1008,7 @@ $_new_bundled_files = array(
|
|||
* Upgrades the core of WordPress.
|
||||
*
|
||||
* This will create a .maintenance file at the base of the WordPress directory
|
||||
* to ensure that people can not access the web site, when the files are being
|
||||
* to ensure that people can not access the website, when the files are being
|
||||
* copied to their locations.
|
||||
*
|
||||
* The files in the `$_old_files` list will be removed and the new files
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ wp_admin_notice(
|
|||
<div class="privacy-settings-body hide-if-no-js">
|
||||
<h2><?php _e( 'Privacy Policy Guide' ); ?></h2>
|
||||
<h3 class="section-title"><?php _e( 'Introduction' ); ?></h3>
|
||||
<p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
|
||||
<p><?php _e( 'The template contains a suggestion of sections you most likely will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
|
||||
<p><?php _e( 'This text template will help you to create your website’s privacy policy.' ); ?></p>
|
||||
<p><?php _e( 'The template contains a suggestion of sections you most likely will need. Under each section heading, you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
|
||||
<p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
|
||||
<p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
|
||||
<div class="privacy-settings-accordion">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* The base configuration for WordPress
|
||||
*
|
||||
* The wp-config.php creation script uses this file during the installation.
|
||||
* You don't have to use the web site, you can copy this file to "wp-config.php"
|
||||
* You don't have to use the website, you can copy this file to "wp-config.php"
|
||||
* and fill in the values.
|
||||
*
|
||||
* This file contains the following configurations:
|
||||
|
|
|
|||
|
|
@ -6109,7 +6109,7 @@ function iis7_supports_permalinks() {
|
|||
* easily update the xml configuration file, hence we just bail out and tell user that
|
||||
* pretty permalinks cannot be used.
|
||||
*
|
||||
* Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
|
||||
* Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the website. When
|
||||
* URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
|
||||
* Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
|
||||
* via ISAPI then pretty permalinks will not work.
|
||||
|
|
|
|||
|
|
@ -3443,7 +3443,7 @@ function wp_site_icon() {
|
|||
|
||||
/**
|
||||
* Prints resource hints to browsers for pre-fetching, pre-rendering
|
||||
* and pre-connecting to web sites.
|
||||
* and pre-connecting to websites.
|
||||
*
|
||||
* Gives hints to browsers to prefetch specific pages or render them
|
||||
* in the background, to perform DNS lookups or to begin the connection
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.5-alpha-57130';
|
||||
$wp_version = '6.5-alpha-57131';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue