Index: wp-admin/admin-header.php
===================================================================
--- wp-admin/admin-header.php	(revision 15497)
+++ wp-admin/admin-header.php	(working copy)
@@ -103,7 +103,7 @@
 else
 	$blog_name = get_bloginfo('name', 'display');
 if ( '' == $blog_name ) {
-	$blog_name = '&nbsp;';
+	$blog_name = '&#160;';
 } else {
 	$blog_name_excerpt = wp_html_excerpt($blog_name, 40);
 	if ( $blog_name != $blog_name_excerpt )
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 15497)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -273,7 +273,7 @@
 <table id="post-status-info" cellspacing="0"><tbody><tr>
 	<td id="wp-word-count"></td>
 	<td class="autosave-info">
-	<span id="autosave">&nbsp;</span>
+	<span id="autosave">&#160;</span>
 <?php
 	if ( 'auto-draft' != $post->post_status ) {
 		echo '<span id="last-edit">';
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 15497)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -59,7 +59,7 @@
 $stamp = __('Submitted on: <b>%1$s</b>');
 $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 ?>
-<span id="timestamp"><?php printf($stamp, $date); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
+<span id="timestamp"><?php printf($stamp, $date); ?></span>&#160;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
 <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
 </div>
 </div> <!-- misc actions -->
Index: wp-admin/includes/dashboard.php
===================================================================
--- wp-admin/includes/dashboard.php	(revision 15497)
+++ wp-admin/includes/dashboard.php	(working copy)
@@ -922,7 +922,7 @@
 							'&amp;TB_iframe=true&amp;width=600&amp;height=800';
 
 		echo "<h4>$label</h4>\n";
-		echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
+		echo "<h5><a href='$link'>$title</a></h5>&#160;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
 		echo "<p>$description</p>\n";
 
 		$$feed->__destruct();
Index: wp-admin/includes/default-list-tables.php
===================================================================
--- wp-admin/includes/default-list-tables.php	(revision 15497)
+++ wp-admin/includes/default-list-tables.php	(working copy)
@@ -463,7 +463,7 @@
 			$actions = array();
 			if ( current_user_can( $post_type_object->cap->edit_post, $page->ID ) && $post->post_status != 'trash' ) {
 				$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr( __( 'Edit this page' ) ) . '">' . __( 'Edit' ) . '</a>';
-				$actions['inline'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+				$actions['inline'] = '<a href="#" class="editinline">' . __( 'Quick&#160;Edit' ) . '</a>';
 			}
 			if ( current_user_can( $post_type_object->cap->delete_post, $page->ID ) ) {
 				if ( $post->post_status == 'trash' )
@@ -621,7 +621,7 @@
 				$actions = array();
 				if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) && 'trash' != $post->post_status ) {
 					$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID, true ) . '" title="' . esc_attr( __( 'Edit this item' ) ) . '">' . __( 'Edit' ) . '</a>';
-					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+					$actions['inline hide-if-no-js'] = '<a href="#" class="editinline" title="' . esc_attr( __( 'Edit this item inline' ) ) . '">' . __( 'Quick&#160;Edit' ) . '</a>';
 				}
 				if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
 					if ( 'trash' == $post->post_status )
@@ -1737,14 +1737,14 @@
 					if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
 						$out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
 					else
-						$out .= '<th scope="row" class="check-column">&nbsp;</th>';
+						$out .= '<th scope="row" class="check-column">&#160;</th>';
 					break;
 				case 'name':
 					$out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
 					$actions = array();
 					if ( current_user_can( $tax->cap->edit_terms ) ) {
 						$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-						$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+						$actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&#160;Edit' ) . '</a>';
 					}
 					if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
 						$actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
@@ -2416,7 +2416,7 @@
 
 						if ( 'trash' != $the_comment_status ) {
 							$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
-							$actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+							$actions['quickedit'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\',\'edit\' );return false;" class="vim-q" title="'.esc_attr__( 'Quick Edit' ).'" href="#">' . __( 'Quick&#160;Edit' ) . '</a>';
 							if ( 'spam' != $the_comment_status )
 								$actions['reply'] = '<a onclick="commentReply.open( \''.$comment->comment_ID.'\',\''.$post->ID.'\' );return false;" class="vim-r" title="'.esc_attr__( 'Reply to this comment' ).'" href="#">' . __( 'Reply' ) . '</a>';
 						}
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 15497)
+++ wp-admin/includes/media.php	(working copy)
@@ -870,7 +870,7 @@
 			$html .= "<label for='{$css_id}'>$label</label>";
 			// only show the dimensions if that choice is available
 			if ( $enabled )
