WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More string cleanups. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@25575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-02 18:51:10 +00:00
parent afcab7eb9c
commit 01484339b9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-admin/includes/class-wp-upgrader.php
View File

@ -1089,13 +1089,13 @@ class Language_Pack_Upgrader extends WP_Upgrader {
} }
function upgrade_strings() { 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['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 language is up to date.' ); // We need to silently skip this case $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['no_package'] = __( 'Update package not available.' );
$this->strings['downloading_package'] = __( 'Downloading language update from <span class="code">%s</span>&#8230;' ); $this->strings['downloading_package'] = __( 'Downloading translation from <span class="code">%s</span>&#8230;' );
$this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' ); $this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
$this->strings['process_failed'] = __( 'Language update failed.' ); $this->strings['process_failed'] = __( 'Translation update failed.' );
$this->strings['process_success'] = __( 'Language updated successfully.' ); $this->strings['process_success'] = __( 'Translation updated successfully.' );
} }
function upgrade( $update = false ) { function upgrade( $update = false ) {
@ -1597,23 +1597,23 @@ class WP_Automatic_Upgrader {
case 'theme': case 'theme':
$theme = wp_get_theme( $item ); $theme = wp_get_theme( $item );
$item_name = $theme->Get( 'Name' ); $item_name = $theme->Get( 'Name' );
$skin->feedback( __( 'Updating Theme: %s' ), $item_name ); $skin->feedback( __( 'Updating theme: %s' ), $item_name );
break; break;
case 'plugin': case 'plugin':
$plugin_data = get_plugin_data( $context . '/' . $item ); $plugin_data = get_plugin_data( $context . '/' . $item );
$item_name = $plugin_data['Name']; $item_name = $plugin_data['Name'];
$skin->feedback( __( 'Updating Plugin: %s' ), $item_name ); $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
break; break;
case 'language': case 'language':
if ( 'theme' == $item->type ) { if ( 'theme' == $item->type ) {
$theme = wp_get_theme( $item->slug ); $theme = wp_get_theme( $item->slug );
$skin->feedback( sprintf( $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, $item->language,
$theme->Get( 'Name' ) $theme->Get( 'Name' )
) ); ) );
$item_name = sprintf( $item_name = sprintf(
__( '%1$s translation for the %2$s Theme' ), __( '%1$s translation for the %2$s theme' ),
$item->language, $item->language,
$theme->Get( 'Name' ) $theme->Get( 'Name' )
); );
@ -1621,12 +1621,12 @@ class WP_Automatic_Upgrader {
$plugin_data = get_plugins( '/' . $item->slug ); $plugin_data = get_plugins( '/' . $item->slug );
$plugin_data = array_shift( $plugin_data ); $plugin_data = array_shift( $plugin_data );
$skin->feedback( sprintf( $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, $item->language,
$plugin_data['Name'] $plugin_data['Name']
) ); ) );
$item_name = sprintf( $item_name = sprintf(
__( '%1$s translation for the %2$s Plugin' ), __( '%1$s translation for the %2$s plugin' ),
$item->language, $item->language,
$plugin_data['Name'] $plugin_data['Name']
); );

2
wp-admin/includes/update-core.php
View File

@ -742,7 +742,7 @@ function update_core($from, $to) {
// If we don't have enough free space, it isn't worth trying again // If we don't have enough free space, it isn't worth trying again
if ( $total_size >= disk_free_space( ABSPATH ) ) 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 else
$result = _copy_dir( $from . $distro, $to, $skip ); $result = _copy_dir( $from . $distro, $to, $skip );
} }