From 223cda987f3f4406182e326eaa555958610e1c17 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Tue, 22 Mar 2022 16:25:03 +0000 Subject: [PATCH] Administration: Replace contracted verb forms for better consistency. This changeset replaces contracted verb forms like `doesn't`, `can't`, or `isn't` with non-contracted forms like `does not`, `cannot`, or `is not`, for better consistency across the WordPress administration. It also updates some corresponding unit tests strings. Props Presskopp, socalchristina, aandrewdixon, francina, SergeyBiryukov, JeffPaul, audrasjb, hellofromTonya. Fixes #38913. See #39176. Built from https://develop.svn.wordpress.org/trunk@52978 git-svn-id: http://core.svn.wordpress.org/trunk@52567 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- readme.html | 8 ++--- wp-admin/comment.php | 2 +- wp-admin/edit-form-advanced.php | 6 ++-- wp-admin/edit-link-form.php | 4 +-- wp-admin/edit-tags.php | 6 ++-- wp-admin/freedoms.php | 4 +-- wp-admin/includes/ajax-actions.php | 2 +- wp-admin/includes/class-custom-background.php | 2 +- .../includes/class-custom-image-header.php | 6 ++-- wp-admin/includes/class-ftp-sockets.php | 8 ++--- wp-admin/includes/class-ftp.php | 34 +++++++++--------- wp-admin/includes/class-theme-upgrader.php | 2 +- .../class-wp-plugin-install-list-table.php | 6 ++-- .../class-wp-site-health-auto-updates.php | 2 +- wp-admin/includes/class-wp-site-health.php | 6 ++-- wp-admin/includes/dashboard.php | 6 ++-- wp-admin/includes/file.php | 2 +- wp-admin/includes/meta-boxes.php | 2 +- wp-admin/includes/post.php | 2 +- wp-admin/includes/template.php | 8 ++--- wp-admin/includes/theme.php | 12 +++---- wp-admin/includes/update.php | 8 ++--- wp-admin/includes/user.php | 4 +-- wp-admin/install.php | 4 +-- wp-admin/media.php | 6 ++-- wp-admin/nav-menus.php | 8 ++--- wp-admin/network/site-new.php | 2 +- wp-admin/network/upgrade.php | 4 +-- wp-admin/options-discussion.php | 2 +- wp-admin/options-permalink.php | 6 ++-- wp-admin/plugin-editor.php | 4 +-- wp-admin/plugin-install.php | 2 +- wp-admin/plugins.php | 2 +- wp-admin/post.php | 4 +-- wp-admin/setup-config.php | 10 +++--- wp-admin/term.php | 2 +- wp-admin/theme-editor.php | 2 +- wp-admin/theme-install.php | 14 ++++---- wp-admin/themes.php | 36 +++++++++---------- wp-admin/update-core.php | 8 ++--- wp-admin/user-new.php | 4 +-- wp-admin/users.php | 8 ++--- wp-includes/Text/Diff.php | 8 ++--- wp-includes/class-wp-customize-nav-menus.php | 2 +- wp-includes/class-wp-customize-widgets.php | 12 +++---- wp-includes/class-wp-editor.php | 2 +- wp-includes/class-wp-image-editor-gd.php | 4 +-- wp-includes/class-wp-image-editor-imagick.php | 2 +- wp-includes/class-wp-theme.php | 2 +- wp-includes/class-wp-xmlrpc-server.php | 8 ++--- .../class-wp-customize-nav-menu-control.php | 2 +- ...p-customize-nav-menu-locations-control.php | 2 +- .../class-wp-customize-theme-control.php | 12 +++---- wp-includes/deprecated.php | 2 +- wp-includes/ms-load.php | 2 +- wp-includes/post.php | 2 +- .../class-wp-rest-users-controller.php | 2 +- wp-includes/rss.php | 2 +- wp-includes/script-loader.php | 6 ++-- wp-includes/theme-compat/embed-404.php | 2 +- wp-includes/user.php | 6 ++-- wp-includes/version.php | 2 +- .../widgets/class-wp-widget-media-audio.php | 4 +-- .../widgets/class-wp-widget-media-image.php | 2 +- .../widgets/class-wp-widget-media-video.php | 4 +-- wp-includes/widgets/class-wp-widget-media.php | 4 +-- wp-includes/widgets/class-wp-widget-text.php | 2 +- wp-includes/wp-db.php | 10 +++--- wp-mail.php | 2 +- wp-signup.php | 4 +-- 70 files changed, 192 insertions(+), 192 deletions(-) diff --git a/readme.html b/readme.html index 89a3ba656a..ecf4a8fb38 100644 --- a/readme.html +++ b/readme.html @@ -13,7 +13,7 @@

