From 64d3d538389ea3861282227d1d2d3175651d7f48 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 2 Oct 2013 18:50:45 +0000 Subject: [PATCH] More string cleanups. git-svn-id: https://develop.svn.wordpress.org/trunk@25658 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-upgrader.php | 22 ++++++++++----------- src/wp-admin/includes/update-core.php | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php index 13de05223e..9e770c5971 100644 --- a/src/wp-admin/includes/class-wp-upgrader.php +++ b/src/wp-admin/includes/class-wp-upgrader.php @@ -1089,13 +1089,13 @@ class Language_Pack_Upgrader extends WP_Upgrader { } function upgrade_strings() { - $this->strings['starting_upgrade'] = __( 'Some of your language files need updating. Sit tight for a few more seconds while we update them as well.' ); - $this->strings['up_to_date'] = __( 'The language is up to date.' ); // We need to silently skip this case + $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' ); + $this->strings['up_to_date'] = __( 'The translation is up to date.' ); // We need to silently skip this case $this->strings['no_package'] = __( 'Update package not available.' ); - $this->strings['downloading_package'] = __( 'Downloading language update from %s…' ); + $this->strings['downloading_package'] = __( 'Downloading translation from %s…' ); $this->strings['unpack_package'] = __( 'Unpacking the update…' ); - $this->strings['process_failed'] = __( 'Language update failed.' ); - $this->strings['process_success'] = __( 'Language updated successfully.' ); + $this->strings['process_failed'] = __( 'Translation update failed.' ); + $this->strings['process_success'] = __( 'Translation updated successfully.' ); } function upgrade( $update = false ) { @@ -1597,23 +1597,23 @@ class WP_Automatic_Upgrader { case 'theme': $theme = wp_get_theme( $item ); $item_name = $theme->Get( 'Name' ); - $skin->feedback( __( 'Updating Theme: %s' ), $item_name ); + $skin->feedback( __( 'Updating theme: %s' ), $item_name ); break; case 'plugin': $plugin_data = get_plugin_data( $context . '/' . $item ); $item_name = $plugin_data['Name']; - $skin->feedback( __( 'Updating Plugin: %s' ), $item_name ); + $skin->feedback( __( 'Updating plugin: %s' ), $item_name ); break; case 'language': if ( 'theme' == $item->type ) { $theme = wp_get_theme( $item->slug ); $skin->feedback( sprintf( - __( 'Updating the %1$s language files for the %2$s Theme' ), + __( 'Updating the %1$s translation for the %2$s theme' ), $item->language, $theme->Get( 'Name' ) ) ); $item_name = sprintf( - __( '%1$s translation for the %2$s Theme' ), + __( '%1$s translation for the %2$s theme' ), $item->language, $theme->Get( 'Name' ) ); @@ -1621,12 +1621,12 @@ class WP_Automatic_Upgrader { $plugin_data = get_plugins( '/' . $item->slug ); $plugin_data = array_shift( $plugin_data ); $skin->feedback( sprintf( - __( 'Updating the %1$s language files for the %2$s Plugin' ), + __( 'Updating the %1$s translation for the %2$s plugin' ), $item->language, $plugin_data['Name'] ) ); $item_name = sprintf( - __( '%1$s translation for the %2$s Plugin' ), + __( '%1$s translation for the %2$s plugin' ), $item->language, $plugin_data['Name'] ); diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php index 043dface30..e451f90839 100644 --- a/src/wp-admin/includes/update-core.php +++ b/src/wp-admin/includes/update-core.php @@ -742,7 +742,7 @@ function update_core($from, $to) { // If we don't have enough free space, it isn't worth trying again if ( $total_size >= disk_free_space( ABSPATH ) ) - $result = new WP_Error( 'disk_full', __( "There isn't enough free disk space to complete the upgrade." ), $to ); + $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ), $to ); else $result = _copy_dir( $from . $distro, $to, $skip ); }