diff --git a/wp-activate.php b/wp-activate.php index b9e770705..01d224dab 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -65,7 +65,7 @@ get_header(); '; if ( $signup->domain . $signup->path == '' ) { - printf( __('Your account has been activated. You may now login to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); + printf( __('Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); } else { printf( __('Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can reset your password.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); } diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 7ae2384e0..e8d78e84d 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -266,7 +266,7 @@ function wp_install_defaults($user_id) { )); $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) ); - // Setup default widgets for default theme. + // Set up default widgets for default theme. update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) ); update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) ); update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) ); diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 847fc07d9..ee7b58532 100644 --- a/wp-admin/nav-menus.php +++ b/wp-admin/nav-menus.php @@ -70,7 +70,7 @@ switch ( $action ) { $ordered_menu_items = wp_get_nav_menu_items( $menu_id ); $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) ); - // setup the data we need in one pass through the array of menu items + // set up the data we need in one pass through the array of menu items $dbids_to_orders = array(); $orders_to_dbids = array(); foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) { @@ -144,7 +144,7 @@ switch ( $action ) { $ordered_menu_items = wp_get_nav_menu_items( $menu_id ); $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) ); - // setup the data we need in one pass through the array of menu items + // set up the data we need in one pass through the array of menu items $dbids_to_orders = array(); $orders_to_dbids = array(); foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) { diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 81472f23c..e8d487455 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -131,7 +131,7 @@ function core_upgrade_preamble() { echo ''; } else { echo '
'; - _e('Important: before updating, please backup your database and files. For help with updates, visit the Updating WordPress Codex page.'); + _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); echo '