diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 97dd767850..69aeacda2f 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -891,8 +891,17 @@ function delete_plugins( $plugins, $deprecated = '' ) { set_site_transient( 'update_plugins', $current ); } - if ( ! empty($errors) ) - return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) ); + if ( ! empty( $errors ) ) { + if ( 1 === count( $errors ) ) { + /* translators: %s: plugin filename */ + $message = __( 'Could not fully remove the plugin %s.' ); + } else { + /* translators: %s: comma-separated list of plugin filenames */ + $message = __( 'Could not fully remove the plugins %s.' ); + } + + return new WP_Error( 'could_not_remove_plugin', sprintf( $message, implode( ', ', $errors ) ) ); + } return true; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 02a978976f..5b4b950be8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-41712'; +$wp_version = '4.9-alpha-41713'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.