From d93f38e3609f20756fad2bbf7fd41d98bdbb8d7e Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 20 Jan 2025 22:04:28 +0000 Subject: [PATCH] Administration: Clarify some references to "we" and "our" in the administration area. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes some text to better match the guidelines and recommendations set forth in the make/core handbook, specifically: > the word “we” should be avoided (...) unless its made very clear which group is speaking Fixes #62295 Built from https://develop.svn.wordpress.org/trunk@59667 git-svn-id: http://core.svn.wordpress.org/trunk@59010 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/freedoms.php | 2 +- wp-admin/includes/class-wp-privacy-policy-content.php | 2 +- wp-admin/options-privacy.php | 2 +- wp-admin/privacy.php | 4 ++-- wp-includes/version.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index 4846b9b9ba..5b9564ecfd 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -85,7 +85,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; check out our trademark guidelines first.' ), + __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. The WordPress community is flattered every time someone spreads the good word, just make sure to check out the WordPress Foundation trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?> diff --git a/wp-admin/includes/class-wp-privacy-policy-content.php b/wp-admin/includes/class-wp-privacy-policy-content.php index 04aee97aac..724a0dcf64 100644 --- a/wp-admin/includes/class-wp-privacy-policy-content.php +++ b/wp-admin/includes/class-wp-privacy-policy-content.php @@ -333,7 +333,7 @@ final class WP_Privacy_Policy_Content { return; } - $message = __( 'Need help putting together your new Privacy Policy page? Check out our guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' ); + $message = __( 'Need help putting together your new Privacy Policy page? Check out the guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' ); $url = esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ); $label = __( 'View Privacy Policy Guide.' ); diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index 92de2ca9b9..33e59b4601 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -236,7 +236,7 @@ wp_admin_notice( } printf( /* translators: 1: Privacy Policy guide URL, 2: Additional link attributes, 3: Accessibility text. */ - __( 'Need help putting together your new Privacy Policy page? Check out our privacy policy guide%3$s for recommendations on what content to include, along with policies suggested by your plugins and theme.' ), + __( 'Need help putting together your new Privacy Policy page? Check out the privacy policy guide%3$s for recommendations on what content to include, along with policies suggested by your plugins and theme.' ), esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ), '', '' diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php index 88d2975f17..813cea213d 100644 --- a/wp-admin/privacy.php +++ b/wp-admin/privacy.php @@ -26,7 +26,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
- +
@@ -59,7 +59,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; our Privacy Policy.' ), + __( 'WordPress.org takes privacy and transparency very seriously. To learn more about what data is collected, and how it is used, please visit the WordPress.org Privacy Policy.' ), __( 'https://wordpress.org/about/privacy/' ) ); ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 8f17c05ae7..cdb5f8cfa0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-alpha-59666'; +$wp_version = '6.8-alpha-59667'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.