Index: /trunk/wp-admin/import/livejournal.php =================================================================== --- /trunk/wp-admin/import/livejournal.php (revision 12532) +++ /trunk/wp-admin/import/livejournal.php (revision 12533) @@ -843,5 +843,5 @@ 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(); @@ -891,5 +891,5 @@ 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(); @@ -964,10 +964,10 @@ 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(); @@ -992,5 +992,5 @@ function ljapi_msg() { - str = ''; + str = ''; jQuery( '#' ).text( str.replace( /%d/, next_counter ) ); if ( next_counter <= 0 ) { Index: /trunk/wp-admin/includes/class-wp-upgrader.php =================================================================== --- /trunk/wp-admin/includes/class-wp-upgrader.php (revision 12532) +++ /trunk/wp-admin/includes/class-wp-upgrader.php (revision 12533) @@ -52,11 +52,11 @@ $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…'); } @@ -367,10 +367,10 @@ $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.'); } @@ -378,9 +378,9 @@ 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.'); } @@ -593,9 +593,9 @@ $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.'); } @@ -603,9 +603,9 @@ 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.'); } @@ -750,6 +750,6 @@ $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.'); } @@ -914,5 +914,5 @@ $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 ''; } Index: /trunk/wp-admin/includes/update-core.php =================================================================== --- /trunk/wp-admin/includes/update-core.php (revision 12532) +++ /trunk/wp-admin/includes/update-core.php (revision 12533) @@ -236,5 +236,5 @@ // 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') ) { @@ -243,5 +243,5 @@ } - 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 @@ -268,5 +268,5 @@ // 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));