From 12fc2d9146bdab54745777145e458a7afc62d850 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Mon, 11 Apr 2022 11:42:04 +0000 Subject: [PATCH] Administration: Remove self-reference ("we") in WordPress Admin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes updates many strings to remove self-references to an undefined "we" collective across the WordPress Administration. The goal of this change is 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. Props johnbillion, shital-patel, audrasjb, marybaum, SergeyBiryukov, peterwilsoncc, johnjamesjacoby, kebbet, costdev, chaion07, davidbaumwald. Fixes #46057. Built from https://develop.svn.wordpress.org/trunk@53131 git-svn-id: http://core.svn.wordpress.org/trunk@52720 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 2 +- wp-admin/export.php | 2 +- wp-admin/freedoms.php | 2 +- wp-admin/includes/class-core-upgrader.php | 2 +- .../includes/class-language-pack-upgrader.php | 2 +- .../includes/class-wp-automatic-updater.php | 4 ++-- .../class-wp-privacy-policy-content.php | 2 +- wp-admin/includes/class-wp-upgrader.php | 2 +- wp-admin/includes/dashboard.php | 2 +- wp-admin/includes/update-core.php | 2 +- wp-admin/network/settings.php | 2 +- wp-admin/network/upgrade.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-privacy.php | 4 ++-- wp-admin/privacy-policy-guide.php | 2 +- wp-admin/setup-config.php | 6 +++--- wp-admin/upgrade.php | 2 +- wp-admin/user-edit.php | 2 +- wp-includes/class-wp-xmlrpc-server.php | 2 +- wp-includes/ms-functions.php | 2 +- wp-includes/theme.json | 17 ++++++++--------- wp-includes/version.php | 2 +- .../widgets/class-wp-widget-media-audio.php | 2 +- .../widgets/class-wp-widget-media-image.php | 2 +- .../widgets/class-wp-widget-media-video.php | 4 ++-- wp-includes/widgets/class-wp-widget-media.php | 2 +- wp-includes/wp-db.php | 6 +++--- wp-load.php | 2 +- wp-signup.php | 2 +- wp-trackback.php | 2 +- 30 files changed, 44 insertions(+), 45 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 42f0d49cc4..907a760e6e 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -448,7 +448,7 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create

-

+

diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index 191be48009..3d9389f1b1 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -96,7 +96,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' ); printf( /* translators: 1: URL to Plugins screen, 2: URL to Themes screen, 3: https://wordpress.org/about/license/ */ - __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they do not respect the WordPress license, we do not recommend them.' ), + __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they do not respect the WordPress license, it is not recommended to use them.' ), $plugins_url, $themes_url, __( 'https://wordpress.org/about/license/' ) diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index 4017c51887..0f7ccf0fb8 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -157,7 +157,7 @@ class Core_Upgrader extends WP_Upgrader { if ( ! $wp_filesystem->copy( $working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true ) ) { $wp_filesystem->delete( $working_dir, true ); WP_Upgrader::release_lock( 'core_updater' ); - return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' ); + return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' ); } $wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE ); diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php index 2ac6e76329..c219999569 100644 --- a/wp-admin/includes/class-language-pack-upgrader.php +++ b/wp-admin/includes/class-language-pack-upgrader.php @@ -110,7 +110,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { * @since 3.7.0 */ public function upgrade_strings() { - $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' ); + $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while they are updated as well.' ); $this->strings['up_to_date'] = __( 'Your translations are all up to date.' ); $this->strings['no_package'] = __( 'Update package not available.' ); /* translators: %s: Package URL. */ diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php index c663b7a081..ed384da57f 100644 --- a/wp-admin/includes/class-wp-automatic-updater.php +++ b/wp-admin/includes/class-wp-automatic-updater.php @@ -778,7 +778,7 @@ class WP_Automatic_Updater { // Don't show this message if there is a newer version available. // Potential for confusion, and also not useful for them to know at this point. if ( 'fail' === $type && ! $newer_version_available ) { - $body .= __( 'We tried but were unable to update your site automatically.' ) . ' '; + $body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' '; } $body .= __( 'Updating is easy and only takes a few moments:' ); @@ -844,7 +844,7 @@ class WP_Automatic_Updater { $body .= "\n***\n\n"; /* translators: %s: WordPress version. */ $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) ); - $body .= ' ' . __( 'We have some data that describes the error your site encountered.' ); + $body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' ); $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' ); // If we had a rollback and we're still critical, then the rollback failed too. diff --git a/wp-admin/includes/class-wp-privacy-policy-content.php b/wp-admin/includes/class-wp-privacy-policy-content.php index 54e5326ccb..bbc46c0a70 100644 --- a/wp-admin/includes/class-wp-privacy-policy-content.php +++ b/wp-admin/includes/class-wp-privacy-policy-content.php @@ -591,7 +591,7 @@ final class WP_Privacy_Policy_Content { } /* translators: Default privacy policy heading. */ - $strings[] = '

