Index: site-new.php
===================================================================
--- site-new.php	(revision 23176)
+++ site-new.php	(working copy)
@@ -18,16 +18,16 @@
 
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'overview',
-		'title'   => __('Overview'),
+		'title'   => __( 'Overview' ),
 		'content' =>
-			'<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
-			'<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
+			'<p>' . __( 'This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.' ) . '</p>' .
+			'<p>' . __( 'If the admin email for the new site does not exist in the database, a new user will also be created.' ) . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>' ) . '</p>' .
+	'<p>' . __( '<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>' ) . '</p>'
 );
 
 if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
@@ -47,7 +47,7 @@
 	if ( ! is_subdomain_install() ) {
 		$subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
 		if ( in_array( $domain, $subdirectory_reserved_names ) )
-			wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
+			wp_die( sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
 	}
 
 	$email = sanitize_email( $blog['email'] );
@@ -89,7 +89,7 @@
 
 Address: %2$s
 Name: %3$s' ), $current_user->user_login , get_site_url( $id ), stripslashes( $title ) );
-		wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
+		wp_mail( get_site_option( 'admin_email' ), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
 		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
 		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
 		exit;
@@ -104,50 +104,62 @@
 		$messages[] = sprintf( __( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ), esc_url( get_admin_url( absint( $_GET['id'] ) ) ), network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) ) );
 }
 
-$title = __('Add New Site');
+$title = __( 'Add New Site' );
 $parent_file = 'sites.php';
 
-require('../admin-header.php');
+require( '../admin-header.php' );
 
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
-<h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
+<?php screen_icon( 'ms-admin' ); ?>
+<h2 id="add-new-site"><?php _e( 'Add New Site' ); ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
 	foreach ( $messages as $msg )
 		echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
 } ?>
-<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>">
-<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
+<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>">
+<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address' ) ?></th>
+			<th scope="row">
+				<label for="blog[domain]"><?php _e( 'Site Address' ); ?> 
+					<span class="description"><?php _e( '(required)' ); ?></span>
+				</label>
+			</th>
 			<td>
 			<?php if ( is_subdomain_install() ) { ?>
-				<input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+				<input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ); ?>" required="required" /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
 			<?php } else {
-				echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
+				echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ); ?>" required="required" />
 			<?php }
 			echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
 			?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Title' ) ?></th>
-			<td><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
+			<th scope="row">
+				<label for="blog[title]"><?php _e( 'Site Title' ); ?> 
+					<span class="description"><?php _e( '(required)' ); ?></span>
+				</label>
+			</th>
+			<td><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ); ?>" required="required" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Admin Email' ) ?></th>
-			<td><input name="blog[email]" type="text" class="regular-text" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
+			<th scope="row">
+				<label for="blog[email]"><?php _e( 'Admin Email' ); ?> 
+					<span class="description"><?php _e( '(required)' ); ?></span>
+				</label>
+			</th>
+			<td><input name="blog[email]" type="text" class="regular-text" title="<?php esc_attr_e( 'Email' ); ?>" required="required" /></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
+			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ); ?><br /><?php _e( 'The username and password will be mailed to this email address.' ); ?></td>
 		</tr>
 	</table>
-	<?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
+	<?php submit_button( __( 'Add Site' ), 'primary', 'add-site' ); ?>
 	</form>
 </div>
 <?php
-require('../admin-footer.php');
+require( '../admin-footer.php' );