From 28eda6f4bc141182625d9627967b28c65302318c Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Tue, 22 Aug 2017 11:52:48 +0000 Subject: [PATCH] General: Improve terminology used when referring to installations of WordPress and its extensions. "Install" is not a noun, and while it might be acceptable to use the verb as a noun, it is not correct. Using the correct noun, "installation", increases clarity, especially for non-native English speakers. This change fixes the usage in user-facing text and in developer documentation. Fixes #41620 Built from https://develop.svn.wordpress.org/trunk@41289 git-svn-id: http://core.svn.wordpress.org/trunk@41129 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 4 +-- wp-admin/includes/class-core-upgrader.php | 2 +- .../includes/class-file-upload-upgrader.php | 2 +- .../includes/class-language-pack-upgrader.php | 4 +-- wp-admin/includes/class-plugin-upgrader.php | 12 ++++---- wp-admin/includes/class-theme-upgrader.php | 12 ++++---- .../includes/class-wp-automatic-updater.php | 2 +- .../includes/class-wp-ms-sites-list-table.php | 2 +- .../class-wp-plugin-install-list-table.php | 6 ++-- wp-admin/includes/class-wp-upgrader.php | 12 ++++---- wp-admin/includes/ms.php | 2 +- wp-admin/includes/network.php | 28 +++++++++---------- wp-admin/includes/plugin-install.php | 24 ++++++++-------- wp-admin/includes/plugin.php | 2 +- wp-admin/includes/schema.php | 6 ++-- wp-admin/includes/theme-install.php | 4 +-- wp-admin/includes/translation-install.php | 6 ++-- wp-admin/includes/update-core.php | 2 +- wp-admin/includes/update.php | 4 +-- wp-admin/includes/upgrade.php | 10 +++---- wp-admin/install.php | 2 +- wp-admin/network.php | 2 +- wp-admin/network/settings.php | 4 +-- wp-admin/network/site-new.php | 6 ++-- wp-admin/options-general.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/options.php | 2 +- wp-admin/plugin-install.php | 4 +-- wp-admin/setup-config.php | 10 +++---- wp-admin/theme-install.php | 4 +-- wp-admin/update.php | 2 +- wp-includes/class-wp-customize-manager.php | 4 +-- wp-includes/class-wp-locale-switcher.php | 4 +-- wp-includes/class-wp-network.php | 2 +- wp-includes/default-constants.php | 2 +- wp-includes/deprecated.php | 2 +- wp-includes/functions.php | 8 +++--- wp-includes/l10n.php | 6 ++-- wp-includes/ms-deprecated.php | 2 +- wp-includes/ms-functions.php | 22 +++++++-------- wp-includes/ms-load.php | 8 +++--- wp-includes/plugin.php | 6 ++-- wp-includes/script-loader.php | 2 +- wp-includes/user.php | 2 +- wp-includes/version.php | 2 +- wp-load.php | 2 +- wp-settings.php | 2 +- 47 files changed, 131 insertions(+), 131 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 86f12e1a38..6f33849fd2 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -3456,7 +3456,7 @@ function wp_ajax_install_theme() { /* * See WP_Theme_Install_List_Table::_get_theme_status() if we wanted to check - * on post-install status. + * on post-installation status. */ wp_send_json_success( $status ); } @@ -3701,7 +3701,7 @@ function wp_ajax_install_plugin() { $install_status = install_plugin_install_status( $api ); $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : ''; - // If install request is coming from import page, do not return network activation link. + // If installation request is coming from import page, do not return network activation link. $plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' ); if ( current_user_can( 'activate_plugins' ) && is_plugin_inactive( $install_status['file'] ) ) { diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index ebfc1d657e..dfd6404616 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -95,7 +95,7 @@ class Core_Upgrader extends WP_Upgrader { /* * If partial update is returned from the API, use that, unless we're doing - * a reinstall. If we cross the new_bundled version number, then use + * a reinstallation. If we cross the new_bundled version number, then use * the new_bundled zip. Don't though if the constant is set to skip bundled items. * If the API returns a no_content zip, go with it. Finally, default to the full zip. */ diff --git a/wp-admin/includes/class-file-upload-upgrader.php b/wp-admin/includes/class-file-upload-upgrader.php index 4584122a23..a182b62ccd 100644 --- a/wp-admin/includes/class-file-upload-upgrader.php +++ b/wp-admin/includes/class-file-upload-upgrader.php @@ -79,7 +79,7 @@ class File_Upload_Upgrader { // Save the data. $this->id = wp_insert_attachment( $object, $file['file'] ); - // Schedule a cleanup for 2 hours from now in case of failed install. + // Schedule a cleanup for 2 hours from now in case of failed installation. wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) ); } elseif ( is_numeric( $_GET[$urlholder] ) ) { diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php index e3ae953132..ee98cf79db 100644 --- a/wp-admin/includes/class-language-pack-upgrader.php +++ b/wp-admin/includes/class-language-pack-upgrader.php @@ -28,7 +28,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { public $result; /** - * Whether a bulk upgrade/install is being performed. + * Whether a bulk upgrade/installation is being performed. * * @since 3.7.0 * @var bool $bulk @@ -60,7 +60,7 @@ class Language_Pack_Upgrader extends WP_Upgrader { } /* - * Avoid messing with VCS installs, at least for now. + * Avoid messing with VCS installations, at least for now. * Noted: this is not the ideal way to accomplish this. */ $check_vcs = new WP_Automatic_Updater; diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php index f66f202de4..969a5b4ff7 100644 --- a/wp-admin/includes/class-plugin-upgrader.php +++ b/wp-admin/includes/class-plugin-upgrader.php @@ -31,7 +31,7 @@ class Plugin_Upgrader extends WP_Upgrader { public $result; /** - * Whether a bulk upgrade/install is being performed. + * Whether a bulk upgrade/installation is being performed. * * @since 2.9.0 * @var bool $bulk @@ -56,17 +56,17 @@ class Plugin_Upgrader extends WP_Upgrader { } /** - * Initialize the install strings. + * Initialize the installation strings. * * @since 2.8.0 */ public function install_strings() { - $this->strings['no_package'] = __('Install package not available.'); - $this->strings['downloading_package'] = __('Downloading install package from %s…'); + $this->strings['no_package'] = __('Installation package not available.'); + $this->strings['downloading_package'] = __('Downloading installation package from %s…'); $this->strings['unpack_package'] = __('Unpacking the package…'); $this->strings['installing_package'] = __('Installing the plugin…'); $this->strings['no_files'] = __('The plugin contains no files.'); - $this->strings['process_failed'] = __('Plugin install failed.'); + $this->strings['process_failed'] = __('Plugin installation failed.'); $this->strings['process_success'] = __('Plugin installed successfully.'); } @@ -83,7 +83,7 @@ class Plugin_Upgrader extends WP_Upgrader { * @type bool $clear_update_cache Whether to clear the plugin updates cache if successful. * Default true. * } - * @return bool|WP_Error True if the install was successful, false or a WP_Error otherwise. + * @return bool|WP_Error True if the installation was successful, false or a WP_Error otherwise. */ public function install( $package, $args = array() ) { diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 11e8f2de9a..6515698052 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -54,17 +54,17 @@ class Theme_Upgrader extends WP_Upgrader { } /** - * Initialize the install strings. + * Initialize the installation strings. * * @since 2.8.0 */ public function install_strings() { - $this->strings['no_package'] = __('Install package not available.'); - $this->strings['downloading_package'] = __('Downloading install package from %s…'); + $this->strings['no_package'] = __('Installation package not available.'); + $this->strings['downloading_package'] = __('Downloading installation package from %s…'); $this->strings['unpack_package'] = __('Unpacking the package…'); $this->strings['installing_package'] = __('Installing the theme…'); $this->strings['no_files'] = __('The theme contains no files.'); - $this->strings['process_failed'] = __('Theme install failed.'); + $this->strings['process_failed'] = __('Theme installation failed.'); $this->strings['process_success'] = __('Theme installed successfully.'); /* translators: 1: theme name, 2: version */ $this->strings['process_success_specific'] = __('Successfully installed the theme %1$s %2$s.'); @@ -110,7 +110,7 @@ class Theme_Upgrader extends WP_Upgrader { if ( ! $api || is_wp_error($api) ) { $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') ); - // Don't show activate or preview actions after install + // Don't show activate or preview actions after installation add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') ); return $install_result; } @@ -180,7 +180,7 @@ class Theme_Upgrader extends WP_Upgrader { * Default true. * } * - * @return bool|WP_Error True if the install was successful, false or a WP_Error object otherwise. + * @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise. */ public function install( $package, $args = array() ) { diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php index 0e586473d7..fbde7320d0 100644 --- a/wp-admin/includes/class-wp-automatic-updater.php +++ b/wp-admin/includes/class-wp-automatic-updater.php @@ -443,7 +443,7 @@ class WP_Automatic_Updater { wp_update_plugins(); // Check for Plugin updates } - // Send debugging email to all development installs. + // Send debugging email to admin for all development installations. if ( ! empty( $this->update_results ) ) { $development_version = false !== strpos( get_bloginfo( 'version' ), '-' ); diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 14dbd16378..f639b36ecf 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -551,7 +551,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table { * @param array $actions An array of action links to be displayed. * @param int $blog_id The site ID. * @param string $blogname Site path, formatted depending on whether it is a sub-domain - * or subdirectory multisite install. + * or subdirectory multisite installation. */ $actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname ); return $this->row_actions( $actions ); 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 99dd1c74cf..bf6cf3d71b 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -559,13 +559,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
= 1000000 ) { - $active_installs_text = _x( '1+ Million', 'Active plugin installs' ); + $active_installs_text = _x( '1+ Million', 'Active plugin installations' ); } elseif ( 0 == $plugin['active_installs'] ) { - $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' ); + $active_installs_text = _x( 'Less Than 10', 'Active plugin installations' ); } else { $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+'; } - printf( __( '%s Active Installs' ), $active_installs_text ); + printf( __( '%s Active Installations' ), $active_installs_text ); ?>
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 6ee7684c35..f7dea257ea 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -79,7 +79,7 @@ class WP_Upgrader { * @var WP_Error|array $result { * @type string $source The full path to the source the files were installed from. * @type string $source_files List of all the files in the source directory. - * @type string $destination The full path to the install destination folder. + * @type string $destination The full path to the installation destination folder. * @type string $destination_name The name of the destination folder, or empty if `$destination` * and `$local_destination` are the same. * @type string $local_destination The full local path to the destination folder. This is usually @@ -570,11 +570,11 @@ class WP_Upgrader { $this->result = compact( 'source', 'source_files', 'destination', 'destination_name', 'local_destination', 'remote_destination', 'clear_destination' ); /** - * Filters the install response after the installation has finished. + * Filters the installation response after the installation has finished. * * @since 2.8.0 * - * @param bool $response Install response. + * @param bool $response Installation response. * @param array $hook_extra Extra arguments passed to hooked filters. * @param array $result Installation result data. */ @@ -590,7 +590,7 @@ class WP_Upgrader { } /** - * Run an upgrade/install. + * Run an upgrade/installation. * * Attempts to download the package (if it is not a local file), unpack it, and * install it in the destination folder. @@ -612,7 +612,7 @@ class WP_Upgrader { * @type bool $abort_if_destination_exists Whether to abort the installation if the destination * folder already exists. When true, `$clear_destination` * should be false. Default true. - * @type bool $is_multi Whether this run is one of multiple upgrade/install + * @type bool $is_multi Whether this run is one of multiple upgrade/installation * actions being performed in bulk. When true, the skin * WP_Upgrader::header() and WP_Upgrader::footer() * aren't called. Default false. @@ -735,7 +735,7 @@ class WP_Upgrader { $this->skin->error($result); $this->skin->feedback('process_failed'); } else { - // Install succeeded. + // Installation succeeded. $this->skin->feedback('process_success'); } diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 15f7848bef..220d6323e3 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -628,7 +628,7 @@ function site_admin_notice() { /** * Avoids a collision between a site slug and a permalink slug. * - * In a subdirectory install this will make sure that a site and a post do not use the + * In a subdirectory installation this will make sure that a site and a post do not use the * same subdirectory by checking for a site with the same name as a new post. * * @since 3.0.0 diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index fef6b66850..1411d6fcf0 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -27,10 +27,10 @@ function network_domain_check() { } /** - * Allow subdomain install + * Allow subdomain installation * * @since 3.0.0 - * @return bool Whether subdomain install is allowed + * @return bool Whether subdomain installation is allowed */ function allow_subdomain_install() { $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) ); @@ -41,22 +41,22 @@ function allow_subdomain_install() { } /** - * Allow subdirectory install. + * Allow subdirectory installation. * * @since 3.0.0 * * @global wpdb $wpdb WordPress database abstraction object. * - * @return bool Whether subdirectory install is allowed + * @return bool Whether subdirectory installation is allowed */ function allow_subdirectory_install() { global $wpdb; /** - * Filters whether to enable the subdirectory install feature in Multisite. + * Filters whether to enable the subdirectory installation feature in Multisite. * * @since 3.0.0 * - * @param bool $allow Whether to enable the subdirectory install feature in Multisite. Default is false. + * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false. */ if ( apply_filters( 'allow_subdirectory_install', false ) ) return true; @@ -257,7 +257,7 @@ function network_step1( $errors = false ) { - + - + - - + diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 3314a24c90..6b71832a09 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -19,7 +19,7 @@ * an object is returned. * * The second filter, {@see 'plugins_api'}, allows a plugin to override the WordPress.org - * Plugin Install API entirely. If `$action` is 'query_plugins' or 'plugin_information', + * Plugin Installation API entirely. If `$action` is 'query_plugins' or 'plugin_information', * an object MUST be passed. If `$action` is 'hot_tags' or 'hot_categories', an array MUST * be passed. * @@ -89,7 +89,7 @@ * @type bool $reviews Whether to return the plugin reviews. Default false. * @type bool $banners Whether to return the banner images links. Default false. * @type bool $icons Whether to return the icon links. Default false. - * @type bool $active_installs Whether to return the number of active installs. Default false. + * @type bool $active_installs Whether to return the number of active installations. Default false. * @type bool $group Whether to return the assigned group. Default false. * @type bool $contributors Whether to return the list of contributors. Default false. * } @@ -113,19 +113,19 @@ function plugins_api( $action, $args = array() ) { } /** - * Filters the WordPress.org Plugin Install API arguments. + * Filters the WordPress.org Plugin Installation API arguments. * * Important: An object MUST be returned to this filter. * * @since 2.7.0 * * @param object $args Plugin API arguments. - * @param string $action The type of information being requested from the Plugin Install API. + * @param string $action The type of information being requested from the Plugin Installation API. */ $args = apply_filters( 'plugins_api_args', $args, $action ); /** - * Filters the response for the current WordPress.org Plugin Install API request. + * Filters the response for the current WordPress.org Plugin Installation API request. * * Passing a non-false value will effectively short-circuit the WordPress.org API request. * @@ -135,7 +135,7 @@ function plugins_api( $action, $args = array() ) { * @since 2.7.0 * * @param false|object|array $result The result object or array. Default false. - * @param string $action The type of information being requested from the Plugin Install API. + * @param string $action The type of information being requested from the Plugin Installation API. * @param object $args Plugin API arguments. */ $res = apply_filters( 'plugins_api', false, $action, $args ); @@ -193,12 +193,12 @@ function plugins_api( $action, $args = array() ) { } /** - * Filters the Plugin Install API response results. + * Filters the Plugin Installation API response results. * * @since 2.7.0 * * @param object|WP_Error $res Response object or WP_Error. - * @param string $action The type of information being requested from the Plugin Install API. + * @param string $action The type of information being requested from the Plugin Installation API. * @param object $args Plugin API arguments. */ return apply_filters( 'plugins_api_result', $res, $action, $args ); @@ -515,7 +515,7 @@ function install_plugin_information() { $section = reset( $section_titles ); } - iframe_header( __( 'Plugin Install' ) ); + iframe_header( __( 'Plugin Installation' ) ); $_with_banner = ''; @@ -587,11 +587,11 @@ function install_plugin_information() { tested ) ) { ?>
  • tested; ?>
    • active_installs ) ) { ?> -
  • active_installs >= 1000000 ) { - _ex( '1+ Million', 'Active plugin installs' ); + _ex( '1+ Million', 'Active plugin installations' ); } elseif ( 0 == $api->active_installs ) { - _ex( 'Less Than 10', 'Active plugin installs' ); + _ex( 'Less Than 10', 'Active plugin installations' ); } else { echo number_format_i18n( $api->active_installs ) . '+'; } diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 1c328f363c..7d804e1c66 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -419,7 +419,7 @@ function _get_dropins() { 'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE 'db.php' => array( __( 'Custom database class.' ), true ), // auto on load 'db-error.php' => array( __( 'Custom database error message.' ), true ), // auto on error - 'install.php' => array( __( 'Custom install script.' ), true ), // auto on install + 'install.php' => array( __( 'Custom installation script.' ), true ), // auto on installation 'maintenance.php' => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance 'object-cache.php' => array( __( 'External object cache.' ), true ), // auto on load ); diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 64ec6b76fb..d5ba04c95b 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -890,9 +890,9 @@ endif; * @param string $email Email address for the network administrator. * @param string $site_name The name of the network. * @param string $path Optional. The path to append to the network's domain name. Default '/'. - * @param bool $subdomain_install Optional. Whether the network is a subdomain install or a subdirectory install. - * Default false, meaning the network is a subdirectory install. - * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful, + * @param bool $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation. + * Default false, meaning the network is a subdirectory installation. + * @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful, * so the error code must be checked) or failure. */ function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) { diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index 31ce5f7971..86bd37e100 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -1,6 +1,6 @@ your dashboard to d endif; /** - * Maybe enable pretty permalinks on install. + * Maybe enable pretty permalinks on installation. * * If after enabling pretty permalinks don't work, fallback to query-string permalinks. * @@ -452,7 +452,7 @@ function wp_upgrade() { endif; /** - * Functions to be called in install and upgrade scripts. + * Functions to be called in installation and upgrade scripts. * * Contains conditional checks to determine which upgrade scripts to run, * based on database version and WP version being updated-to. @@ -2060,7 +2060,7 @@ function get_alloptions_110() { } /** - * Utility version of get_option that is private to install/upgrade. + * Utility version of get_option that is private to installation/upgrade. * * @ignore * @since 1.5.1 diff --git a/wp-admin/install.php b/wp-admin/install.php index 9a11b1820e..a24baff3b6 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -49,7 +49,7 @@ nocache_headers(); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; /** - * Display install header. + * Display installation header. * * @since 2.5.0 * diff --git a/wp-admin/network.php b/wp-admin/network.php index 027449e042..d0effdb1c5 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -57,7 +57,7 @@ if ( is_network_admin() ) { } $network_help = '

    ' . __('This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '

    ' . - '

    ' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '

    ' . + '

    ' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your installation. Fill out the network details, and click Install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '

    ' . '

    ' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '

    ' . '

    ' . __('Add the designated lines of code to wp-config.php (just before /*...stop editing...*/) and .htaccess (replacing the existing WordPress rules).') . '

    ' . '

    ' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '

    ' . diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index 3ca1daa6e1..af37fbcbed 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -10,7 +10,7 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -/** WordPress Translation Install API */ +/** WordPress Translation Installation API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); if ( ! current_user_can( 'manage_network_options' ) ) @@ -62,7 +62,7 @@ if ( $_POST ) { 'first_comment_email', ); - // Handle translation install. + // Handle translation installation. if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) { $language = wp_download_language_pack( $_POST['WPLANG'] ); if ( $language ) { diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index e0ccfc26fa..0b404ea7c4 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -10,7 +10,7 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -/** WordPress Translation Install API */ +/** WordPress Translation Installation API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); if ( ! current_user_can( 'create_sites' ) ) { @@ -42,7 +42,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) $domain = strtolower( $blog['domain'] ); - // If not a subdomain install, make sure the domain isn't a reserved word + // If not a subdomain installation, make sure the domain isn't a reserved word if ( ! is_subdomain_install() ) { $subdirectory_reserved_names = get_subdirectory_reserved_names(); @@ -62,7 +62,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { 'public' => 1 ); - // Handle translation install for the new site. + // Handle translation installation for the new site. if ( isset( $_POST['WPLANG'] ) ) { if ( '' === $_POST['WPLANG'] ) { $meta['WPLANG'] = ''; // en_US diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index e85b5bb784..5be7ad99e7 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -9,7 +9,7 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -/** WordPress Translation Install API */ +/** WordPress Translation Installation API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); if ( ! current_user_can( 'manage_options' ) ) diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index aa314f3bf2..51e306ea48 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -27,7 +27,7 @@ if ( apply_filters( 'enable_post_by_email_configuration', true ) ) { get_current_screen()->add_help_tab( array( 'id' => 'options-postemail', 'title' => __( 'Post Via Email' ), - 'content' => '

    ' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '

    ', + 'content' => '

    ' . __( 'Post via email settings allow you to send your WordPress installation an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '

    ', ) ); } diff --git a/wp-admin/options.php b/wp-admin/options.php index 9d9c35f58d..45374be367 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -176,7 +176,7 @@ if ( 'update' == $action ) { $_POST['timezone_string'] = ''; } - // Handle translation install. + // Handle translation installation. if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) { require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php index f10f8faccb..855beb613d 100644 --- a/wp-admin/plugin-install.php +++ b/wp-admin/plugin-install.php @@ -67,7 +67,7 @@ wp_enqueue_script( 'updates' ); do_action( "install_plugins_pre_{$tab}" ); /* - * Call the pre upload action on every non-upload plugin install screen + * Call the pre upload action on every non-upload plugin installation screen * because the form is always displayed on these screens. */ if ( 'upload' !== $tab ) { @@ -129,7 +129,7 @@ if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) { ' ); -// Check if wp-config.php exists above the root directory but is not part of another install +// Check if wp-config.php exists above the root directory but is not part of another installation if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) { wp_die( '

    ' . sprintf( /* translators: %s: install.php */ @@ -368,8 +368,8 @@ switch($step) { echo htmlentities($line, ENT_COMPAT, 'UTF-8'); } ?> -

    -

    +

    +

    • ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; ?>
    ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + echo ' ' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; ?>
    ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; + ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . ''; ?>