Index: wp-content/themes/twentyeleven/searchform.php
===================================================================
--- wp-content/themes/twentyeleven/searchform.php	(revision 22166)
+++ wp-content/themes/twentyeleven/searchform.php	(working copy)
@@ -8,7 +8,7 @@
  */
 ?>
 	<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
-		<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
-		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
-		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
+		<label for="s" class="assistive-text"><?php _ex( 'Search', 'Assistive text', 'twentyeleven' ); ?></label>
+		<input type="text" class="field" name="s" id="s" placeholder="<?php echo esc_attr_x( 'Search', 'Placeholder', 'twentyeleven' ); ?>" />
+		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php echo esc_attr_x( 'Search', 'Submit', 'twentyeleven' ); ?>" />
 	</form>