WordPress.org
Get WordPress

Make WordPress Core

Changeset 16696


Ignore:
Timestamp:
12/02/2010 09:45:47 PM (16 years ago)
Author:
markjaquith
Message:

Standardize around "Update" instead of "Upgrade." props RanYanivHartstein. props latz. fixes #14107

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

    r16629 r16696  
    206206                                        break;
    207207                                case 'upgrade':
    208                                         $text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
     208                                        $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
    209209                                        break;
    210210                                case 'search':

  • trunk/wp-admin/includes/class-wp-plugins-list-table.php

    r16498 r16696  
    234234                                        break;
    235235                                case 'upgrade':
    236                                         $text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
     236                                        $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
    237237                                        break;
    238238                                case 'search':

  • trunk/wp-admin/includes/class-wp-upgrader.php

    r15978 r16696  
    369369        function upgrade_strings() {
    370370                $this->strings['up_to_date'] = __('The plugin is at the latest version.');
    371                 $this->strings['no_package'] = __('Upgrade package not available.');
     371                $this->strings['no_package'] = __('Update package not available.');
    372372                $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
    373373                $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
    … …  
    375375                $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
    376376                $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
    377                 $this->strings['process_failed'] = __('Plugin upgrade failed.');
    378                 $this->strings['process_success'] = __('Plugin upgraded successfully.');
     377                $this->strings['process_failed'] = __('Plugin update failed.');
     378                $this->strings['process_success'] = __('Plugin updated successfully.');
    379379        }
    380380
    … …  
    609609        function upgrade_strings() {
    610610                $this->strings['up_to_date'] = __('The theme is at the latest version.');
    611                 $this->strings['no_package'] = __('Upgrade package not available.');
     611                $this->strings['no_package'] = __('Update package not available.');
    612612                $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
    613613                $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
    614614                $this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
    615615                $this->strings['remove_old_failed'] = __('Could not remove the old theme.');
    616                 $this->strings['process_failed'] = __('Theme upgrade failed.');
    617                 $this->strings['process_success'] = __('Theme upgraded successfully.');
     616                $this->strings['process_failed'] = __('Theme update failed.');
     617                $this->strings['process_success'] = __('Theme updated successfully.');
    618618        }
    619619
    … …  
    862862        function upgrade_strings() {
    863863                $this->strings['up_to_date'] = __('WordPress is at the latest version.');
    864                 $this->strings['no_package'] = __('Upgrade package not available.');
     864                $this->strings['no_package'] = __('Update package not available.');
    865865                $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
    866866                $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
    … …  
    10181018
    10191019        function __construct($args = array()) {
    1020                 $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Upgrade Plugin') );
     1020                $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
    10211021                $args = wp_parse_args($args, $defaults);
    10221022
    … …  
    13891389
    13901390        function __construct($args = array()) {
    1391                 $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Upgrade Theme') );
     1391                $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
    13921392                $args = wp_parse_args($args, $defaults);
    13931393

  • trunk/wp-admin/includes/theme.php

    r16660 r16696  
    240240                $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.
    241241                $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
    242                 $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made.  'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
     242                $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;"';
    243243
    244244                if ( !is_multisite() ) {
    … …  
    246246                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
    247247                        else if ( empty($update['package']) )
    248                                 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic upgrade is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
     248                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
    249249                        else
    250                                 printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
     250                                printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
    251251                }
    252252        }

  • trunk/wp-admin/includes/update.php

    r16368 r16696  
    200200                        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
    201201                else if ( empty($r->package) )
    202                         printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic upgrade is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
     202                        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
    203203                else
    204                         printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">upgrade automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
     204                        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
    205205        }
    206206
    … …  
    275275                printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
    276276        else if ( empty( $r['package'] ) )
    277                 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic upgrade is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
     277                printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
    278278        else
    279                 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">upgrade automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
     279                printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
    280280
    281281        do_action( "in_theme_update_message-$theme_key", $theme, $r );

  • trunk/wp-admin/includes/upgrade.php

    r16660 r16696  
    16571657
    16581658        // Add a theme header.
    1659         $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
     1659        $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
    16601660
    16611661        $stylelines = file_get_contents("$site_dir/style.css");

  • trunk/wp-admin/network/upgrade.php

    r16272 r16696  
    2020
    2121add_contextual_help($current_screen,
    22         '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database upgrades are applied.') . '</p>' .
     22        '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
    2323        '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
    2424        '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>' .

  • trunk/wp-admin/plugins.php

    r16312 r16696  
    9999                                $plugins = array();
    100100
    101                         $title = __( 'Upgrade Plugins' );
     101                        $title = __( 'Update Plugins' );
    102102                        $parent_file = 'plugins.php';
    103103

  • trunk/wp-admin/update-core.php

    r16663 r16696  
    7171            echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>';
    7272        else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) {
    73             echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this upgrade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>';
     73            echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>';
    7474        }
    7575        echo '</form>';
    … …  
    393393        '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' .
    394394        '<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '</p>' .
    395         '<p>' . __('To upgrade themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' .
     395        '<p>' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' .
    396396        '<p><strong>' . __('For more information:') . '</strong></p>' .
    397397        '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_Updates_SubPanel" target="_blank">Documentation on Updating WordPress</a>') . '</p>' .

  • trunk/wp-admin/upgrade.php

    r16660 r16696  
    4747<head>
    4848        <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
    49         <title><?php _e( 'WordPress &rsaquo; Upgrade' ); ?></title>
     49        <title><?php _e( 'WordPress &rsaquo; Update' ); ?></title>
    5050        <?php
    5151        wp_admin_css( 'install', true );
    … …  
    5858<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
    5959
    60 <h2><?php _e( 'No Upgrade Required' ); ?></h2>
     60<h2><?php _e( 'No Update Required' ); ?></h2>
    6161<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
    6262<p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
    … …  
    6464<?php elseif ( !$php_compat || !$mysql_compat ) :
    6565        if ( !$mysql_compat && !$php_compat )
    66                 printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
     66                printf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
    6767        elseif ( !$php_compat )
    68                 printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
     68                printf( __('You cannot udate because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
    6969        elseif ( !$mysql_compat )
    70                 printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
     70                printf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
    7171?>
    7272<?php else :
    … …  
    7777                $goback = urlencode( $goback );
    7878?>
    79 <h2><?php _e( 'Database Upgrade Required' ); ?></h2>
    80 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to upgrade your database to the newest version.' ); ?></p>
    81 <p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
    82 <p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Upgrade WordPress Database' ); ?></a></p>
     79<h2><?php _e( 'Database Update Required' ); ?></h2>
     80<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
     81<p><?php _e( 'The update process may take a little while, so please be patient.' ); ?></p>
     82<p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
    8383<?php
    8484                break;
    … …  
    9090                        $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
    9191?>
    92 <h2><?php _e( 'Upgrade Complete' ); ?></h2>
    93         <p><?php _e( 'Your WordPress database has been successfully upgraded!' ); ?></p>
     92<h2><?php _e( 'Update Complete' ); ?></h2>
     93        <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
    9494        <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
    9595

  • trunk/wp-includes/functions.php

    r16660 r16696  
    25972597                $trans['activate']['plugin']   = array( __( 'Your attempt to activate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
    25982598                $trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
    2599                 $trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
     2599                $trans['upgrade']['plugin']    = array( __( 'Your attempt to update this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
    26002600
    26012601                $trans['add']['post']          = array( __( 'Your attempt to add this post has failed.' ), false );
Note: See TracChangeset for help on using the changeset viewer.