Changeset 15473

Timestamp:

07/27/2010 06:02:45 PM (14 years ago)

Author:

markjaquith

Message:

These are not verbs. ​http://notaverb.com/badbad_verbs

Location:

trunk

Files:

• wp-activate.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-activate.php

@@ -66 +66 @@
                 echo '<p class="lead-in">';
                 if ( $signup->domain . $signup->path == '' ) {
-                    printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  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 <a href="%4$s">reset your password</a>.'), 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 <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;.  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 <a href="%4$s">reset your password</a>.'), 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 <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  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 <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) );

trunk/wp-admin/includes/upgrade.php

@@ -267 +267 @@
     $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 ) );

trunk/wp-admin/nav-menus.php

@@ -71 +71 @@
                 $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();
@@ -145 +145 @@
                 $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();

trunk/wp-admin/update-core.php

@@ -132 +132 @@
     } else {
         echo '<div class="updated"><p>';
-        _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
+        _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
         echo '</p></div>';
 

trunk/wp-includes/media.php

@@ -1064 +1064 @@
         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();

trunk/wp-includes/ms-functions.php

@@ -285 +285 @@
         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.