From fb552cad0fe6630ed509be15b7583a8cd6ae3110 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Sun, 27 Jan 2019 14:46:55 +0000 Subject: [PATCH] Install/Upgrade: After [44451], update translator comments to include the new placeholder. See #46111. Fixes #45574. Built from https://develop.svn.wordpress.org/trunk@44700 git-svn-id: http://core.svn.wordpress.org/trunk@44531 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/update-core.php | 4 ++-- wp-admin/upgrade.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 3d7778863a..d157a46764 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -80,10 +80,10 @@ function list_core_update( $update ) { /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); } elseif ( ! $php_compat ) { - /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */ + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version ); } elseif ( ! $mysql_compat ) { - /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */ + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version ); } else { /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */ diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 8755b79c7d..ebafb5cc8c 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -90,10 +90,10 @@ elseif ( ! $php_compat || ! $mysql_compat ) : /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); } elseif ( ! $php_compat ) { - /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */ + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ); } elseif ( ! $mysql_compat ) { - /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */ + /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */ $message = sprintf( __( 'You cannot update because WordPress %2$s requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version ); } ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 79e23241b0..7c7e3d9517 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-beta2-44699'; +$wp_version = '5.1-beta2-44700'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.