Administration: Remove self-reference ("we") in WordPress Admin.

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
This commit is contained in:
audrasjb 2022-04-11 11:42:04 +00:00
parent c6ad5a6945
commit 12fc2d9146
30 changed files with 44 additions and 45 deletions

View File

@ -448,7 +448,7 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create
<?php endif; ?>
<div id="lost-connection-notice" class="error hidden">
<p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you are reconnected.' ); ?>
<span class="hide-if-no-sessionstorage"><?php _e( 'We are backing up this post in your browser, just in case.' ); ?></span>
<span class="hide-if-no-sessionstorage"><?php _e( 'This post is being backed up in your browser, just in case.' ); ?></span>
</p>
</div>
<form name="post" action="post.php" method="post" id="post"

View File

@ -171,7 +171,7 @@ function export_date_options( $post_type = 'post' ) {
<h1><?php echo esc_html( $title ); ?></h1>
<p><?php _e( 'When you click the button below WordPress will create an XML file for you to save to your computer.' ); ?></p>
<p><?php _e( 'This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.' ); ?></p>
<p><?php _e( 'This format, which is called WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.' ); ?></p>
<p><?php _e( 'Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.' ); ?></p>
<h2><?php _e( 'Choose what to export' ); ?></h2>

View File

@ -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&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they do not respect the WordPress license, we do not recommend them.' ),
__( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> 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/' )

View File

@ -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 );

View File

@ -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. */

View File

@ -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.

View File

@ -591,7 +591,7 @@ final class WP_Privacy_Policy_Content {
}
/* translators: Default privacy policy heading. */
$strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
$strings[] = '<h2>' . __( 'Where your data is sent' ) . '</h2>';
if ( $description ) {
/* translators: Privacy policy tutorial. */

View File

@ -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&#8230;' );
$this->strings['maintenance_end'] = __( 'Disabling Maintenance mode&#8230;' );

View File

@ -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.' ),
'<em>{{data.unknownCity}}</em>'
);
?>

View File

@ -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'
);
}

View File

@ -162,7 +162,7 @@ if ( isset( $_GET['updated'] ) ) {
<td>
<input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ); ?>" />
<p class="description" id="admin-email-desc">
<?php _e( 'This address is used for admin purposes. If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
<?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</p>
<?php
$new_admin_email = get_site_option( 'new_admin_email' );

View File

@ -138,7 +138,7 @@ switch ( $action ) {
if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $GLOBALS['wp_db_version'] ) :
?>
<h2><?php _e( 'Database Update Required' ); ?></h2>
<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
<p><?php _e( 'WordPress has been updated! Next and final step is to individually upgrade the sites in your network.' ); ?></p>
<?php endif; ?>
<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>

View File

@ -111,7 +111,7 @@ if ( ! is_multisite() ) {
<tr>
<th scope="row"><label for="new_admin_email"><?php _e( 'Administration Email Address' ); ?></label></th>
<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
<?php
$new_admin_email = get_option( 'new_admin_email' );
if ( $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email ) :

View File

@ -189,8 +189,8 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ); ?>
</p>
<p>
<?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
<?php _e( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
<?php _e( 'After your Privacy Policy page is set, you should edit it.' ); ?>
<?php _e( 'It is also suggested that you should review your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
</p>
<p>
<?php

View File

@ -65,7 +65,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<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( 'We have suggested the sections you 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( '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>
<p><?php _e( '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>
<div class="privacy-settings-accordion">

View File

@ -158,7 +158,7 @@ switch ( $step ) {
}
?>
<h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ); ?></p>
<p><?php _e( 'Welcome to WordPress. Before getting started, some information on the database is needed. You will need to know the following items before proceeding.' ); ?></p>
<ol>
<li><?php _e( 'Database name' ); ?></li>
<li><?php _e( 'Database username' ); ?></li>
@ -170,7 +170,7 @@ switch ( $step ) {
<?php
printf(
/* translators: %s: wp-config.php */
__( 'We are going to use this information to create a %s file.' ),
__( 'This information is being used to create a %s file.' ),
'<code>wp-config.php</code>'
);
?>
@ -187,7 +187,7 @@ switch ( $step ) {
<?php
printf(
/* translators: %s: Documentation URL. */
__( 'Need more help? <a href="%s">We got it</a>.' ),
__( 'Need more help? <a href="%s">Read the support article on wp-config.php</a>.' ),
__( 'https://wordpress.org/support/article/editing-wp-config-php/' )
);
?>

View File

@ -137,7 +137,7 @@ else :
}
?>
<h1><?php _e( 'Database Update Required' ); ?></h1>
<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
<p><?php _e( 'WordPress has been updated! Next and final step is to update your database to the newest version.' ); ?></p>
<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
<p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
<?php

View File

@ -514,7 +514,7 @@ switch ( $action ) {
<input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profile_user->user_email ); ?>" class="regular-text ltr" />
<?php if ( $profile_user->ID === $current_user->ID ) : ?>
<p class="description" id="email-description">
<?php _e( 'If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
<?php _e( 'If you change this, an email will be sent at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</p>
<?php endif; ?>

View File

@ -6963,7 +6963,7 @@ class wp_xmlrpc_server extends IXR_Server {
preg_match( '|<title>([^<]*?)</title>|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.

View File

@ -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 ) {

View File

@ -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"
}

View File

@ -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.

View File

@ -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 <a href="%s">media library</a> and make sure it was not deleted.' ),
__( 'That audio file can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */

View File

@ -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 <a href="%s">media library</a> and make sure it was not deleted.' ),
__( 'That image can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */

View File

@ -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 <a href="%s">media library</a> and make sure it was not deleted.' ),
__( 'That video can not be found. Check your <a href="%s">media library</a> 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).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
'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).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
)
);
}

View File

@ -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 <a href="%s">media library</a> and make sure it was not deleted.' ),
__( 'That file can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
esc_url( admin_url( 'upload.php' ) )
),
/* translators: %d: Widget count. */

View File

@ -1186,7 +1186,7 @@ class wpdb {
$message .= '<p>' . 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.' ),
'<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
) . "</p>\n";
@ -1802,7 +1802,7 @@ class wpdb {
$message .= '<p>' . 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&#8217;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&#8217;s database server is down.' ),
'<code>wp-config.php</code>',
'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
) . "</p>\n";
@ -1961,7 +1961,7 @@ class wpdb {
$message .= '<p>' . sprintf(
/* translators: %s: Database host. */
__( 'This means that we lost contact with the database server at %s. This could mean your host&#8217;s database server is down.' ),
__( 'This means that the contact with the database server at %s was lost. This could mean your host&#8217;s database server is down.' ),
'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
) . "</p>\n";

View File

@ -92,7 +92,7 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
) . '</p>';
$die .= '<p>' . sprintf(
/* translators: %s: Documentation URL. */
__( "Need more help? <a href='%s'>We got it</a>." ),
__( "Need more help? <a href='%s'>Read the support article on wp-config.php</a>." ),
__( 'https://wordpress.org/support/article/editing-wp-config-php/' )
) . '</p>';
$die .= '<p>' . sprintf(

View File

@ -271,7 +271,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
?>
<p class="error"><?php echo $errmsg; ?></p>
<?php } ?>
<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'We send your registration email to this address. (Double-check your email address before continuing.)' ); ?>
<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?>
<?php
$errmsg = $errors->get_error_message( 'generic' );
if ( $errmsg ) {

View File

@ -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' );