From aef7cdd59a0a57782cdbd66761d8273fcdae7d6e Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Fri, 21 Mar 2014 00:19:16 +0000
Subject: [PATCH] Merge two strings. see #27320, #27453.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media-template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index add9940006..36d81e5974 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -814,7 +814,7 @@ function wp_print_media_templates() {
 				<div class="setting preload">
 					<span><?php _e( 'Preload' ); ?></span>
 					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload audio' ); ?></button>
+						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
 						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
 						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
 					</div>
@@ -907,7 +907,7 @@ function wp_print_media_templates() {
 				<div class="setting preload">
 					<span><?php _e( 'Preload' ); ?></span>
 					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload video' ); ?></button>
+						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
 						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
 						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
 					</div>