From c45f3936a7c35945febb3482295fae1d7b2d8b3a Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 3 Dec 2010 09:16:28 +0000
Subject: [PATCH] More s/upgrade/update. Props michaelh. See #15656

git-svn-id: http://svn.automattic.com/wordpress/trunk@16701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php | 2 +-
 wp-admin/includes/theme.php | 2 +-
 wp-admin/update.php         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index ce24cd06a..c78720d0d 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1544,7 +1544,7 @@ SWFUpload.onload = function() {
 	<div class="clear"></div>
 	<p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
 	<?php if ( is_lighttpd_before_150() ): ?>
-	<p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>
+	<p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please update to lighttpd 1.5.'); ?></p>
 	<?php endif;?>
 <?php do_action('post-html-upload-ui', $flash); ?>
 </div>
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 1fa77e064..ceea8bf38 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -239,7 +239,7 @@ function theme_update_available( $theme ) {
 		$theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
 		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
 		$update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
-		$update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
+		$update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
 
 		if ( !is_multisite() ) {
 			if ( ! current_user_can('update_themes') )
diff --git a/wp-admin/update.php b/wp-admin/update.php
index 10a877bca..d6d1714b9 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -51,7 +51,7 @@ if ( isset($_GET['action']) ) {
 
 		check_admin_referer('upgrade-plugin_' . $plugin);
 
-		$title = __('Upgrade Plugin');
+		$title = __('Update Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugins.php';
 		require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -155,7 +155,7 @@ if ( isset($_GET['action']) ) {
 
 		add_thickbox();
 		wp_enqueue_script('theme-preview');
-		$title = __('Upgrade Theme');
+		$title = __('Update Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
 		require_once(ABSPATH . 'wp-admin/admin-header.php');