Index: wp-activate.php =================================================================== --- wp-activate.php (revision 19592) +++ wp-activate.php (working copy) @@ -63,9 +63,9 @@ '; if ( $signup->domain . $signup->path == '' ) { - 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, wp_lostpassword_url() ); + 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, wp_lostpassword_url() ); } 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, wp_lostpassword_url() ); + 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, wp_lostpassword_url() ); } echo '

'; } else { Index: wp-admin/users.php =================================================================== --- wp-admin/users.php (revision 19592) +++ wp-admin/users.php (working copy) @@ -33,7 +33,7 @@ 'content' => '

' . __('You can customize the display of this screen in a number of ways:') . '

' . '' ) ); Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 19592) +++ wp-admin/admin-ajax.php (working copy) @@ -970,7 +970,7 @@ // Drafts and auto-drafts are just overwritten by autosave if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) { $id = edit_post(); - } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. + } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. $revision_id = wp_create_post_autosave( $post->ID ); if ( is_wp_error($revision_id) ) $id = $revision_id; Index: wp-admin/includes/plugin.php =================================================================== --- wp-admin/includes/plugin.php (revision 19592) +++ wp-admin/includes/plugin.php (working copy) @@ -985,7 +985,7 @@ } // If the parent doesn't already have a submenu, add a link to the parent - // as the first item in the submenu. If the submenu file is the same as the + // as the first item in the submenu. If the submenu file is the same as the // parent file someone is trying to link back to the parent manually. In // this case, don't automatically add a link back to avoid duplication. if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) { Index: wp-admin/includes/file.php =================================================================== --- wp-admin/includes/file.php (revision 19592) +++ wp-admin/includes/file.php (working copy) @@ -240,7 +240,7 @@ // You may define your own function and pass the name in $overrides['upload_error_handler'] $upload_error_handler = 'wp_handle_upload_error'; - // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. + // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] ) return $upload_error_handler( $file, $file['error'] ); @@ -364,7 +364,7 @@ /** * Handle sideloads, which is the process of retrieving a media item from another server instead of - * a traditional media upload. This process involves sanitizing the filename, checking extensions + * a traditional media upload. This process involves sanitizing the filename, checking extensions * for mime type, and moving the file to the appropriate directory within the uploads directory. * * @since 2.6.0 Index: wp-admin/includes/class-wp-users-list-table.php =================================================================== --- wp-admin/includes/class-wp-users-list-table.php (revision 19592) +++ wp-admin/includes/class-wp-users-list-table.php (working copy) @@ -209,9 +209,9 @@ * @since 2.1.0 * * @param object $user_object - * @param string $style Optional. Attributes added to the TR element. Must be sanitized. + * @param string $style Optional. Attributes added to the TR element. Must be sanitized. * @param string $role Key for the $wp_roles array. - * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. + * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. * @return string */ function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 19592) +++ wp-admin/includes/dashboard.php (working copy) @@ -273,7 +273,7 @@ echo ''; /* TODO: Show status breakdown on hover - if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can + if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can $post_type_texts[] = ''.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).''; } if ( $can_edit_posts && !empty($num_posts->draft) ) { @@ -1115,7 +1115,7 @@ if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) { $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] ); $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); - // title is optional. If black, fill it if possible + // title is optional. If black, fill it if possible if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { $rss = fetch_feed($widget_options[$widget_id]['url']); if ( is_wp_error($rss) ) { Index: wp-admin/includes/deprecated.php =================================================================== --- wp-admin/includes/deprecated.php (revision 19592) +++ wp-admin/includes/deprecated.php (working copy) @@ -133,7 +133,7 @@ * @deprecated Use register_setting() * @see register_setting() * - * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. + * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. @@ -870,7 +870,7 @@ * @deprecated Use get_current_screen()->add_help_tab() * @see WP_Screen * - * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. + * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. * @param string $help The content of an 'Overview' help tab. */ function add_contextual_help( $screen, $help ) { Index: wp-admin/includes/image-edit.php =================================================================== --- wp-admin/includes/image-edit.php (revision 19592) +++ wp-admin/includes/image-edit.php (working copy) @@ -192,7 +192,7 @@
- + 0, Index: wp-admin/includes/class-wp-filesystem-direct.php =================================================================== --- wp-admin/includes/class-wp-filesystem-direct.php (revision 19592) +++ wp-admin/includes/class-wp-filesystem-direct.php (working copy) @@ -207,7 +207,7 @@ if ( ! $overwrite && $this->exists($destination) ) return false; - // try using rename first. if that fails (for example, source is read only) try copy + // try using rename first. if that fails (for example, source is read only) try copy if ( @rename($source, $destination) ) return true; Index: wp-admin/custom-header.php =================================================================== --- wp-admin/custom-header.php (revision 19592) +++ wp-admin/custom-header.php (working copy) @@ -676,7 +676,7 @@ $oitar = $width / HEADER_IMAGE_WIDTH; $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); if ( is_wp_error( $image ) ) - wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); + wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication @@ -737,7 +737,7 @@ $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); if ( is_wp_error( $cropped ) ) - wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); + wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication Index: wp-admin/user-new.php =================================================================== --- wp-admin/user-new.php (revision 19592) +++ wp-admin/user-new.php (working copy) @@ -251,10 +251,10 @@ if ( $do_both ) echo '

