From e51f9061c59844b2b59471d30ca93badbc5ca8ce Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 30 Oct 2015 00:52:26 +0000
Subject: [PATCH] Don't use `<code>` in translatable strings in
 `options-general.php`.

Add translator commments.

Props ramiy.
Fixes #34497.
Built from https://develop.svn.wordpress.org/trunk@35438


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

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index ecb4ce73e8..4e8c99c3b6 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -201,12 +201,19 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 		if ( $found ) {
 			echo ' ';
 			$message = $tr['isdst'] ?
-				__('Daylight saving time begins on: <code>%s</code>.') :
-				__('Standard time begins on: <code>%s</code>.');
+				/* translators: %s: date and time  */
+				__( 'Daylight saving time begins on: %s.')  :
+				/* translators: %s: date and time  */
+				__( 'Standard time begins on: %s.' );
 			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-			printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
+			printf( $message,
+				'<code>' . date_i18n(
+					get_option( 'date_format' ) . ' ' . get_option( 'time_format' ),
+					$tr['ts'] + ( $tz_offset - $tr['offset'] )
+				) . '</code>'
+			);
 		} else {
-			_e('This timezone does not observe daylight saving time.');
+			_e( 'This timezone does not observe daylight saving time.' );
 		}
 	}
 	// Set back to UTC.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a83bd850ff..37041f7ef6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35437';
+$wp_version = '4.4-beta2-35438';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.