From 59f6264c64ba1603f5d568e2ef328e5e71f90a48 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Tue, 27 Jul 2010 18:02:45 +0000 Subject: [PATCH] These are not verbs. http://notaverb.com/badbad_verbs git-svn-id: https://develop.svn.wordpress.org/trunk@15473 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-activate.php | 2 +- wp-admin/includes/upgrade.php | 2 +- wp-admin/nav-menus.php | 4 ++-- wp-admin/update-core.php | 2 +- wp-includes/media.php | 2 +- wp-includes/ms-functions.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-activate.php b/wp-activate.php index b9e7707055..01d224dab8 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 7ae2384e0e..e8d78e84d9 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 847fc07d9e..ee7b585325 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 81472f23c5..e8d487455b 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 '

'; echo '

'; diff --git a/wp-includes/media.php b/wp-includes/media.php index ee4db93b32..69ef8c3294 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -1063,7 +1063,7 @@ class WP_Embed { function run_shortcode( $content ) { global $shortcode_tags; - // Backup current registered shortcodes and clear them all out + // Back up current registered shortcodes and clear them all out $orig_shortcode_tags = $shortcode_tags; remove_all_shortcodes(); diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 2b548621b0..9e4438837e 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -284,7 +284,7 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { if ( domain_exists($domain, $path, $site_id) ) return __( 'Error: Site URL already taken.' ); - // Need to backup wpdb table names, and create a new wp_blogs entry for new blog. + // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. // Need to get blog_id from wp_blogs, and create new table names. // Must restore table names at the end of function.