Index: src/wp-includes/functions.php
===================================================================
--- src/wp-includes/functions.php	(revision 52384)
+++ src/wp-includes/functions.php	(working copy)
@@ -5308,7 +5308,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
-						__( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+						_x( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', 'function' ),
 						$function,
 						$version,
 						$replacement
@@ -5319,7 +5319,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number. */
-						__( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+						_x( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', 'function' ),
 						$function,
 						$version
 					),
@@ -5400,7 +5400,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */
-						__( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
+						_x( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.', 'class' ),
 						$class,
 						$parent_class,
 						$version,
@@ -5412,7 +5412,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */
-						__( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+						_x( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', 'class' ),
 						$class,
 						$version,
 						'<code>__construct()</code>'
@@ -5498,7 +5498,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */
-						__( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+						_x( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', 'file' ),
 						$file,
 						$version,
 						$replacement
@@ -5509,7 +5509,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP file name, 2: Version number. */
-						__( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+						_x( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', 'file' ),
 						$file,
 						$version
 					) . $message,
@@ -5592,7 +5592,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
-						__( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s' ),
+						_x( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', 'function' ),
 						$function,
 						$version,
 						$message
@@ -5603,7 +5603,7 @@
 				trigger_error(
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number. */
-						__( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+						_x( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', 'function' ),
 						$function,
 						$version
 					),
@@ -5683,7 +5683,7 @@
 			trigger_error(
 				sprintf(
 					/* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */
-					__( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+					_x( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', 'hook' ),
 					$hook,
 					$version,
 					$replacement
@@ -5694,7 +5694,7 @@
 			trigger_error(
 				sprintf(
 					/* translators: 1: WordPress hook name, 2: Version number. */
-					__( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+					_x( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', 'hook' ),
 					$hook,
 					$version
 				) . $message,
@@ -5760,7 +5760,7 @@
 			trigger_error(
 				sprintf(
 					/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */
-					__( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ),
+					_x( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', 'function' ),
 					$function,
 					$message,
 					$version