From 0ed6a9bbb22b5b18bd33301863975642ca3520f9 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 10 Jun 2010 20:44:54 +0000
Subject: [PATCH] Valid HTML for wp-signup. fixes #13369, props ocean90,
 snumb130.

git-svn-id: https://develop.svn.wordpress.org/trunk@15199 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/template.php | 10 +++++-----
 wp-signup.php                  |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 87442b87e7..8d676bccd5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3748,23 +3748,23 @@ function screen_options($screen) {
 			$per_page_label = $post_type_object->labels->name;
 			break;
 		case 'ms-sites':
-			$per_page_label = __('Sites');
+			$per_page_label = _x( 'Sites', 'sites per page (screen options)' );
 			break;
 		case 'ms-users':
-			$per_page_label = __('Users');
+			$per_page_label = _x( 'Users', 'users per page (screen options)' );
 			break;
 		case 'edit-comments':
-			$per_page_label = __('Comments');
+			$per_page_label = _x( 'Comments', 'comments per page (screen options)' );
 			break;
 		case 'upload':
-			$per_page_label = __('Media items');
+			$per_page_label = _x( 'Media items', 'items per page (screen options)' );
 			break;
 		case 'edit-tags':
 			global $tax;
 			$per_page_label = $tax->labels->name;
 			break;
 		case 'plugins':
-			$per_page_label = __('Plugins');
+			$per_page_label = _x( 'Plugins', 'plugins per page (screen options)' );
 			break;
 		default:
 			return '';
diff --git a/wp-signup.php b/wp-signup.php
index cc204a4cca..88021a4caa 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -95,14 +95,14 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
 	<?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php }
-	echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" /></p>';
+	echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
 	?>
 
 	<div id="privacy">
         <p class="privacy-intro">
             <label for="blog_public_on"><?php _e('Privacy:') ?></label>
             <?php _e('Allow my site to appear in search engines like Google, Technorati, and in public listings around this network.'); ?>
-            <div style="clear:both;"></div>
+            <br style="clear:both" />
             <label class="checkbox" for="blog_public_on">
                 <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
                 <strong><?php _e( 'Yes' ); ?></strong>
@@ -176,15 +176,14 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
 	<?php
 	$blogs = get_blogs_of_user($current_user->ID);
 	if ( !empty($blogs) ) { ?>
-		<p>
-			<?php _e( 'Sites you are already a member of:' ) ?>
+		
+			<p><?php _e( 'Sites you are already a member of:' ) ?></p>
 			<ul>
 				<?php foreach ( $blogs as $blog ) {
 					$home_url = get_home_url( $blog->userblog_id );
 					echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
 				} ?>
 			</ul>
-		</p>
 	<?php } ?>
 
 	<p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>