' . __( 'Where we send your data' ) . '

'; + $strings[] = '

' . __( 'Where your data is sent' ) . '

'; if ( $description ) { /* translators: Privacy policy tutorial. */ diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 38db50e09d..3fe1007504 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -162,7 +162,7 @@ class WP_Upgrader { $this->strings['folder_exists'] = __( 'Destination folder already exists.' ); $this->strings['mkdir_failed'] = __( 'Could not create directory.' ); $this->strings['incompatible_archive'] = __( 'The package could not be installed.' ); - $this->strings['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.' ); + $this->strings['files_not_writable'] = __( 'The update can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' ); $this->strings['maintenance_start'] = __( 'Enabling Maintenance mode…' ); $this->strings['maintenance_end'] = __( 'Disabling Maintenance mode…' ); diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 0b6a746e6c..6d8928c2cb 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1414,7 +1414,7 @@ function wp_print_community_events_templates() { * that they match the expected location before including them. * Use endonyms (native locale names) whenever possible. */ - __( 'We could not locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), + __( '%s could not be located. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), '{{data.unknownCity}}' ); ?> diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 3fcd009bcc..16a99a4737 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -994,7 +994,7 @@ function update_core( $from, $to ) { return 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 can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' ); } diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index fb19673e15..75c13ae863 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -162,7 +162,7 @@ if ( isset( $_GET['updated'] ) ) {

- The new address will not become active until confirmed.' ); ?> + The new address will not become active until confirmed.' ); ?>

-