-				$html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
+				$html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&#160;&times;&#160;%d)", $downsize[1], $downsize[2] ). "</label>";
 
 			$html .= '</div>';
 
@@ -1217,7 +1217,7 @@
 	$media_dims = '';
 	$meta = wp_get_attachment_metadata( $post->ID );
 	if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
-		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&#160;&times;&#160;{$meta['height']}</span> ";
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
 	$image_edit_button = '';
@@ -1495,7 +1495,7 @@
 	<div>
 	<?php _e( 'Choose files to upload' ); ?>
 	<div id="flash-browse-button"></div>
-	<span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
+	<span><input id="cancel-upload" disabled="disabled" onClick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
 	</div>
 	<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
 <?php do_action('post-flash-upload-ui'); ?>
@@ -1507,7 +1507,7 @@
 <?php do_action('pre-html-upload-ui'); ?>
 	<p id="async-upload-wrap">
 	<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
-	<input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php esc_attr_e('Upload'); ?>" /> <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
+	<input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php esc_attr_e('Upload'); ?>" /> <a href="#" onClick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
 	</p>
 	<div class="clear"></div>
 	<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
@@ -2056,11 +2056,11 @@
 			<td class="field">
 				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
 				<label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
-				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
+				<input name="align" id="align-left" value="left" onClick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
 				<label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
-				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
+				<input name="align" id="align-center" value="center" onClick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
 				<label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
-				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
+				<input name="align" id="align-right" value="right" onClick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
 				<label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
 			</td>
 		</tr>
@@ -2071,8 +2071,8 @@
 			</th>
 			<td class="field"><input id="url" name="url" value="" type="text" /><br />
 
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
+			<button type="button" class="button" value="" onClick="document.forms[0].url.value=null">' . __('None') . '</button>
+			<button type="button" class="button" value="" onClick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
 			<p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
 		</tr>
 	' . _insert_into_post_button('image') . '
@@ -2181,7 +2181,7 @@
 		<tr>
 			<td></td>
 			<td>
-				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+				<input type="button" class="button" id="go_button" style="color:#bbb;" onClick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
 			</td>
 		</tr>
 	';
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 15497)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -879,7 +879,7 @@
 					echo 'selected="selected"';
 				echo('>'.$r.'</option>');
 			}
-		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+		?></select>&#160;<?php _e('(Leave at 0 for no rating.)') ?>
 		</td>
 	</tr>
 </table>
Index: wp-admin/includes/misc.php
===================================================================
--- wp-admin/includes/misc.php	(revision 15497)
+++ wp-admin/includes/misc.php	(working copy)
@@ -604,7 +604,7 @@
 	<table class="color-palette">
 	<tr>
 	<?php foreach ( $color_info->colors as $html_color ): ?>
-	<td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&nbsp;</td>
+	<td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>">&#160;</td>
 	<?php endforeach; ?>
 	</tr>
 	</table>
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 15497)
+++ wp-admin/includes/template.php	(working copy)
@@ -511,7 +511,7 @@
 ?>
 </select>
 <input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" tabindex="7" value="" />
-<a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
+<a href="#postcustomstuff" class="hide-if-no-js" onClick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
 <span id="enternew"><?php _e('Enter new'); ?></span>
 <span id="cancelnew" class="hidden"><?php _e('Cancel'); ?></span></a>
 <?php } else { ?>
@@ -646,7 +646,7 @@
 					continue;
 				}
 			}
-			$pad = str_repeat( '&nbsp;', $level * 3 );
+			$pad = str_repeat( '&#160;', $level * 3 );
 			if ( $item->ID == $default)
 				$current = ' selected="selected"';
 			else
@@ -1336,7 +1336,7 @@
 				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
 				<label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
 				<input type="text" id="find-posts-input" name="ps" value="" />
-				<input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
+				<input type="button" onClick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
 
 				<?php
 				$post_types = get_post_types( array('public' => true), 'objects' );
@@ -1352,7 +1352,7 @@
 			<div id="find-posts-response"></div>
 		</div>
 		<div class="find-box-buttons">