Semantic Personal Publishing Platform

First Things First

-

Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.

+

Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I am proud to be a part of. Thousands of hours have gone into WordPress, and we are dedicated to making it better every day. Thank you for making it part of your world.

— Matt Mullenweg

Installation: Famous 5-minute install

@@ -21,7 +21,7 @@
  • Unzip the package in an empty directory and upload everything.
  • Open wp-admin/install.php in your browser. It will take you through the process to set up a wp-config.php file with your database connection details.
      -
    1. If for some reason this doesn’t work, don’t worry. It doesn’t work on all web hosts. Open up wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details.
      2. +
    2. If for some reason this does not work, do not worry. It does not work on all web hosts. Open up wp-config-sample.php with a text editor like WordPad or similar and fill in your database connection details.
    3. Save the file as wp-config.php and upload it.
    4. Open wp-admin/install.php in your browser.
    @@ -65,7 +65,7 @@

    Online Resources

    -

    If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:

    +

    If you have any questions that are not addressed in this document, please take advantage of WordPress’ numerous online resources:

    The WordPress Codex
    The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.
    @@ -74,7 +74,7 @@
    WordPress Planet
    The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.
    WordPress Support Forums
    -
    If you’ve looked everywhere and still can’t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
    +
    If you’ve looked everywhere and still cannot find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.
    WordPress IRC (Internet Relay Chat) Channel
    There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (irc.libera.chat #wordpress)
    diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 4c09a6085e..c2e452bfe0 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -43,7 +43,7 @@ if ( isset( $_REQUEST['c'] ) ) { // Prevent actions on a comment associated with a trashed post. if ( $comment && 'trash' === get_post_status( $comment->comment_post_ID ) ) { wp_die( - __( 'You can’t edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' ) + __( 'You cannot edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' ) ); } } else { diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 6a57dda7f9..42f0d49cc4 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -297,7 +297,7 @@ if ( 'post' === $post_type ) { $title_and_editor .= '

    ' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '

    '; $title_and_editor .= '

    ' . sprintf( /* translators: %s: Alt + F10 */ - __( 'Keyboard users: When you’re working in the visual editor, you can use %s to access the toolbar.' ), + __( 'Keyboard users: When you are working in the visual editor, you can use %s to access the toolbar.' ), 'Alt + F10' ) . '

    '; @@ -447,8 +447,8 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create

    add_help_tab( 'title' => __( 'Overview' ), 'content' => '

    ' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields.' ) . '

    ' . - '

    ' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '

    ' . + '

    ' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you do not use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '

    ' . '

    ' . __( 'XFN stands for XHTML Friends Network, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '

    ', ) ); @@ -122,7 +122,7 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );

    -

    https://wordpress.org/ — don’t forget the https://' ); ?>

    +

    https://wordpress.org/ — do not forget the https://' ); ?>

    diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 8cd22fa184..c0bd5b2e35 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -157,7 +157,7 @@ switch ( $wp_list_table->current_action() ) { $term = get_term( $term_id ); if ( ! $term instanceof WP_Term ) { - wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); + wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); } wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) ); @@ -177,7 +177,7 @@ switch ( $wp_list_table->current_action() ) { $tag = get_term( $tag_ID, $taxonomy ); if ( ! $tag ) { - wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); + wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); } $ret = wp_update_term( $tag_ID, $taxonomy, $_POST ); @@ -253,7 +253,7 @@ if ( 'category' === $taxonomy || 'link_category' === $taxonomy || 'post_tag' === } elseif ( 'link_category' === $taxonomy ) { $help = '

    ' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '

    '; } else { - $help = '

    ' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '

    '; + $help = '

    ' . __( 'You can assign keywords to your posts using tags. Unlike categories, tags have no hierarchy, meaning there is no relationship from one tag to another.' ) . '

    '; } if ( 'link_category' === $taxonomy ) { diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index b22f621f67..191be48009 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -84,7 +84,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. We are flattered every time someone spreads the good word, just make sure to check out our trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?> @@ -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 don’t respect the WordPress license, we don’t 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, we do not recommend them.' ), $plugins_url, $themes_url, __( 'https://wordpress.org/about/license/' ) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index b81710ddef..7aa25cab4c 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -1281,7 +1281,7 @@ function wp_ajax_replyto_comment( $action ) { if ( empty( $post->post_status ) ) { wp_die( 1 ); } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ), true ) ) { - wp_die( __( 'Error: You can’t reply to a comment on a draft post.' ) ); + wp_die( __( 'Error: You cannot reply to a comment on a draft post.' ) ); } $user = wp_get_current_user(); diff --git a/wp-admin/includes/class-custom-background.php b/wp-admin/includes/class-custom-background.php index a4ca32f4df..641d89eb9e 100644 --- a/wp-admin/includes/class-custom-background.php +++ b/wp-admin/includes/class-custom-background.php @@ -90,7 +90,7 @@ class Custom_Background { '

    ' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '

    ' . '

    ' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '

    ' . '

    ' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '

    ' . - '

    ' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '

    ', + '

    ' . __( 'Do not forget to click on the Save Changes button when you are finished.' ) . '

    ', ) ); diff --git a/wp-admin/includes/class-custom-image-header.php b/wp-admin/includes/class-custom-image-header.php index 074ce53be3..8336cfb76a 100644 --- a/wp-admin/includes/class-custom-image-header.php +++ b/wp-admin/includes/class-custom-image-header.php @@ -109,9 +109,9 @@ class Custom_Image_Header { 'title' => __( 'Header Image' ), 'content' => '

    ' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the “Choose Image” button.' ) . '

    ' . - '

    ' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the “Save Changes” button.' ) . '

    ' . + '

    ' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you would like and click the “Save Changes” button.' ) . '

    ' . '

    ' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature.' ) . '

    ' . - '

    ' . __( 'If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”.' ) . '

    ', + '

    ' . __( 'If you do not want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”.' ) . '

    ', ) ); @@ -127,7 +127,7 @@ class Custom_Image_Header { ) . '

    ' . '

    ' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '

    ' . - '

    ' . __( 'Don’t forget to click “Save Changes” when you’re done!' ) . '

    ', + '

    ' . __( 'Do not forget to click “Save Changes” when you are done!' ) . '

    ', ) ); diff --git a/wp-admin/includes/class-ftp-sockets.php b/wp-admin/includes/class-ftp-sockets.php index 6d802f5f8d..575b393341 100644 --- a/wp-admin/includes/class-ftp-sockets.php +++ b/wp-admin/includes/class-ftp-sockets.php @@ -139,22 +139,22 @@ class ftp_sockets extends ftp_base { else $this->_ftp_temp_sock=$this->_ftp_data_sock; } else { if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) { - $this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock))); + $this->PushError("_data_prepare","cannot get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock))); $this->_data_close(); return FALSE; } if(!@socket_bind($this->_ftp_data_sock,$addr)){ - $this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); + $this->PushError("_data_prepare","cannot bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); $this->_data_close(); return FALSE; } if(!@socket_listen($this->_ftp_data_sock)) { - $this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); + $this->PushError("_data_prepare","cannot listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); $this->_data_close(); return FALSE; } if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) { - $this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock))); + $this->PushError("_data_prepare","cannot get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock))); $this->_data_close(); return FALSE; } diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php index cb8a033631..82fe92cd1f 100644 --- a/wp-admin/includes/class-ftp.php +++ b/wp-admin/includes/class-ftp.php @@ -334,7 +334,7 @@ class ftp_base { } while($this->_code<200); $this->_ready=true; $syst=$this->systype(); - if(!$syst) $this->SendMSG("Can't detect remote OS"); + if(!$syst) $this->SendMSG("Cannot detect remote OS"); else { if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows; elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac; @@ -342,7 +342,7 @@ class ftp_base { else $this->OS_remote=FTP_OS_Mac; $this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]); } - if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled"); + if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled"); else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features))); return TRUE; } @@ -371,7 +371,7 @@ class ftp_base { } $this->SendMSG("Authentication succeeded"); if(empty($this->_features)) { - if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled"); + if(!$this->features()) $this->SendMSG("Cannot get features list. All supported - disabled"); else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features))); } return TRUE; @@ -480,7 +480,7 @@ class ftp_base { return FALSE; } if($this->_curtype!=FTP_BINARY) { - $this->PushError("restore", "can't restore in ASCII mode"); + $this->PushError("restore", "cannot restore in ASCII mode"); return FALSE; } if(!$this->_exec("REST ".$from, "resore")) return FALSE; @@ -553,7 +553,7 @@ class ftp_base { if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten"); $fp = @fopen($localfile, "w"); if (!$fp) { - $this->PushError("get","can't open local file", "Cannot create \"".$localfile."\""); + $this->PushError("get","cannot open local file", "Cannot create \"".$localfile."\""); return FALSE; } if($this->_can_restore and $rest!=0) fseek($fp, $rest); @@ -610,13 +610,13 @@ class ftp_base { function put($localfile, $remotefile=NULL, $rest=0) { if(is_null($remotefile)) $remotefile=$localfile; if (!file_exists($localfile)) { - $this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\""); + $this->PushError("put","cannot open local file", "No such file or directory \"".$localfile."\""); return FALSE; } $fp = @fopen($localfile, "r"); if (!$fp) { - $this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\""); + $this->PushError("put","cannot open local file", "Cannot read file \"".$localfile."\""); return FALSE; } if($this->_can_restore and $rest!=0) fseek($fp, $rest); @@ -649,7 +649,7 @@ class ftp_base { function mput($local=".", $remote=NULL, $continious=false) { $local=realpath($local); if(!@file_exists($local)) { - $this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\""); + $this->PushError("mput","cannot open local folder", "Cannot stat folder \"".$local."\""); return FALSE; } if(!is_dir($local)) return $this->put($local, $remote); @@ -662,7 +662,7 @@ class ftp_base { } closedir($handle); } else { - $this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\""); + $this->PushError("mput","cannot open local folder", "Cannot read folder \"".$local."\""); return FALSE; } if(empty($list)) return TRUE; @@ -682,13 +682,13 @@ class ftp_base { function mget($remote, $local=".", $continious=false) { $list=$this->rawlist($remote, "-lA"); if($list===false) { - $this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); + $this->PushError("mget","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents"); return FALSE; } if(empty($list)) return true; if(!@file_exists($local)) { if(!@mkdir($local)) { - $this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\""); + $this->PushError("mget","cannot create local folder", "Cannot create folder \"".$local."\""); return FALSE; } } @@ -700,13 +700,13 @@ class ftp_base { foreach($list as $el) { if($el["type"]=="d") { if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) { - $this->PushError("mget", "can't copy folder", "Can't copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); + $this->PushError("mget", "cannot copy folder", "Cannot copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); $ret=false; if(!$continious) break; } } else { if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) { - $this->PushError("mget", "can't copy file", "Can't copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); + $this->PushError("mget", "cannot copy file", "Cannot copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); $ret=false; if(!$continious) break; } @@ -721,7 +721,7 @@ class ftp_base { function mdel($remote, $continious=false) { $list=$this->rawlist($remote, "-la"); if($list===false) { - $this->PushError("mdel","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); + $this->PushError("mdel","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents"); return false; } @@ -742,7 +742,7 @@ class ftp_base { } } else { if (!$this->delete($remote."/".$el["name"])) { - $this->PushError("mdel", "can't delete file", "Can't delete remote file \"".$remote."/".$el["name"]."\""); + $this->PushError("mdel", "cannot delete file", "Cannot delete remote file \"".$remote."/".$el["name"]."\""); $ret=false; if(!$continious) break; } @@ -750,7 +750,7 @@ class ftp_base { } if(!$this->rmdir($remote)) { - $this->PushError("mdel", "can't delete folder", "Can't delete remote folder \"".$remote."/".$el["name"]."\""); + $this->PushError("mdel", "cannot delete folder", "Cannot delete remote folder \"".$remote."/".$el["name"]."\""); $ret=false; } return $ret; @@ -826,7 +826,7 @@ class ftp_base { function dirlist($remote) { $list=$this->rawlist($remote, "-la"); if($list===false) { - $this->PushError("dirlist","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); + $this->PushError("dirlist","cannot read remote folder list", "Cannot read remote folder \"".$remote."\" contents"); return false; } diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 864af8f3c5..8f24d1aa59 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -560,7 +560,7 @@ class Theme_Upgrader extends WP_Upgrader { $this->strings['incompatible_archive'], sprintf( /* translators: %s: style.css */ - __( 'The %s stylesheet doesn’t contain a valid theme header.' ), + __( 'The %s stylesheet does not contain a valid theme header.' ), 'style.css' ) ); diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index c214cd333b..bf1ebb9be5 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -671,7 +671,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { if ( ! $compatible_php || ! $compatible_wp ) { echo '

    '; if ( ! $compatible_php && ! $compatible_wp ) { - _e( 'This plugin doesn’t work with your versions of WordPress and PHP.' ); + _e( 'This plugin does not work with your versions of WordPress and PHP.' ); if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { printf( /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ @@ -695,7 +695,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { wp_update_php_annotation( '

    ', '' ); } } elseif ( ! $compatible_wp ) { - _e( 'This plugin doesn’t work with your version of WordPress.' ); + _e( 'This plugin does not work with your version of WordPress.' ); if ( current_user_can( 'update_core' ) ) { printf( /* translators: %s: URL to WordPress Updates screen. */ @@ -704,7 +704,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { ); } } elseif ( ! $compatible_php ) { - _e( 'This plugin doesn’t work with your version of PHP.' ); + _e( 'This plugin does not work with your version of PHP.' ); if ( current_user_can( 'update_php' ) ) { printf( /* translators: %s: URL to Update PHP page. */ 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 ebc3547165..5393b6f3c9 100644 --- a/wp-admin/includes/class-wp-site-health-auto-updates.php +++ b/wp-admin/includes/class-wp-site-health-auto-updates.php @@ -292,7 +292,7 @@ class WP_Site_Health_Auto_Updates { } return array( - 'description' => __( "Your installation of WordPress doesn't require FTP credentials to perform updates." ), + 'description' => __( 'Your installation of WordPress does not require FTP credentials to perform updates.' ), 'severity' => 'pass', ); } diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index cd72670ff7..72395c26b3 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -467,7 +467,7 @@ class WP_Site_Health { ), $unused_plugins ), - __( 'Inactive plugins are tempting targets for attackers. If you’re not going to use a plugin, you should consider removing it.' ) + __( 'Inactive plugins are tempting targets for attackers. If you are not going to use a plugin, you should consider removing it.' ) ); $result['actions'] .= sprintf( @@ -634,7 +634,7 @@ class WP_Site_Health { ), sprintf( /* translators: 1: The currently active theme. 2: The active theme's parent theme. */ - __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep your active theme, %1$s, and %2$s, its parent theme.' ), + __( 'To enhance your site’s security, you should consider removing any themes you are not using. You should keep your active theme, %1$s, and %2$s, its parent theme.' ), $active_theme->name, $active_theme->parent()->name ) @@ -653,7 +653,7 @@ class WP_Site_Health { ), sprintf( /* translators: 1: The default theme for WordPress. 2: The currently active theme. 3: The active theme's parent theme. */ - __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep %1$s, the default WordPress theme, %2$s, your active theme, and %3$s, its parent theme.' ), + __( 'To enhance your site’s security, you should consider removing any themes you are not using. You should keep %1$s, the default WordPress theme, %2$s, your active theme, and %3$s, its parent theme.' ), $default_theme ? $default_theme->name : WP_DEFAULT_THEME, $active_theme->name, $active_theme->parent()->name diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index c95f1b6b08..f3e5c94997 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 couldn’t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), + __( 'We could not locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), '{{data.unknownCity}}' ); ?> @@ -1462,7 +1462,7 @@ function wp_print_community_events_templates() { organize a WordPress event?' ), + __( 'There are not any events scheduled near %1$s at the moment. Would you like to organize a WordPress event?' ), '{{ data.location.description }}', __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' ) ); @@ -1472,7 +1472,7 @@ function wp_print_community_events_templates() { organize a WordPress event?' ), + __( 'There are not any events scheduled near you at the moment. Would you like to organize a WordPress event?' ), __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' ) ); ?> diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index ddd2be849a..5aac6c29df 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -715,7 +715,7 @@ function validate_file_to_edit( $file, $allowed_files = array() ) { wp_die( __( 'Sorry, that file cannot be edited.' ) ); // case 2 : - // wp_die( __('Sorry, can’t call files with their real path.' )); + // wp_die( __('Sorry, cannot call files with their real path.' )); case 3: wp_die( __( 'Sorry, that file cannot be edited.' ) ); diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 6a4fc17d2f..5ba3a937c5 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -287,7 +287,7 @@ function post_submit_meta_box( $post, $args = array() ) { unpublished customization changes. You can edit, but there’s no need to publish now. It will be published automatically with those changes.' ), + __( 'This draft comes from your unpublished customization changes. You can edit, but there is no need to publish now. It will be published automatically with those changes.' ), esc_url( add_query_arg( 'changeset_uuid', diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index c9b29b5df4..799f19aeae 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -2337,7 +2337,7 @@ function the_block_editor_meta_boxes() { } /** - * Sadly we probably can not add this data directly into editor settings. + * Sadly we probably cannot add this data directly into editor settings. * * Some meta boxes need admin_head to fire for meta box registry. * admin_head fires after admin_enqueue_scripts, which is where we create our diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 4fc3b72fef..bb52755840 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -195,7 +195,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) { * * If the $echo argument is true then the elements for a list of checkbox * `` elements labelled with the names of the selected terms is output. - * If the $post_ID global isn't empty then the terms associated with that + * If the $post_ID global is not empty then the terms associated with that * post will be marked as checked. * * @since 2.5.0 @@ -1144,9 +1144,9 @@ function do_block_editor_incompatible_meta_box( $object, $box ) { echo '

    '; if ( $plugin ) { /* translators: %s: The name of the plugin that generated this meta box. */ - printf( __( "This meta box, from the %s plugin, isn't compatible with the block editor." ), "{$plugin['Name']}" ); + printf( __( 'This meta box, from the %s plugin, is not compatible with the block editor.' ), "{$plugin['Name']}" ); } else { - _e( "This meta box isn't compatible with the block editor." ); + _e( 'This meta box is not compatible with the block editor.' ); } echo '

    '; @@ -1388,7 +1388,7 @@ function do_meta_boxes( $screen, $context, $object ) {

    {$plugin['Name']}" ); + printf( __( 'This meta box, from the %s plugin, is not compatible with the block editor.' ), "{$plugin['Name']}" ); ?>

    diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index 35b658ac91..209f6959ae 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -877,7 +877,7 @@ function customize_themes_print_templates() {

    <# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #> <# } else if ( ! data.compatibleWP ) { #> <# } else if ( ! data.compatiblePHP ) { #> View version %4$s details or learn more about updating PHP.' ), + __( 'There is a new version of %1$s available, but it does not work with your version of PHP. View version %4$s details or learn more about updating PHP.' ), $plugin_name, esc_url( $details_url ), sprintf( @@ -722,7 +722,7 @@ function wp_theme_update_row( $theme_key, $theme ) { if ( ! $compatible_wp && ! $compatible_php ) { printf( /* translators: %s: Theme name. */ - __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), + __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), $theme['Name'] ); if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { @@ -750,7 +750,7 @@ function wp_theme_update_row( $theme_key, $theme ) { } elseif ( ! $compatible_wp ) { printf( /* translators: %s: Theme name. */ - __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), + __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), $theme['Name'] ); if ( current_user_can( 'update_core' ) ) { @@ -763,7 +763,7 @@ function wp_theme_update_row( $theme_key, $theme ) { } elseif ( ! $compatible_php ) { printf( /* translators: %s: Theme name. */ - __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), + __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), $theme['Name'] ); if ( current_user_can( 'update_php' ) ) { diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 930a24da17..29a4f3598a 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -174,7 +174,7 @@ function edit_user( $user_id = 0 ) { // Checking the password has been typed twice the same. if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { - $errors->add( 'pass', __( 'Error: Passwords don’t match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); + $errors->add( 'pass', __( 'Error: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); } if ( ! empty( $pass1 ) ) { @@ -200,7 +200,7 @@ function edit_user( $user_id = 0 ) { if ( empty( $user->user_email ) ) { $errors->add( 'empty_email', __( 'Error: Please enter an email address.' ), array( 'form-field' => 'email' ) ); } elseif ( ! is_email( $user->user_email ) ) { - $errors->add( 'invalid_email', __( 'Error: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'invalid_email', __( 'Error: The email address is not correct.' ), array( 'form-field' => 'email' ) ); } else { $owner_id = email_exists( $user->user_email ); if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { diff --git a/wp-admin/install.php b/wp-admin/install.php index 5910287139..3751b1916f 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -358,7 +358,7 @@ switch ( $step ) {

    -

    +

    username@example.com.' ) ); + display_setup_form( __( 'Sorry, that is not a valid email address. Email addresses look like username@example.com.' ) ); $error = true; } diff --git a/wp-admin/media.php b/wp-admin/media.php index fe2e9a8617..62399a2a3a 100644 --- a/wp-admin/media.php +++ b/wp-admin/media.php @@ -65,13 +65,13 @@ switch ( $action ) { $att = get_post( $att_id ); if ( empty( $att->ID ) ) { - wp_die( __( 'You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?' ) ); + wp_die( __( 'You attempted to edit an attachment that does not exist. Perhaps it was deleted?' ) ); } if ( 'attachment' !== $att->post_type ) { - wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) ); + wp_die( __( 'You attempted to edit an item that is not an attachment. Please go back and try again.' ) ); } if ( 'trash' === $att->post_status ) { - wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) ); + wp_die( __( 'You cannot edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) ); } add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 ); diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index b7ab1692cc..0ad9570c8c 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -625,7 +625,7 @@ if ( ! $locations_screen ) : // Main tab. $menu_management = '

    ' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '

    '; $menu_management .= '
    • ' . __( 'To edit an existing menu, choose a menu from the drop down and click Select' ) . '
      • '; - $menu_management .= '
    • ' . __( 'If you haven’t yet created any menus, click the ’create a new menu’ link to get started' ) . '
    '; + $menu_management .= '
  • ' . __( 'If you have not yet created any menus, click the ’create a new menu’ link to get started' ) . '
    • '; $menu_management .= '

    ' . __( 'You can assign theme locations to individual menus by selecting the desired settings at the bottom of the menu editor. To assign menus to all theme locations at once, visit the Manage Locations tab at the top of the screen.' ) . '

    '; get_current_screen()->add_help_tab( @@ -652,7 +652,7 @@ if ( ! $locations_screen ) : // Main tab. ); else : // Locations tab. $locations_overview = '

    ' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '

    '; - $locations_overview .= '
    • ' . __( 'To assign menus to one or more theme locations, select a menu from each location’s drop down. When you’re finished, click Save Changes' ) . '
      • '; + $locations_overview .= '
      • ' . __( 'To assign menus to one or more theme locations, select a menu from each location’s drop down. When you are finished, click Save Changes' ) . '
        • '; $locations_overview .= '
      • ' . __( 'To edit a menu currently assigned to a theme location, click the adjacent ’Edit’ link' ) . '
        • '; $locations_overview .= '
      • ' . __( 'To add a new menu instead of assigning an existing one, click the ’Use new menu’ link. Your new menu will be automatically assigned to that theme location' ) . '
      '; @@ -842,7 +842,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; create a new menu. Don’t forget to save your changes!' ), + __( 'Edit your menu below, or create a new menu. Do not forget to save your changes!' ), esc_url( add_query_arg( array( @@ -907,7 +907,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; create a new menu. Don’t forget to save your changes!' ), + __( 'or create a new menu. Do not forget to save your changes!' ), esc_url( add_query_arg( array( diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index ac466db9a9..06c759f1e1 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -37,7 +37,7 @@ if ( isset( $_REQUEST['action'] ) && 'add-site' === $_REQUEST['action'] ) { check_admin_referer( 'add-blog', '_wpnonce_add-blog' ); if ( ! is_array( $_POST['blog'] ) ) { - wp_die( __( 'Can’t create an empty site.' ) ); + wp_die( __( 'Cannot create an empty site.' ) ); } $blog = $_POST['blog']; diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php index 4276a47db8..789e8a26b1 100644 --- a/wp-admin/network/upgrade.php +++ b/wp-admin/network/upgrade.php @@ -22,7 +22,7 @@ get_current_screen()->add_help_tab( 'title' => __( 'Overview' ), 'content' => '

      ' . __( 'Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.' ) . '

      ' . - '

      ' . __( 'If a version update to core has not happened, clicking this button won’t affect anything.' ) . '

      ' . + '

      ' . __( 'If a version update to core has not happened, clicking this button will not affect anything.' ) . '

      ' . '

      ' . __( 'If this process fails for any reason, users logging in to their sites will force the same update.' ) . '

      ', ) ); @@ -122,7 +122,7 @@ switch ( $action ) { do_action( 'wpmu_upgrade_site', $site_id ); } echo '
    '; - ?>

    + ?>