Skip to content

Commit

Permalink
These are not verbs. http://notaverb.com/badbad_verbs
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
markjaquith committed Jul 27, 2010
1 parent 65c1243 commit 7944bd5
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion wp-activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function wpmu_activate_stylesheet() {
<?php
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' ) );
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/nav-menus.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
$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 ) {
Expand Down Expand Up @@ -144,7 +144,7 @@
$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 ) {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/update-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function core_upgrade_preamble() {
echo '</h3>';
} 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>';

echo '<h3 class="response">';
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/media.php
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ function __construct() {
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();

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/ms-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 7944bd5

Please sign in to comment.