-			<input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
+			<input type="button" class="button alignleft" onClick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
 			<input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
 		</div>
 	</div>
Index: wp-admin/js/plugin-install.dev.js
===================================================================
--- wp-admin/js/plugin-install.dev.js	(revision 15497)
+++ wp-admin/js/plugin-install.dev.js	(working copy)
@@ -25,7 +25,7 @@
 		tb_click.call(this);
 
 		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
+		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&#160;' + $(this).attr('title') );
 		return false;
 	});
 
Index: wp-admin/js/post.dev.js
===================================================================
--- wp-admin/js/post.dev.js	(revision 15497)
+++ wp-admin/js/post.dev.js	(working copy)
@@ -55,7 +55,7 @@
 				if ( disabled )
 		 			txt = '<span>' + val + '</span> ';
 				else
-		 			txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a>&nbsp;' + val + '</span> ';
+		 			txt = '<span><a id="' + button_id + '" class="ntdelbutton">X</a>&#160;' + val + '</span> ';
 	 			tagchecklist.append(txt);
 				if ( ! disabled )
 		 			$( '#' + button_id ).click( function(){ tagBox.parseTags(this); });
Index: wp-admin/js/tags.dev.js
===================================================================
--- wp-admin/js/tags.dev.js	(revision 15497)
+++ wp-admin/js/tags.dev.js	(working copy)
@@ -52,7 +52,7 @@
 				// Create an indent for the Parent field
 				var indent = '';
 				for ( var i = 0; i < res.responses[1].position; i++ )
-					indent += '&nbsp;&nbsp;&nbsp;';
+					indent += '&#160;&#160;&#160;';
 
 				form.find('select#parent option:selected').after('<option value="' + term['term_id'] + '">' + indent + term['name'] + '</option>');
 			}
Index: wp-admin/js/theme-preview.dev.js
===================================================================
--- wp-admin/js/theme-preview.dev.js	(revision 15497)
+++ wp-admin/js/theme-preview.dev.js	(working copy)
@@ -38,10 +38,10 @@
 		if ( alink.length ) {
 			url = alink.attr('href') || '';
 			text = alink.attr('title') || '';
-			link = '&nbsp; <a href="' + url + '" target="_top" class="tb-theme-preview-link">' + text + '</a>';
+			link = '&#160; <a href="' + url + '" target="_top" class="tb-theme-preview-link">' + text + '</a>';
 		} else {
 			text = $(this).attr('title') || '';
-			link = '&nbsp; <span class="tb-theme-preview-link">' + text + '</span>';
+			link = '&#160; <span class="tb-theme-preview-link">' + text + '</span>';
 		}
 
 		$('#TB_title').css({'background-color':'#222','color':'#dfdfdf'});
Index: wp-admin/maint/repair.php
===================================================================
--- wp-admin/maint/repair.php	(revision 15497)
+++ wp-admin/maint/repair.php	(working copy)
@@ -45,9 +45,9 @@
 			echo "<p>The $table table is not okay. It is reporting the following error: <code>$check->Msg_text</code>.  WordPress will attempt to repair this table&hellip;";
 			$repair = $wpdb->get_row("REPAIR TABLE $table");
 			if ( 'OK' == $check->Msg_text ) {
-				echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully repaired the $table table.";
+				echo "<br />&#160;&#160;&#160;&#160;Successfully repaired the $table table.";
 			} else {
-				echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the $table table. Error: $check->Msg_text<br />";
+				echo "<br />&#160;&#160;&#160;&#160;Failed to repair the $table table. Error: $check->Msg_text<br />";
 				$problems["$table"] = $check->Msg_text;
 				$okay = false;
 			}
@@ -55,13 +55,13 @@
 		if ( $okay && $optimize ) {
 			$check = $wpdb->get_row("ANALYZE TABLE $table");
 			if ( 'Table is already up to date' == $check->Msg_text )  {
-				echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;The $table table is already optimized.";
+				echo "<br />&#160;&#160;&#160;&#160;The $table table is already optimized.";
 			} else {
 				$check = $wpdb->get_row("OPTIMIZE TABLE $table");
 				if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text )
-					echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Successfully optimized the $table table.";
+					echo "<br />&#160;&#160;&#160;&#160;Successfully optimized the $table table.";
 				else
-					echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the $table table. Error: $check->Msg_text";
+					echo "<br />&#160;&#160;&#160;&#160;Failed to optimize the $table table. Error: $check->Msg_text";
 			}
 		}
 		echo '</p>';
