Changeset 57112

Timestamp:

11/15/2023 05:35:35 PM (13 months ago)

Author:

jorbin

Message:

Help/About: Improve translation comment around release notes.

Reviewed by SergeyBiryukov.
Merges [57081] to the 6.4 branch.

Props kharisblank, kebbet.
Fixes #59821.

Location:

branches/6.4

Files:

• . (modified) (1 prop)
• src/js/_enqueues/vendor/colorpicker.js (modified) (1 diff)
• src/wp-admin/about.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-privacy-policy-content.php (modified) (4 diffs)
• src/wp-admin/includes/update-core.php (modified) (1 diff)
• src/wp-admin/privacy-policy-guide.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/general-template.php (modified) (1 diff)
• wp-config-sample.php (modified) (1 diff)

branches/6.4/src/js/_enqueues/vendor/colorpicker.js

@@ -6 +6 @@
 // private, without any further permission from the author. You may
 // remove this notice from your final code if you wish, however it is
-// appreciated by the author if at least my web site address is kept.
+// appreciated by the author if at least my website address is kept.
 //
 // You may *NOT* re-distribute this code in any way except through its

branches/6.4/src/wp-admin/about.php

@@ -273 +273 @@
                     <?php
                     printf(
-                        /* translators: %s: WordPress Field Guide link. */
+                        /* translators: 1: WordPress Field Guide link, 2: WordPress version number. */
                         __( 'Explore the <a href="%1$s">WordPress %2$s Field Guide</a>. Learn about the changes in this release with detailed developer notes to help you build with WordPress.' ),
                         __( 'https://make.wordpress.org/core/2023/10/23/wordpress-6-4-field-guide/' ),

branches/6.4/src/wp-admin/includes/class-wp-privacy-policy-content.php

@@ -530 +530 @@
         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. */
@@ -578 +578 @@
         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. */
@@ -642 +642 @@
             $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>';
         }
 
@@ -649 +649 @@
             $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>';
         }
 

branches/6.4/src/wp-admin/includes/update-core.php

@@ -1009 +1009 @@
  *
  * 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.
  *

branches/6.4/src/wp-admin/privacy-policy-guide.php

@@ -74 +74 @@
     <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&#8217;s privacy policy.' ); ?></p>
+    <p><?php _e( 'This text template will help you to create your website&#8217;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>

branches/6.4/src/wp-includes/functions.php

@@ -6108 +6108 @@
          * 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

branches/6.4/src/wp-includes/general-template.php

@@ -3444 +3444 @@
 /**
  * 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

branches/6.4/wp-config-sample.php

@@ -4 +4 @@
  *
  * 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.
  *