From 7b14bdbec06a9b7b99fa30c4d7c9a6861cd4034d Mon Sep 17 00:00:00 2001 From: audrasjb Date: Mon, 19 Sep 2022 08:59:11 +0000 Subject: [PATCH] Text Changes: Remove self-reference ("we") in WordPress Admin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes some admin-area, user-facing 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 Follow-up to [51979], [53131], [53132], [53148], [53156]. Props kebbet, costdev, SergeyBiryukov. Fixes #55758. See #46057. Built from https://develop.svn.wordpress.org/trunk@54200 git-svn-id: http://core.svn.wordpress.org/trunk@53759 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-automatic-updater.php | 2 +- wp-admin/includes/class-wp-site-health-auto-updates.php | 4 ++-- wp-admin/includes/update-core.php | 4 ++-- wp-includes/version.php | 2 +- wp-load.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php index e453539deb..b23545dd60 100644 --- a/wp-admin/includes/class-wp-automatic-updater.php +++ b/wp-admin/includes/class-wp-automatic-updater.php @@ -830,7 +830,7 @@ class WP_Automatic_Updater { } if ( $critical_support ) { - $body .= ' ' . __( "If you reach out to us, we'll also ensure you'll never have this problem again." ); + $body .= ' ' . __( "Reach out to WordPress Core developers to ensure you'll never have this problem again." ); } // If things are successful and we're now on the latest, mention plugins and themes if any are out of date. diff --git a/wp-admin/includes/class-wp-site-health-auto-updates.php b/wp-admin/includes/class-wp-site-health-auto-updates.php index 4880d02302..335c89ed46 100644 --- a/wp-admin/includes/class-wp-site-health-auto-updates.php +++ b/wp-admin/includes/class-wp-site-health-auto-updates.php @@ -167,7 +167,7 @@ class WP_Site_Health_Auto_Updates { if ( ! empty( $failed['critical'] ) ) { $description = __( 'A previous automatic background update ended with a critical failure, so updates are now disabled.' ); $description .= ' ' . __( 'You would have received an email because of this.' ); - $description .= ' ' . __( "When you've been able to update using the \"Update now\" button on Dashboard > Updates, we'll clear this error for future update attempts." ); + $description .= ' ' . __( "When you've been able to update using the \"Update now\" button on Dashboard > Updates, this error will be cleared for future update attempts." ); $description .= ' ' . sprintf( /* translators: %s: Code of error shown. */ __( 'The error code was %s.' ), @@ -184,7 +184,7 @@ class WP_Site_Health_Auto_Updates { $description .= ' ' . __( 'You would have received an email because of this.' ); } - $description .= ' ' . __( "We'll try again with the next release." ); + $description .= ' ' . __( "Another attempt will be made with the next release." ); $description .= ' ' . sprintf( /* translators: %s: Code of error shown. */ __( 'The error code was %s.' ), diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index adc32de5b9..cef7ef35f1 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -1168,7 +1168,7 @@ function update_core( $from, $to ) { if ( $files_not_writable ) { return new WP_Error( 'files_not_writable', - __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), + __( 'The update cannot be installed because your site is unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) ); } @@ -1204,7 +1204,7 @@ function update_core( $from, $to ) { $wp_filesystem->delete( $from, true ); $result = new WP_Error( 'copy_failed_for_version_file', - __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), + __( 'The update cannot be installed because your site is unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 6dfeee437a..25900cde1c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-54199'; +$wp_version = '6.1-alpha-54200'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-load.php b/wp-load.php index c813cba56e..9e8241fef5 100644 --- a/wp-load.php +++ b/wp-load.php @@ -87,7 +87,7 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) ) { // Die with an error message. $die = '

' . sprintf( /* translators: %s: wp-config.php */ - __( "There doesn't seem to be a %s file. I need this before we can get started." ), + __( "There doesn't seem to be a %s file. It is needed before the installation can continue." ), 'wp-config.php' ) . '

'; $die .= '

' . sprintf(