Index: wp-admin/network/sites.php
===================================================================
--- wp-admin/network/sites.php	(revision 15497)
+++ wp-admin/network/sites.php	(working copy)
@@ -307,7 +307,7 @@
 					<p class="description"><?php _e( 'Enter the username of an existing user and hit &#8220;Update Options&#8221; to add the user.' ) ?></p>
 					<table class="form-table">
 							<tr>
-								<th scope="row"><?php _e( 'User&nbsp;Login:' ) ?></th>
+								<th scope="row"><?php _e( 'User&#160;Login:' ) ?></th>
 								<td><input type="text" name="newuser" id="newuser" /></td>
 							</tr>
 							<tr>
Index: wp-admin/network/themes.php
===================================================================
--- wp-admin/network/themes.php	(revision 15497)
+++ wp-admin/network/themes.php	(working copy)
@@ -73,7 +73,7 @@
 				<tr valign="top" class="<?php echo $class . ' ' . $class1; ?>">
 					<td>
 						<label><input name="theme[<?php echo $theme_key ?>]" type="radio" id="enabled_<?php echo $theme_key ?>" value="enabled" <?php checked( $enabled ) ?> /> <?php _e( 'Yes' ) ?></label>
-						&nbsp;&nbsp;&nbsp;
+						&#160;&#160;&#160;
 						<label><input name="theme[<?php echo $theme_key ?>]" type="radio" id="disabled_<?php echo $theme_key ?>" value="disabled" <?php checked( $disabled ) ?> /> <?php _e( 'No' ) ?></label>
 					</td>
 					<th scope="row" style="text-align:left;"><?php echo $key ?></th>
Index: wp-admin/update-core.php
===================================================================
--- wp-admin/update-core.php	(revision 15497)
+++ wp-admin/update-core.php	(working copy)
@@ -58,8 +58,8 @@
 	echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
 	echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
 	if ( $show_buttons ) {
-		echo '<input id="upgrade" class="button" type="submit" value="' . esc_attr($submit) . '" name="upgrade" />&nbsp;';
-		echo '<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&nbsp;';
+		echo '<input id="upgrade" class="button" type="submit" value="' . esc_attr($submit) . '" name="upgrade" />&#160;';
+		echo '<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&#160;';
 	}
 	if ( 'en_US' != $update->locale )
 		if ( !isset( $update->dismissed ) || !$update->dismissed )
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 15497)
+++ wp-admin/widgets.php	(working copy)
@@ -280,7 +280,7 @@
 	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
 		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
 		if ( 'wp_inactive_widgets' == $sbname ) {
-			echo '&nbsp;';
+			echo '&#160;';
 		} else {
 			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
 				$j = 1;
Index: wp-includes/classes.php
===================================================================
--- wp-includes/classes.php	(revision 15497)
+++ wp-includes/classes.php	(working copy)
@@ -1261,7 +1261,7 @@
 	 * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
 	 */
 	function start_el(&$output, $page, $depth, $args) {
-		$pad = str_repeat('&nbsp;', $depth * 3);
+		$pad = str_repeat('&#160;', $depth * 3);
 
 		$output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
 		if ( $page->ID == $args['selected'] )
@@ -1453,7 +1453,7 @@
 	 * @param array $args Uses 'selected', 'show_count', and 'show_last_update' keys, if they exist.
 	 */
 	function start_el(&$output, $category, $depth, $args) {
-		$pad = str_repeat('&nbsp;', $depth * 3);
+		$pad = str_repeat('&#160;', $depth * 3);
 
 		$cat_name = apply_filters('list_cats', $category->name, $category);
 		$output .= "\t<option class=\"level-$depth\" value=\"".$category->term_id."\"";
@@ -1462,10 +1462,10 @@
 		$output .= '>';
 		$output .= $pad.$cat_name;
 		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. $category->count .')';
+			$output .= '&#160;&#160;('. $category->count .')';
 		if ( $args['show_last_update'] ) {
 			$format = 'Y-m-d';
-			$output .= '&nbsp;&nbsp;' . gmdate($format, $category->last_update_timestamp);
+			$output .= '&#160;&#160;' . gmdate($format, $category->last_update_timestamp);
 		}
 		$output .= "</option>\n";
 	}
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php	(revision 15497)
+++ wp-includes/comment-template.php	(working copy)
@@ -1366,7 +1366,7 @@
 		<div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
 			<?php
 				/* translators: 1: date, 2: time */
-				printf( __('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','' );
+				printf( __('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&#160;&#160;','' );
 			?>
 		</div>
 
Index: wp-includes/default-widgets.php
===================================================================
--- wp-includes/default-widgets.php	(revision 15497)
+++ wp-includes/default-widgets.php	(working copy)
@@ -334,7 +334,7 @@
 
 	function widget( $args, $instance ) {
 		extract($args);
-		$title = apply_filters('widget_title', empty($instance['title']) ? '&nbsp;' : $instance['title'], $instance, $this->id_base);
+		$title = apply_filters('widget_title', empty($instance['title']) ? '&#160;' : $instance['title'], $instance, $this->id_base);
 		echo $before_widget;
 		if ( $title )
 			echo $before_title . $title . $after_title;
@@ -406,7 +406,7 @@
 
 		<textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id('text'); ?>" name="<?php echo $this->get_field_name('text'); ?>"><?php echo $text; ?></textarea>
 
-		<p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
+		<p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&#160;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
 <?php
 	}
 }
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 15497)
+++ wp-includes/general-template.php	(working copy)
@@ -924,7 +924,7 @@
 				/* translators: 1: month name, 2: 4-digit year */
 				$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($arcresult->month), $arcresult->year);
 				if ( $show_post_count )
-					$after = '&nbsp;('.$arcresult->posts.')' . $afterafter;
+					$after = '&#160;('.$arcresult->posts.')' . $afterafter;
 				$output .= get_archives_link($url, $text, $format, $before, $after);
 			}
 		}