+

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index dfc396f8d2..3ca49523cd 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -111,7 +111,7 @@ if ( ! is_multisite() ) { -

The new address will not become active until confirmed.' ); ?>

+

The new address will not become active until confirmed.' ); ?>

- - + +

-

+

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 979f6e546e..bd3ec1d0b0 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -158,7 +158,7 @@ switch ( $step ) { } ?>

-

+

    3. @@ -170,7 +170,7 @@ switch ( $step ) { wp-config.php' ); ?> @@ -187,7 +187,7 @@ switch ( $step ) { We got it.' ), + __( 'Need more help? Read the support article on wp-config.php.' ), __( 'https://wordpress.org/support/article/editing-wp-config-php/' ) ); ?> diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 32eefd73d0..716b8cdc33 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -137,7 +137,7 @@ else : } ?>

    -

    +

    user_email ); ?>" class="regular-text ltr" /> ID === $current_user->ID ) : ?>

    - The new address will not become active until confirmed.' ); ?> + The new address will not become active until confirmed.' ); ?>

    diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index e33f6554ce..c920adb3a0 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -6963,7 +6963,7 @@ class wp_xmlrpc_server extends IXR_Server { preg_match( '|([^<]*?)|is', $remote_source, $matchtitle ); $title = isset( $matchtitle[1] ) ? $matchtitle[1] : ''; if ( empty( $title ) ) { - return $this->pingback_error( 32, __( 'We cannot find a title on that page.' ) ); + return $this->pingback_error( 32, __( 'A title on that page can not be found.' ) ); } // Remove all script and style tags including their content. diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 9e99f7f1a6..184c56fd7f 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -490,7 +490,7 @@ function wpmu_validate_user_signup( $user_name, $user_email ) { if ( ! is_email( $user_email ) ) { $errors->add( 'user_email', __( 'Please enter a valid email address.' ) ); } elseif ( is_email_address_unsafe( $user_email ) ) { - $errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) ); + $errors->add( 'user_email', __( 'You cannot use that email address to signup. There are problems with them blocking some emails from WordPress. Please use another email provider.' ) ); } if ( strlen( $user_name ) < 4 ) { diff --git a/wp-includes/theme.json b/wp-includes/theme.json index 9a23d1268a..5c1404ccdd 100644 --- a/wp-includes/theme.json +++ b/wp-includes/theme.json @@ -13,47 +13,46 @@ "custom": true, "customDuotone": true, "customGradient": true, - "defaultDuotone": true, "defaultGradients": true, "defaultPalette": true, "duotone": [ { - "name": "Dark grayscale", + "name": "Dark grayscale" , "colors": [ "#000000", "#7f7f7f" ], "slug": "dark-grayscale" }, { - "name": "Grayscale", + "name": "Grayscale" , "colors": [ "#000000", "#ffffff" ], "slug": "grayscale" }, { - "name": "Purple and yellow", + "name": "Purple and yellow" , "colors": [ "#8c00b7", "#fcff41" ], "slug": "purple-yellow" }, { - "name": "Blue and red", + "name": "Blue and red" , "colors": [ "#000097", "#ff4747" ], "slug": "blue-red" }, { - "name": "Midnight", + "name": "Midnight" , "colors": [ "#000000", "#00a5ff" ], "slug": "midnight" }, { - "name": "Magenta and yellow", + "name": "Magenta and yellow" , "colors": [ "#c7005a", "#fff278" ], "slug": "magenta-yellow" }, { - "name": "Purple and green", + "name": "Purple and green" , "colors": [ "#a60072", "#67ff66" ], "slug": "purple-green" }, { - "name": "Blue and orange", + "name": "Blue and orange" , "colors": [ "#1900d8", "#ffa96b" ], "slug": "blue-orange" } diff --git a/wp-includes/version.php b/wp-includes/version.php index 58a6d6a13f..050851804b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-53130'; +$wp_version = '6.0-alpha-53131'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-media-audio.php b/wp-includes/widgets/class-wp-widget-media-audio.php index 719959ea7c..6500ef9d7c 100644 --- a/wp-includes/widgets/class-wp-widget-media-audio.php +++ b/wp-includes/widgets/class-wp-widget-media-audio.php @@ -41,7 +41,7 @@ class WP_Widget_Media_Audio extends WP_Widget_Media { 'edit_media' => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ), 'missing_attachment' => sprintf( /* translators: %s: URL to media library. */ - __( 'We cannot find that audio file. Check your media library and make sure it was not deleted.' ), + __( 'That audio file can not be found. Check your media library and make sure it was not deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), /* translators: %d: Widget count. */ diff --git a/wp-includes/widgets/class-wp-widget-media-image.php b/wp-includes/widgets/class-wp-widget-media-image.php index 9fe3f1962d..e05f9d73d4 100644 --- a/wp-includes/widgets/class-wp-widget-media-image.php +++ b/wp-includes/widgets/class-wp-widget-media-image.php @@ -41,7 +41,7 @@ class WP_Widget_Media_Image extends WP_Widget_Media { 'edit_media' => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ), 'missing_attachment' => sprintf( /* translators: %s: URL to media library. */ - __( 'We cannot find that image. Check your media library and make sure it was not deleted.' ), + __( 'That image can not be found. Check your media library and make sure it was not deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), /* translators: %d: Widget count. */ diff --git a/wp-includes/widgets/class-wp-widget-media-video.php b/wp-includes/widgets/class-wp-widget-media-video.php index ef2386eac2..2800a25a69 100644 --- a/wp-includes/widgets/class-wp-widget-media-video.php +++ b/wp-includes/widgets/class-wp-widget-media-video.php @@ -41,14 +41,14 @@ class WP_Widget_Media_Video extends WP_Widget_Media { 'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ), 'missing_attachment' => sprintf( /* translators: %s: URL to media library. */ - __( 'We cannot find that video. Check your media library and make sure it was not deleted.' ), + __( 'That video can not be found. Check your media library and make sure it was not deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), /* translators: %d: Widget count. */ 'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ), 'media_library_state_single' => __( 'Video Widget' ), /* translators: %s: A list of valid video file extensions. */ - 'unsupported_file_type' => sprintf( __( 'Sorry, we cannot load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '.' . implode( ', .', wp_get_video_extensions() ) . '' ), + 'unsupported_file_type' => sprintf( __( 'Sorry, the video at the supplied URL can not be loaded. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '.' . implode( ', .', wp_get_video_extensions() ) . '' ), ) ); } diff --git a/wp-includes/widgets/class-wp-widget-media.php b/wp-includes/widgets/class-wp-widget-media.php index e370afdd64..2fa3cf986f 100644 --- a/wp-includes/widgets/class-wp-widget-media.php +++ b/wp-includes/widgets/class-wp-widget-media.php @@ -74,7 +74,7 @@ abstract class WP_Widget_Media extends WP_Widget { 'add_to_widget' => __( 'Add to Widget' ), 'missing_attachment' => sprintf( /* translators: %s: URL to media library. */ - __( 'We cannot find that file. Check your media library and make sure it was not deleted.' ), + __( 'That file can not be found. Check your media library and make sure it was not deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), /* translators: %d: Widget count. */ diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 30f9086545..28575f2872 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1186,7 +1186,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: %s: Database name. */ - __( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ), + __( 'The database server could be connected to (which means your username and password is okay) but the %s database could not be selected.' ), '' . htmlspecialchars( $db, ENT_QUOTES ) . '' ) . "

    \n"; @@ -1802,7 +1802,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: 1: wp-config.php, 2: Database host. */ - __( 'This either means that the username and password information in your %1$s file is incorrect or we cannot contact the database server at %2$s. This could mean your host’s database server is down.' ), + __( 'This either means that the username and password information in your %1$s file is incorrect or that contact with the database server at %2$s could not be established. This could mean your host’s database server is down.' ), 'wp-config.php', '' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '' ) . "

    \n"; @@ -1961,7 +1961,7 @@ class wpdb { $message .= '

    ' . sprintf( /* translators: %s: Database host. */ - __( 'This means that we lost contact with the database server at %s. This could mean your host’s database server is down.' ), + __( 'This means that the contact with the database server at %s was lost. This could mean your host’s database server is down.' ), '' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '' ) . "

    \n"; diff --git a/wp-load.php b/wp-load.php index 2c20055f15..b583f40240 100644 --- a/wp-load.php +++ b/wp-load.php @@ -92,7 +92,7 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) ) { ) . '

    '; $die .= '

    ' . sprintf( /* translators: %s: Documentation URL. */ - __( "Need more help? We got it." ), + __( "Need more help? Read the support article on wp-config.php." ), __( 'https://wordpress.org/support/article/editing-wp-config-php/' ) ) . '

    '; $die .= '

    ' . sprintf( diff --git a/wp-signup.php b/wp-signup.php index 99b128d827..5524a43e51 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -271,7 +271,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) { ?>

    -
    +
    get_error_message( 'generic' ); if ( $errmsg ) { diff --git a/wp-trackback.php b/wp-trackback.php index 3d4f6056f5..7da8cdd16f 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -127,7 +127,7 @@ if ( ! empty( $tb_url ) && ! empty( $title ) ) { $dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) ); if ( $dupe ) { - trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) ); + trackback_response( 1, __( 'There is already a ping from that URL for this post.' ) ); } $commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' );