From 529e242a39f304153782f0226dc30df9bc120a6f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 19 Nov 2016 01:09:30 +0000
Subject: [PATCH] I18N: Merge two 'ERROR:' strings.

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


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

diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index fb9c21922d..6aa129d765 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -177,7 +177,7 @@ endif;
 $ct = wp_get_theme();
 
 if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
-	echo '<div class="error"><p>' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '</p></div>';
+	echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
 }
 
 /*
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8c27ab6e32..031643db8a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta4-39306';
+$wp_version = '4.7-beta4-39307';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.