@@ -945,7 +945,7 @@
 				$url = get_year_link($arcresult->year);
 				$text = sprintf('%d', $arcresult->year);
 				if ($show_post_count)
-					$after = '&nbsp;('.$arcresult->posts.')' . $afterafter;
+					$after = '&#160;('.$arcresult->posts.')' . $afterafter;
 				$output .= get_archives_link($url, $text, $format, $before, $after);
 			}
 		}
@@ -967,7 +967,7 @@
 				$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $arcresult->year, $arcresult->month, $arcresult->dayofmonth);
 				$text = mysql2date($archive_day_date_format, $date);
 				if ($show_post_count)
-					$after = '&nbsp;('.$arcresult->posts.')'.$afterafter;
+					$after = '&#160;('.$arcresult->posts.')'.$afterafter;
 				$output .= get_archives_link($url, $text, $format, $before, $after);
 			}
 		}
@@ -996,7 +996,7 @@
 						$url  = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
 						$text = $arc_week_start . $archive_week_separator . $arc_week_end;
 						if ($show_post_count)
-							$after = '&nbsp;('.$arcresult->posts.')'.$afterafter;
+							$after = '&#160;('.$arcresult->posts.')'.$afterafter;
 						$output .= get_archives_link($url, $text, $format, $before, $after);
 					}
 				}
@@ -1159,15 +1159,15 @@
 	if ( $previous ) {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month), date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
 	} else {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&#160;</td>';
 	}
 
-	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
+	$calendar_output .= "\n\t\t".'<td class="pad">&#160;</td>';
 
 	if ( $next ) {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link($next->year, $next->month) . '" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month), date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) ) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
 	} else {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&#160;</td>';
 	}
 
 	$calendar_output .= '
@@ -1222,7 +1222,7 @@
 	// See how much we should pad in the beginning
 	$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
 	if ( 0 != $pad )
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad">&#160;</td>';
 
 	$daysinmonth = intval(date('t', $unixmonth));
 	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
@@ -1247,7 +1247,7 @@
 
 	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
 	if ( $pad != 0 && $pad != 7 )
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'">&nbsp;</td>';
+		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'">&#160;</td>';
 
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
Index: wp-includes/js/colorpicker.dev.js
===================================================================
--- wp-includes/js/colorpicker.dev.js	(revision 15497)
+++ wp-includes/js/colorpicker.dev.js	(working copy)
@@ -681,7 +681,7 @@
 		if ((i % width) == 0) { cp_contents += "<tr>"; }
 		if (use_highlight) { var mo = 'onMouseOver="'+windowRef+'ColorPicker_highlightColor(\''+colors[i]+'\',window.document)"'; }
 		else { mo = ""; }
