diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 9139874a23..31e1403e75 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -609,7 +609,13 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
switch( $show ) {
case 'home' : // DEPRECATED
case 'siteurl' : // DEPRECATED
- _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The %s
option is deprecated for the family of bloginfo()
functions.' ), $show ) . ' ' . sprintf( __( 'Use the %s
option instead.' ), 'url' ) );
+ _deprecated_argument( __FUNCTION__, '2.2', sprintf(
+ /* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
+ __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
+ '' . $show . '
',
+ 'bloginfo()
',
+ 'url
'
+ ) );
case 'url' :
$output = home_url();
break;
@@ -669,7 +675,13 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
$output = str_replace('_', '-', $output);
break;
case 'text_direction':
- //_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The %s
option is deprecated for the family of bloginfo()
functions.' ), $show ) . ' ' . sprintf( __( 'Use the %s
function instead.' ), 'is_rtl()' ) );
+ _deprecated_argument( __FUNCTION__, '2.2', sprintf(
+ /* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
+ __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
+ '' . $show . '
',
+ 'bloginfo()
',
+ 'is_rtl()
'
+ ) );
if ( function_exists( 'is_rtl' ) ) {
$output = is_rtl() ? 'rtl' : 'ltr';
} else {
diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 64f6b2f784..738f7711da 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -408,9 +408,19 @@ function ms_not_installed() {
$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '
' . sprintf( __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s
. You really should look at your database now.' ), $wpdb->site ) . '
' . sprintf(
+ /* translators: %s: table name */
+ __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
+ '' . $wpdb->site . '
'
+ ) . '
' . sprintf( __( 'Could not find site %1$s
. Searched for table %2$s
in database %3$s
. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '
' . sprintf(
+ /* translators: 1: site url, 2: table name, 3: database name */
+ __( 'Could not find site %1$s. Searched for table %2$s in database %3$s. Is that right?' ),
+ '' . rtrim( $domain . $path, '/' ) . '
',
+ '' . $wpdb->blogs . '
',
+ '' . DB_NAME . '
'
+ ) . '
' . __( 'What do I do now?' ) . ' '; $msg .= __( 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 5747f96dbc..42a632d60b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-beta2-31898'; +$wp_version = '4.2-beta2-31899'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.