From c451e71d428372feb1440388c125a492a80676ca Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 31 Aug 2016 21:37:27 +0000
Subject: [PATCH] Text Changes: Improve the timezone setting description in
 General Settings.

Makes more clear users can set either a city or a UTC timezone offset.

Props GrantDerepas, andrew.p.
Fixes #34789.

Built from https://develop.svn.wordpress.org/trunk@38483


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

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 426ebaae10..ce95119d7e 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -150,7 +150,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <?php echo wp_timezone_choice($tzstring); ?>
 </select>
 
-<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
+<p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
 
 <p class="timezone-info">
 	<span id="utc-time"><?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9bc4c5182d..acf9ea33b6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38482';
+$wp_version = '4.7-alpha-38483';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.