From 5399881b18cc63c3cb0182c5d30fdecb78abfc8e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 10 Oct 2015 05:14:23 +0000
Subject: [PATCH] Merge two database update strings for consistency.

Props pavelevap.
Fixes #33514.
Built from https://develop.svn.wordpress.org/trunk@35000


git-svn-id: http://core.svn.wordpress.org/trunk@34965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/upgrade.php | 4 ++--
 wp-admin/upgrade.php         | 2 +-
 wp-includes/version.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index a20d816045..11e9a41b7a 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -111,11 +111,11 @@ switch ( $action ) {
 	default:
 		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
 		?>
-		<h2><?php _e( 'Database Upgrade Required' ); ?></h2>
+		<h2><?php _e( 'Database Update Required' ); ?></h2>
 		<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
 		<?php endif; ?>
 
-		<p><?php _e( 'The database upgrade process may take a little while, so please be patient.' ); ?></p>
+		<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
 		<p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
 		<?php
 		/**
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 53c1d17012..44af8a2520 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -94,7 +94,7 @@ switch ( $step ) :
 ?>
 <h2><?php _e( 'Database Update Required' ); ?></h2>
 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
-<p><?php _e( 'The update process may take a little while, so please be patient.' ); ?></p>
+<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
 <p class="step"><a class="button button-large" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
 <?php
 		break;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c6e650192f..46a25bec82 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34999';
+$wp_version = '4.4-alpha-35000';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.