-		cp_contents += '<td style="background-color: '+colors[i]+';"><a href="javascript:void()" onclick="'+windowRef+'ColorPicker_pickColor(\''+colors[i]+'\','+windowRef+'window.popupWindowObjects['+cp.index+']);return false;" '+mo+'>&nbsp;</a></td>';
+		cp_contents += '<td style="background-color: '+colors[i]+';"><a href="javascript:void()" onclick="'+windowRef+'ColorPicker_pickColor(\''+colors[i]+'\','+windowRef+'window.popupWindowObjects['+cp.index+']);return false;" '+mo+'>&#160;</a></td>';
 		if ( ((i+1)>=total) || (((i+1) % width) == 0)) { 
 			cp_contents += "</tr>";
 			}
@@ -690,7 +690,7 @@
 	if (document.getElementById) {
 		var width1 = Math.floor(width/2);
 		var width2 = width = width1;
-		cp_contents += "<tr><td colspan='"+width1+"' style='background-color: #FFF;' ID='colorPickerSelectedColor'>&nbsp;</td><td colspan='"+width2+"' style='text-align: center;' id='colorPickerSelectedColorValue'>#FFFFFF</td></tr>";
+		cp_contents += "<tr><td colspan='"+width1+"' style='background-color: #FFF;' ID='colorPickerSelectedColor'>&#160;</td><td colspan='"+width2+"' style='text-align: center;' id='colorPickerSelectedColorValue'>#FFFFFF</td></tr>";
 		}
 	cp_contents += "</table>";
 	if (windowMode) {
Index: wp-includes/js/tinymce/plugins/media/media.htm
===================================================================
--- wp-includes/js/tinymce/plugins/media/media.htm	(revision 15497)
+++ wp-includes/js/tinymce/plugins/media/media.htm	(working copy)
@@ -44,7 +44,7 @@
 									<table border="0" cellspacing="0" cellpadding="0">
 									  <tr>
 										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>
-										<td id="filebrowsercontainer">&nbsp;</td>
+										<td id="filebrowsercontainer">&#160;</td>
 									  </tr>
 									</table>
 								</td>
@@ -59,7 +59,7 @@
 									<table border="0" cellpadding="0" cellspacing="0">
 										<tr>
 											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>
-											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+											<td>&#160;&#160;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
 											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
 										</tr>
 									</table>
@@ -103,7 +103,7 @@
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
+										<td id="bgcolor_pickcontainer">&#160;</td>
 									</tr>
 								</table>
 							</td>
@@ -437,7 +437,7 @@
 								</select>
 							</td>
 
-							<td colspan="2">&nbsp;</td>
+							<td colspan="2">&#160;</td>
 						</tr>
 
 						<tr>
@@ -470,7 +470,7 @@
 							<table border="0" cellspacing="0" cellpadding="0">
 								  <tr>
 									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>
-									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
+									<td id="qtsrcfilebrowsercontainer">&#160;</td>
 								  </tr>
 							</table>
 							</td>
@@ -699,8 +699,8 @@
 								</table>
 							</td>
 
-							<td colspan="2">
-								&nbsp;
+							<td colspan="2">&#160;
+								
 							</td>
 						</tr>
 
Index: wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
===================================================================
--- wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js	(revision 15497)
+++ wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js	(working copy)
@@ -73,7 +73,7 @@
 				var DL, DIV, P;
 
 				if ( e.keyCode == 13 && (DL = ed.dom.getParent(ed.selection.getNode(), 'DL')) && ed.dom.hasClass(DL, 'wp-caption') ) {
-					P = ed.dom.create('p', {}, '&nbsp;');
+					P = ed.dom.create('p', {}, '&#160;');
 					if ( (DIV = DL.parentNode) && DIV.nodeName == 'DIV' ) 
 						ed.dom.insertAfter( P, DIV );
 					else
Index: wp-includes/js/tinymce/themes/advanced/about.htm
===================================================================
--- wp-includes/js/tinymce/themes/advanced/about.htm	(revision 15497)
+++ wp-includes/js/tinymce/themes/advanced/about.htm	(working copy)
@@ -38,7 +38,7 @@
 					<div id="plugintablecontainer">
 					</div>
 
-					<p>&nbsp;</p>
+					<p>&#160;</p>
 				</div>
 			</div>
 
Index: wp-includes/js/tinymce/themes/advanced/charmap.htm
===================================================================
--- wp-includes/js/tinymce/themes/advanced/charmap.htm	(revision 15497)
+++ wp-includes/js/tinymce/themes/advanced/charmap.htm	(working copy)
@@ -18,10 +18,10 @@
         <td width="100" align="center" valign="top">
             <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
                 <tr>
-                    <td id="codeV">&nbsp;</td>
+                    <td id="codeV">&#160;</td>
                 </tr>
                 <tr>
-                    <td id="codeN">&nbsp;</td>
+                    <td id="codeN">&#160;</td>
                 </tr>
             </table>
         </td>
@@ -33,16 +33,16 @@
                     <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
                 </tr>
                 <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&#160;</td>
                 </tr>
                 <tr>
-                    <td style="font-size: 1px;">&nbsp;</td>
+                    <td style="font-size: 1px;">&#160;</td>
                 </tr>
                 <tr>
                     <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
                 </tr>
                 <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&#160;</td>
                 </tr>
             </table>
         </td>
Index: wp-includes/js/tinymce/themes/advanced/image.htm
===================================================================
--- wp-includes/js/tinymce/themes/advanced/image.htm	(revision 15497)
+++ wp-includes/js/tinymce/themes/advanced/image.htm	(working copy)
@@ -23,7 +23,7 @@
             <td><table border="0" cellspacing="0" cellpadding="0">
                 <tr>
                   <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
-                  <td id="srcbrowsercontainer">&nbsp;</td>
+                  <td id="srcbrowsercontainer">&#160;</td>
                 </tr>
               </table></td>
           </tr>
Index: wp-includes/js/tinymce/themes/advanced/js/charmap.js
===================================================================
--- wp-includes/js/tinymce/themes/advanced/js/charmap.js	(revision 15497)
+++ wp-includes/js/tinymce/themes/advanced/js/charmap.js	(working copy)
@@ -288,7 +288,7 @@
 	if (cols % charsPerRow > 0) {
 		var padd = charsPerRow - (cols % charsPerRow);
 		for (var i=0; i<padd-1; i++)
-			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&#160;</td>';
 	}
 
 	html += '</tr></table>';
Index: wp-includes/js/tinymce/themes/advanced/link.htm
===================================================================
--- wp-includes/js/tinymce/themes/advanced/link.htm	(revision 15497)
+++ wp-includes/js/tinymce/themes/advanced/link.htm	(working copy)
@@ -25,7 +25,7 @@
             <td><table border="0" cellspacing="0" cellpadding="0"> 
 				  <tr> 
 					<td><input id="href" name="href" type="text" class="mceFocus" value="http://" style="width: 200px" onfocus="try{this.select();}catch(e){}" /></td> 
-					<td id="hrefbrowsercontainer">&nbsp;</td>
+					<td id="hrefbrowsercontainer">&#160;</td>
 				  </tr> 
 				</table></td>
           </tr>
Index: wp-includes/js/tinymce/utils/form_utils.js
===================================================================
--- wp-includes/js/tinymce/utils/form_utils.js	(revision 15497)
+++ wp-includes/js/tinymce/utils/form_utils.js	(working copy)
@@ -13,7 +13,7 @@
 	var h = "";
 
 	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&#160;</span></a>';
 
 	return h;
 }
@@ -50,7 +50,7 @@
 
 	html = "";
 	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
-	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&#160;</span></a>';
 
 	return html;
 }
Index: wp-includes/wp-diff.php
===================================================================
--- wp-includes/wp-diff.php	(revision 15497)
+++ wp-includes/wp-diff.php	(working copy)
@@ -128,7 +128,7 @@
 	 * @return string
 	 */
 	function emptyLine() {
-		return '<td colspan="2">&nbsp;</td>';
+		return '<td colspan="2">&#160;</td>';
 	}
 
 	/**
Index: wp-signup.php
===================================================================
--- wp-signup.php	(revision 15497)
+++ wp-signup.php	(working copy)
@@ -136,7 +136,7 @@
 	_e( '(Must be at least 4 characters, letters and numbers only.)' );
 	?>
 
-	<label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
+	<label for="user_email"><?php _e( 'Email&#160;Address:' ) ?></label>
 	<?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php } ?>
