WordPress.org

Make WordPress Core

Ticket #43473: 43473.6.patch

File 43473.6.patch, 14.6 KB (added by macbookandrew, 3 years ago)

Fixes a couple more inconsistencies

  • src/wp-admin/includes/misc.php

     
    16421642                $content =
    16431643                        '<div contenteditable="false">' .
    16441644                                '<p class="wp-policy-help">' . __( 'Hello,' ) . '</p>' .
    1645                                 '<p class="wp-policy-help">' . __( 'This text template will help you to create your web site&#8217;s privacy policy.' ) . '</p>' .
     1645                                '<p class="wp-policy-help">' . __( 'This text template will help you to create your website&#8217;s privacy policy.' ) . '</p>' .
    16461646                                '<p class="wp-policy-help">' . __( 'We have suggested the sections you will need. Under each section heading you will find a short description of what information you should provide, in italics, which will help you to get started.' ) . '</p>' .
    16471647                                '<p class="wp-policy-help">' . __( 'Please edit your privacy policy content, making sure to delete the descriptions, and adding any information from your themes and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ) . '</p>' .
    16481648                                '<p class="wp-policy-help">' . __( '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>' .
     
    16511651
    16521652                        '<h2>' . __( 'Who we are' ) . '</h2>' .
    16531653                        '<div contenteditable="false">' .
    1654                                 '<p class="wp-policy-help">' . __( 'In this section you should note your site URL, as well as the name of the company, organisation, or individual behind it, and some accurate contact information.' ) . '</p>' .
     1654                                '<p class="wp-policy-help">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
    16551655                                '<p class="wp-policy-help">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>' .
    16561656                        '</div>' .
    16571657                        '<p>' . __( 'Our website address is: $1%s.' ) . '</p>' .
     
    16621662                                '<p class="wp-policy-help">' . __( 'You must also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
    16631663                                '<p class="wp-policy-help">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
    16641664                                '<p class="wp-policy-help">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
    1665                                 '<p class="wp-policy-help">' . __( 'By default WprdPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen fro registered users. However some of your plugins may collect personal data, add the relevant information below.' ) . '</p>' .
     1665                                '<p class="wp-policy-help">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen for registered users. However, some of your plugins may also collect personal data, add the relevant information below.' ) . '</p>' .
    16661666                        '</div>' .
    16671667                        '<p>' . __( 'If you are a registered user and upload images to the website, you should avoid uploading images with EXIF GPS location data included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
    16681668
     
    16801680
    16811681                        '<h3>' . __( 'Cookies' ) . '</h3>' .
    16821682                        '<div contenteditable="false">' .
    1683                                 '<p class="wp-policy-help">' . __( '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>' .
     1683                                '<p class="wp-policy-help">' . __( '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>' .
    16841684                        '</div>' .
    1685                         '<p>' . __( '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>' .
     1685                        '<p>' . __( '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>' .
    16861686                        '<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
    1687                         '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
     1687                        '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &ldquo;Remember Me&rdquo;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
    16881688                        '<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p>' .
    16891689
    16901690                        '<h3>' . __( 'Embedded content from other websites' ) . '</h3>' .
    16911691                        '<p>' . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '</p>' .
    1692                         '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracing your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
     1692                        '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
    16931693
    16941694                        '<h3>' . __( 'Analytics' ) . '</h3>' .
    16951695                        '<div contenteditable="false">' .
     
    16991699
    17001700                        '<h2>' . __( 'Who we share your data with' ) . '</h2>' .
    17011701                        '<div contenteditable="false">' .
    1702                                 '<p class="wp-policy-help">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy notices if possible.' ) . '</p>' .
    1703                                 '<p class="wp-policy-help">' . __( 'By default WordPress does not share any personal data with anybody.' ) . '</p>' .
     1702                                '<p class="wp-policy-help">' . __( 'In this section you should name and list all third-party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy notices if possible.' ) . '</p>' .
     1703                                '<p class="wp-policy-help">' . __( 'By default, WordPress does not share any personal data with anybody.' ) . '</p>' .
    17041704                        '</div>' .
    17051705
    17061706                        '<h2>' . __( 'How long we retain your data' ) . '</h2>' .
    17071707                        '<div contenteditable="false">' .
    1708                                 '<p class="wp-policy-help">' . __( '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>' .
     1708                                '<p class="wp-policy-help">' . __( '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>' .
    17091709                        '</div>' .
    17101710                        '<p>' . __( '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>' .
    1711                         '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit or delete their personal information at any time except they cannot change their username. Web site administrators can also see and edit that information.' ) . '</p>' .
     1711                        '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
    17121712
    17131713                        '<h2>' . __( 'What rights you have over your data' ) . '</h2>' .
    17141714                        '<div contenteditable="false">' .
    17151715                                '<p class="wp-policy-help">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>' .
    17161716                        '</div>' .
    1717                         '<p>' . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we delete any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
     1717                        '<p>' . __( 'If you have an account or have left comments on this site, you can request to receive an export file of the personal data we hold about you, including any data you have provided to us. You can also request that we delete any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
    17181718
    17191719                        '<h2>' . __( 'Where we send your data' ) . '</h2>' .
    17201720                        '<div contenteditable="false">' .
    17211721                                '<p class="wp-policy-help">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
    1722                                 '<p class="wp-policy-help">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>' .
     1722                                '<p class="wp-policy-help">' . __( 'European data protection law requires that data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third-party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>' .
    17231723                        '</div>' .
    17241724                        '<p>' . __( 'Visitor comments may be checked through an automated spam detection service. This may be located abroad.' ) . '</p>' .
    17251725
     
    17451745
    17461746                        '<h3>' . __( 'What third parties we receive data from' ) . '</h3>' .
    17471747                        '<div contenteditable="false">' .
    1748                                 '<p class="wp-policy-help">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy notice dealing with third party data.' ) . '</p>' .
     1748                                '<p class="wp-policy-help">' . __( 'If your website receives data about users from third parties, including advertisers, this information must be included within the section of your privacy notice dealing with third party data.' ) . '</p>' .
    17491749                        '</div>' .
    17501750
    17511751                        '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>' .
    17521752                        '<div contenteditable="false">' .
    1753                                 '<p class="wp-policy-help">' . __( '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>' .
     1753                                '<p class="wp-policy-help">' . __( 'If your website provides a service which includes automated decision making&mdash;for example, allowing customers to apply for credit or aggregating their data into an advertising profile&mdash;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>' .
    17541754                        '</div>' .
    17551755
    17561756                        '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>' .