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 deprecated since version %2$s! Use %3$s instead.' ),
+ __( 'Function %1$s is deprecated since version %2$s! Use %3$s instead.' ),
$function,
$version,
$replacement
@@ -5319,7 +5319,7 @@
trigger_error(
sprintf(
/* translators: 1: PHP function name, 2: Version number. */
- __( '%1$s is deprecated since version %2$s with no alternative available.' ),
+ __( 'Function %1$s is deprecated since version %2$s with no alternative available.' ),
$function,
$version
),
@@ -5330,7 +5330,7 @@
if ( $replacement ) {
trigger_error(
sprintf(
- '%1$s is deprecated since version %2$s! Use %3$s instead.',
+ 'Function %1$s is deprecated since version %2$s! Use %3$s instead.',
$function,
$version,
$replacement
@@ -5340,7 +5340,7 @@
} else {
trigger_error(
sprintf(
- '%1$s is deprecated since version %2$s with no alternative available.',
+ 'Function %1$s is deprecated since version %2$s with no alternative available.',
$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 deprecated since version %3$s! Use %4$s instead.' ),
+ __( 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.' ),
$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 deprecated since version %2$s! Use %3$s instead.' ),
+ __( 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.' ),
$class,
$version,
'__construct()'
@@ -5424,7 +5424,7 @@
if ( $parent_class ) {
trigger_error(
sprintf(
- 'The called constructor method for %1$s in %2$s is deprecated since version %3$s! Use %4$s instead.',
+ 'The called constructor method for %1$s class in %2$s is deprecated since version %3$s! Use %4$s instead.',
$class,
$parent_class,
$version,
@@ -5435,7 +5435,7 @@
} else {
trigger_error(
sprintf(
- 'The called constructor method for %1$s is deprecated since version %2$s! Use %3$s instead.',
+ 'The called constructor method for %1$s class is deprecated since version %2$s! Use %3$s instead.',
$class,
$version,
'__construct()'
@@ -5498,7 +5498,7 @@
trigger_error(
sprintf(
/* translators: 1: PHP file name, 2: Version number, 3: Alternative file name. */
- __( '%1$s is deprecated since version %2$s! Use %3$s instead.' ),
+ __( 'File %1$s is deprecated since version %2$s! Use %3$s instead.' ),
$file,
$version,
$replacement
@@ -5509,7 +5509,7 @@
trigger_error(
sprintf(
/* translators: 1: PHP file name, 2: Version number. */
- __( '%1$s is deprecated since version %2$s with no alternative available.' ),
+ __( 'File %1$s is deprecated since version %2$s with no alternative available.' ),
$file,
$version
) . $message,
@@ -5520,7 +5520,7 @@
if ( $replacement ) {
trigger_error(
sprintf(
- '%1$s is deprecated since version %2$s! Use %3$s instead.',
+ 'File %1$s is deprecated since version %2$s! Use %3$s instead.',
$file,
$version,
$replacement
@@ -5530,7 +5530,7 @@
} else {
trigger_error(
sprintf(
- '%1$s is deprecated since version %2$s with no alternative available.',
+ 'File %1$s is deprecated since version %2$s with no alternative available.',
$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 deprecated since version %2$s! %3$s' ),
+ __( 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s' ),
$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 deprecated since version %2$s with no alternative available.' ),
+ __( 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.' ),
$function,
$version
),
@@ -5614,7 +5614,7 @@
if ( $message ) {
trigger_error(
sprintf(
- '%1$s was called with an argument that is deprecated since version %2$s! %3$s',
+ 'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s',
$function,
$version,
$message
@@ -5624,7 +5624,7 @@
} else {
trigger_error(
sprintf(
- '%1$s was called with an argument that is deprecated since version %2$s with no alternative available.',
+ 'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.',
$function,
$version
),
@@ -5683,7 +5683,7 @@
trigger_error(
sprintf(
/* translators: 1: WordPress hook name, 2: Version number, 3: Alternative hook name. */
- __( '%1$s is deprecated since version %2$s! Use %3$s instead.' ),
+ __( 'Hook %1$s is deprecated since version %2$s! Use %3$s instead.' ),
$hook,
$version,
$replacement
@@ -5694,7 +5694,7 @@
trigger_error(
sprintf(
/* translators: 1: WordPress hook name, 2: Version number. */
- __( '%1$s is deprecated since version %2$s with no alternative available.' ),
+ __( 'Hook %1$s is deprecated since version %2$s with no alternative available.' ),
$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 incorrectly. %2$s %3$s' ),
+ __( 'Function %1$s was called incorrectly. %2$s %3$s' ),
$function,
$message,
$version
@@ -5779,7 +5779,7 @@
trigger_error(
sprintf(
- '%1$s was called incorrectly. %2$s %3$s',
+ 'Function %1$s was called incorrectly. %2$s %3$s',
$function,
$message,
$version