Ticket #15656: 15156.diff

wp-admin/includes/media.php

@@ -1544 +1544 @@
         <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>

wp-admin/includes/theme.php

@@ -239 +239 @@
                 $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&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') )

wp-admin/update.php

@@ -51 +51 @@
 
                 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 +155 @@
 
                 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');