' . __('Add Existing User') . '

'; if ( !is_super_admin() ) { - _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); + _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); $label = __('E-mail'); } else { - _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); + _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ); $label = __('E-mail or Username'); } ?> Index: wp-admin/options-general.php =================================================================== --- wp-admin/options-general.php (revision 19592) +++ wp-admin/options-general.php (working copy) @@ -151,7 +151,7 @@ $check_zone_info = true; -// Remove old Etc mappings. Fallback to gmt_offset. +// Remove old Etc mappings. Fallback to gmt_offset. if ( false !== strpos($tzstring,'Etc/GMT') ) $tzstring = ''; Index: wp-admin/edit-form-advanced.php =================================================================== --- wp-admin/edit-form-advanced.php (revision 19592) +++ wp-admin/edit-form-advanced.php (working copy) @@ -87,7 +87,7 @@ if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) { foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { - $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. View the autosave' ), get_edit_post_link( $autosave->ID ) ); + $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. View the autosave' ), get_edit_post_link( $autosave->ID ) ); break; } } Index: wp-admin/options-discussion.php =================================================================== --- wp-admin/options-discussion.php (revision 19592) +++ wp-admin/options-discussion.php (working copy) @@ -164,7 +164,7 @@

-

+

Index: wp-admin/plugins.php =================================================================== --- wp-admin/plugins.php (revision 19592) +++ wp-admin/plugins.php (working copy) @@ -355,7 +355,7 @@ if ( isset( $_GET['main'] ) ) $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' ); elseif ( isset($_GET['charsout']) ) - $errmsg = sprintf(__('The plugin generated %d characters of unexpected output during activation. If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']); + $errmsg = sprintf(__('The plugin generated %d characters of unexpected output during activation. If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']); else $errmsg = __('Plugin could not be activated because it triggered a fatal error.'); ?> Index: wp-admin/upgrade.php =================================================================== --- wp-admin/upgrade.php (revision 19592) +++ wp-admin/upgrade.php (working copy) @@ -27,7 +27,7 @@ else $step = 0; -// Do it. No output. +// Do it. No output. if ( 'upgrade_db' === $step ) { wp_upgrade(); die( '0' ); Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 19592) +++ wp-admin/install.php (working copy) @@ -207,7 +207,7 @@ $error = true; } elseif ( ! is_email( $admin_email ) ) { // TODO: poka-yoke - display_setup_form( __( 'that isn’t a valid e-mail address. E-mail addresses look like: username@example.com' ) ); + display_setup_form( __( 'that isn’t a valid e-mail address. E-mail addresses look like: username@example.com' ) ); $error = true; } Index: wp-admin/update-core.php =================================================================== --- wp-admin/update-core.php (revision 19592) +++ wp-admin/update-core.php (working copy) @@ -36,7 +36,7 @@ $mysql_version = $wpdb->db_version(); $show_buttons = true; if ( 'development' == $update->response ) { - $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:'); + $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:'); $download = __('Download nightly build'); } else { if ( $current ) { @@ -317,7 +317,7 @@ echo " - {$theme_data->Name}" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . " + {$theme_data->Name}" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . " "; } ?> Index: wp-admin/import.php =================================================================== --- wp-admin/import.php (revision 19592) +++ wp-admin/import.php (working copy) @@ -20,7 +20,7 @@ 'id' => 'overview', 'title' => __('Overview'), 'content' => '

' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '

' . - '

' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '

', + '

' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '

', ) ); Index: wp-admin/options-writing.php =================================================================== --- wp-admin/options-writing.php (revision 19592) +++ wp-admin/options-writing.php (working copy) @@ -32,7 +32,7 @@ if ( is_multisite() ) { $post_email_help = '

' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '

'; } else { - $post_email_help = '

' . __('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 e-mail 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.') . '

'; + $post_email_help = '

' . __('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 e-mail 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.') . '

'; } get_current_screen()->add_help_tab( array( Index: wp-admin/plugin-editor.php =================================================================== --- wp-admin/plugin-editor.php (revision 19592) +++ wp-admin/plugin-editor.php (working copy) @@ -236,7 +236,7 @@ -

Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?>

+

Warning: Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?>

-

+

widgets settings screen to configure them.'), admin_url( 'widgets.php' ) ); ?>