diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index 7acfaa5fee..049a42c8c7 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -842,7 +842,7 @@ class LJ_API_Import { $this->ixr = new IXR_Client( $this->ixr_url, false, 80, 30 ); echo '
' . __( 'Now we will download your comments so we can import them (this could take a long time if you have lots of comments)...' ) . '
'; ob_flush(); flush(); @@ -890,7 +890,7 @@ class LJ_API_Import { update_option( 'ljapi_step', 3 ); echo '' . __( 'We are now re-building the threading of your comments (this can also take a while if you have lots of comments)...' ) . '
'; ob_flush(); flush(); @@ -963,12 +963,12 @@ class LJ_API_Import { }); function ljapi_msg() { - str = ''; + str = ''; jQuery( '#' ).text( str.replace( /%d/, next_counter ) ); if ( next_counter <= 0 ) { if ( jQuery( '#' ).length ) { jQuery( "# input[type='submit']" ).hide(); - str = '
';
+ str = '
';
jQuery( '#' ).html( str );
jQuery( '#' ).submit();
return;
@@ -991,7 +991,7 @@ class LJ_API_Import {
});
function ljapi_msg() {
- str = '';
+ str = '';
jQuery( '#' ).text( str.replace( /%d/, next_counter ) );
if ( next_counter <= 0 ) {
if ( jQuery( '#' ).length ) {
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 2be38f758e..9481e71da0 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -51,13 +51,13 @@ class WP_Upgrader {
$this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
$this->strings['download_failed'] = __('Download failed.');
- $this->strings['installing_package'] = __('Installing the latest version.');
+ $this->strings['installing_package'] = __('Installing the latest version…');
$this->strings['folder_exists'] = __('Destination folder already exists.');
$this->strings['mkdir_failed'] = __('Could not create directory.');
$this->strings['bad_package'] = __('Incompatible Archive');
- $this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
- $this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
+ $this->strings['maintenance_start'] = __('Enabling Maintenance mode…');
+ $this->strings['maintenance_end'] = __('Disabling Maintenance mode…');
}
function fs_connect( $directories = array() ) {
@@ -366,22 +366,22 @@ class Plugin_Upgrader extends WP_Upgrader {
function upgrade_strings() {
$this->strings['up_to_date'] = __('The plugin is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.');
- $this->strings['downloading_package'] = __('Downloading update from %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['deactivate_plugin'] = __('Deactivating the plugin.');
- $this->strings['remove_old'] = __('Removing the old version of the plugin.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
+ $this->strings['deactivate_plugin'] = __('Deactivating the plugin…');
+ $this->strings['remove_old'] = __('Removing the old version of the plugin…');
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
- $this->strings['process_failed'] = __('Plugin upgrade Failed.');
+ $this->strings['process_failed'] = __('Plugin upgrade failed.');
$this->strings['process_success'] = __('Plugin upgraded successfully.');
}
function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from %s.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the plugin.');
- $this->strings['process_failed'] = __('Plugin Install Failed.');
- $this->strings['process_success'] = __('Plugin Installed successfully.');
+ $this->strings['downloading_package'] = __('Downloading install package from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the package…');
+ $this->strings['installing_package'] = __('Installing the plugin…');
+ $this->strings['process_failed'] = __('Plugin install failed.');
+ $this->strings['process_success'] = __('Plugin installed successfully.');
}
function install($package) {
@@ -592,21 +592,21 @@ class Theme_Upgrader extends WP_Upgrader {
function upgrade_strings() {
$this->strings['up_to_date'] = __('The theme is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.');
- $this->strings['downloading_package'] = __('Downloading update from %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
- $this->strings['remove_old'] = __('Removing the old version of the theme.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
+ $this->strings['remove_old'] = __('Removing the old version of the theme…');
$this->strings['remove_old_failed'] = __('Could not remove the old theme.');
- $this->strings['process_failed'] = __('Theme upgrade Failed.');
+ $this->strings['process_failed'] = __('Theme upgrade failed.');
$this->strings['process_success'] = __('Theme upgraded successfully.');
}
function install_strings() {
$this->strings['no_package'] = __('Install package not available.');
- $this->strings['downloading_package'] = __('Downloading install package from %s.');
- $this->strings['unpack_package'] = __('Unpacking the package.');
- $this->strings['installing_package'] = __('Installing the theme.');
- $this->strings['process_failed'] = __('Theme Install Failed.');
- $this->strings['process_success'] = __('Theme Installed successfully.');
+ $this->strings['downloading_package'] = __('Downloading install package from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the package…');
+ $this->strings['installing_package'] = __('Installing the theme…');
+ $this->strings['process_failed'] = __('Theme install failed.');
+ $this->strings['process_success'] = __('Theme installed successfully.');
}
function install($package) {
@@ -749,8 +749,8 @@ class Core_Upgrader extends WP_Upgrader {
function upgrade_strings() {
$this->strings['up_to_date'] = __('WordPress is at the latest version.');
$this->strings['no_package'] = __('Upgrade package not available.');
- $this->strings['downloading_package'] = __('Downloading update from %s.');
- $this->strings['unpack_package'] = __('Unpacking the update.');
+ $this->strings['downloading_package'] = __('Downloading update from %s…');
+ $this->strings['unpack_package'] = __('Unpacking the update…');
$this->strings['copy_failed'] = __('Could not copy files.');
}
@@ -913,7 +913,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
$this->plugin = $this->upgrader->plugin_info();
if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
- show_message(__('Attempting reactivation of the plugin'));
+ show_message(__('Reactivating the plugin…'));
echo '';
}
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 167b5bc139..5a2b275515 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -235,14 +235,14 @@ function update_core($from, $to) {
return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
// Sanity check the unzipped distribution
- apply_filters('update_feedback', __('Verifying the unpacked files'));
+ apply_filters('update_feedback', __('Verifying the unpacked files…'));
if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') ||
!$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) {
$wp_filesystem->delete($from, true);
return new WP_Error('insane_distro', __('The update could not be unpacked') );
}
- apply_filters('update_feedback', __('Installing the latest version'));
+ apply_filters('update_feedback', __('Installing the latest version…'));
// Create maintenance file to signal that we are upgrading
$maintenance_string = '';
@@ -267,7 +267,7 @@ function update_core($from, $to) {
}
// Upgrade DB with separate request
- apply_filters('update_feedback', __('Upgrading database'));
+ apply_filters('update_feedback', __('Upgrading database…'));
$db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
wp_remote_post($db_upgrade_url, array('timeout' => 60));