Spelling/Grammar/Localization strings

class/wpmdb-base.php

@@ -110,8 +110,8 @@ public function setup_license_responses() {
 				'cli' => __( 'We\'ve detected that WP_HTTP_BLOCK_EXTERNAL is enabled and the host %1$s has not been added to WP_ACCESSIBLE_HOSTS. Please disable WP_HTTP_BLOCK_EXTERNAL or add %1$s to WP_ACCESSIBLE_HOSTS to continue.', 'wp-migrate-db' ),
 			),
 			'subscription_cancelled' => array(
-				'ui'  => sprintf( __( '<strong>Your License Was Cancelled</strong> &mdash; Please visit <a href="%s" target="_blank">My Account</a> to renew or upgrade your license and enable push and pull. <br /><a href="%s" class="check-my-licence-again" >%s</a>', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/?utm_campaign=support%2Bdocs&utm_source=MDB%2BPaid&utm_medium=insideplugin', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ),
-				'cli' => sprintf( __( 'Your License Was Cancelled - Please login to your account (%s) to renew or upgrade your license and enable push and pull.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/?utm_campaign=support%2Bdocs&utm_source=MDB%2BPaid&utm_medium=insideplugin' ),
+				'ui'  => sprintf( __( '<strong>Your License Was Canceled</strong> &mdash; Please visit <a href="%s" target="_blank">My Account</a> to renew or upgrade your license and enable push and pull. <br /><a href="%s" class="check-my-licence-again" >%s</a>', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/?utm_campaign=support%2Bdocs&utm_source=MDB%2BPaid&utm_medium=insideplugin', $check_licence_again_url, __( 'Check my license again', 'wp-migrate-db' ) ),
+				'cli' => sprintf( __( 'Your License Was Canceled - Please login to your account (%s) to renew or upgrade your license and enable push and pull.', 'wp-migrate-db' ), 'https://deliciousbrains.com/my-account/?utm_campaign=support%2Bdocs&utm_source=MDB%2BPaid&utm_medium=insideplugin' ),
 			),
 			'subscription_expired_base' => array(
 				'ui'  => sprintf( '<strong>%s</strong> &mdash; ', __( 'Your License Has Expired', 'wp-migrate-db' ) ),

class/wpmdb-cli.php

@@ -268,7 +268,7 @@ static function cleanup_message( $message ) {
 	function cli_initiate_migration() {
 		do_action( 'wpmdb_cli_before_initiate_migration', $this->profile );
 
-		WP_CLI::log( __( 'Initiating migration...', 'wp-migrate-db-cli' ) );
+		WP_CLI::log( __( 'Initiating migration…', 'wp-migrate-db-cli' ) );
 
 		$migration_args                          = $this->post_data;
 		$migration_args['form_data']             = http_build_query( $this->profile );
@@ -490,7 +490,7 @@ function migrate_tables() {
 	function finalize_migration() {
 		do_action( 'wpmdb_cli_before_finalize_migration', $this->profile, $this->migration );
 
-		WP_CLI::log( __( 'Cleaning up...', 'wp-migrate-db-cli' ) );
+		WP_CLI::log( __( 'Cleaning up…', 'wp-migrate-db-cli' ) );
 
 		$finalize = apply_filters( 'wpmdb_cli_finalize_migration', true, $this->profile, $this->migration );
 		if ( is_wp_error( $finalize ) ) {

class/wpmdb-sanitize.php

@@ -154,7 +154,7 @@ private static function _sanitize_data( $data, $key_rules, $context, $recursion_
 			} elseif ( 'bool' == $key_rules ) {
 				$bool = sanitize_key( $data );
 				if ( empty( $bool ) || ! in_array( $bool, array( 'true', 'false' ) ) ) {
-					wp_die( sprintf( __( '%1$s was expecting a bool but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) );
+					wp_die( sprintf( __( '%1$s was expecting a boolean but got something else: "%2$s"', 'wp-db-migrate-pro' ), $context, $data ) );
 
 					return false;
 				}

class/wpmdb.php

@@ -170,7 +170,7 @@ public function nocache_headers( $headers ) {
 	}
 
 	/**
-	 * Handler for ajax request to process a link click in a notice, e.g. licence deactivated ... re-check.
+	 * Handler for ajax request to process a link click in a notice, e.g. license deactivated ... re-check.
 	 *
 	 * @return bool|null
 	 */
@@ -3308,7 +3308,7 @@ function after_admin_menu( $hook_suffix ) {
 		add_action( 'admin_head-' . $hook_suffix, array( $this, 'admin_head_connection_info' ) );
 		add_action( 'load-' . $hook_suffix, array( $this, 'load_assets' ) );
 
-		// Remove licence from the database if constant is set
+		// Remove license from the database if constant is set
 		if ( $this->is_licence_constant() && ! empty( $this->settings['licence'] ) ) {
 			$this->settings['licence'] = '';
 			update_site_option( 'wpmdb_settings', $this->settings );
@@ -3378,15 +3378,15 @@ function http_prepare_download_log() {
 
 	/**
 	 * Check for wpmdb-remove-licence and related nonce
-	 * if found cleanup routines related to licenced product
+	 * if found cleanup routines related to licensed product
 	 *
 	 * @return void
 	 */
 	function http_remove_license() {
 		if ( isset( $_GET['wpmdb-remove-licence'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-remove-licence' ) ) {
 			$this->settings['licence'] = '';
 			update_site_option( 'wpmdb_settings', $this->settings );
-			// delete these transients as they contain information only valid for authenticated licence holders
+			// delete these transients as they contain information only valid for authenticated license holders
 			delete_site_transient( 'update_plugins' );
 			delete_site_transient( 'wpmdb_upgrade_data' );
 			delete_site_transient( 'wpmdb_licence_response' );
@@ -3406,7 +3406,7 @@ function http_disable_ssl() {
 		if ( isset( $_GET['wpmdb-disable-ssl'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-disable-ssl' ) ) {
 			set_site_transient( 'wpmdb_temporarily_disable_ssl', '1', 60 * 60 * 24 * 30 ); // 30 days
 			$hash = ( isset( $_GET['hash'] ) ) ? '#' . sanitize_title( $_GET['hash'] ) : '';
-			// delete the licence transient as we want to attempt to fetch the licence details again
+			// delete the license transient as we want to attempt to fetch the license details again
 			delete_site_transient( 'wpmdb_licence_response' );
 			// redirecting here because we don't want to keep the query string in the web browsers address bar
 			wp_redirect( network_admin_url( $this->plugin_base . $hash ) );
@@ -3416,14 +3416,14 @@ function http_disable_ssl() {
 
 	/**
 	 * Check for wpmdb-check-licence and related nonce
-	 * if found refresh licence details
+	 * if found refresh license details
 	 *
 	 * @return void
 	 */
 	function http_refresh_licence() {
 		if ( isset( $_GET['wpmdb-check-licence'] ) && wp_verify_nonce( $_GET['nonce'], 'wpmdb-check-licence' ) ) {
 			$hash = ( isset( $_GET['hash'] ) ) ? '#' . sanitize_title( $_GET['hash'] ) : '';
-			// delete the licence transient as we want to attempt to fetch the licence details again
+			// delete the license transient as we want to attempt to fetch the license details again
 			delete_site_transient( 'wpmdb_licence_response' );
 			// redirecting here because we don't want to keep the query string in the web browsers address bar
 			wp_redirect( network_admin_url( $this->plugin_base . $hash ) );
@@ -3515,8 +3515,8 @@ function load_assets() {
 				'find_replace_paused'                   => _x( 'Find & Replace Paused', 'The find & replace has been temporarily stopped', 'wp-migrate-db' ),
 				'resume'                                => _x( 'Resume', 'Restart migrating after it was paused', 'wp-migrate-db' ),
 				'completing_current_request'            => __( 'Completing current request', 'wp-migrate-db' ),
-				'cancelling_migration'                  => _x( 'Cancelling migration', 'The migration is being cancelled', 'wp-migrate-db' ),
-				'cancelling_find_replace'               => _x( 'Cancelling find & replace', 'The find & replace is being cancelled', 'wp-migrate-db' ),
+				'cancelling_migration'                  => _x( 'Canceling migration', 'The migration is being canceled', 'wp-migrate-db' ),
+				'cancelling_find_replace'               => _x( 'Canceling find & replace', 'The find & replace is being canceled', 'wp-migrate-db' ),
 				'paused'                                => _x( 'Paused', 'The migration has been temporarily stopped', 'wp-migrate-db' ),
 				'pause_before_finalize_find_replace'    => __( 'Pause before finalizing the updates', 'wp-migrate-db' ),
 				'paused_before_finalize'                => __( 'Automatically paused before migrated tables are replaced. Click "Resume" or "Cancel" when ready.', 'wp-migrate-db' ),
@@ -3527,11 +3527,11 @@ function load_assets() {
 				'removing_remote_sql'                   => __( 'Removing the remote backup MySQL export file', 'wp-migrate-db' ),
 				'removing_remote_temp_tables'           => __( 'Removing the remote temporary tables', 'wp-migrate-db' ),
 				'migration_cancellation_failed'         => __( 'Migration cancellation failed', 'wp-migrate-db' ),
-				'manually_remove_temp_files'            => __( 'A problem occurred while cancelling the migration, you may have to manually delete some temporary files / tables.', 'wp-migrate-db' ),
-				'migration_cancelled'                   => _x( 'Migration cancelled', 'The migration has been cancelled', 'wp-migrate-db' ),
+				'manually_remove_temp_files'            => __( 'A problem occurred while canceling the migration, you may have to manually delete some temporary files / tables.', 'wp-migrate-db' ),
+				'migration_cancelled'                   => _x( 'Migration canceled', 'The migration has been canceled', 'wp-migrate-db' ),
 				'migration_cancelled_success'           => __( 'The migration has been stopped and all temporary files and data have been cleaned up.', 'wp-migrate-db' ),
-				'find_replace_cancelled'                => _x( 'Find & replace cancelled', 'The migration has been cancelled', 'wp-migrate-db' ),
-				'find_replace_cancelled_success'        => __( 'The find & replace has been cancelled and all temporary data has been cleaned up.', 'wp-migrate-db' ),
+				'find_replace_cancelled'                => _x( 'Find & replace canceled', 'The migration has been canceled', 'wp-migrate-db' ),
+				'find_replace_cancelled_success'        => __( 'The find & replace has been canceled and all temporary data has been cleaned up.', 'wp-migrate-db' ),
 				'migration_complete'                    => _x( 'Migration complete', 'The migration completed successfully', 'wp-migrate-db' ),
 				'finalizing_migration'                  => _x( 'Finalizing migration', 'The migration is in the last stages', 'wp-migrate-db' ),
 				'flushing'                              => _x( 'Flushing caches and rewrite rules', 'The caches and rewrite rules for the target are being flushed', 'wp-migrate-db' ),
@@ -3551,7 +3551,7 @@ function load_assets() {
 				'attempting_to_activate_licence'        => __( 'Attempting to activate your license, please wait…', 'wp-migrate-db' ),
 				'licence_reactivated'                   => __( 'License successfully activated, please wait…', 'wp-migrate-db' ),
 				'activate_licence_problem'              => __( 'An error occurred when trying to reactivate your license. Please provide the following information when requesting support:', 'wp-migrate-db' ),
-				'temporarily_activated_licence'         => __( "<strong>We've temporarily activated your licence and will complete the activation once the Delicious Brains API is available again.</strong><br />Please refresh this page to continue.", 'wp-migrate-db' ),
+				'temporarily_activated_licence'         => __( "<strong>We've temporarily activated your license and will complete the activation once the Delicious Brains API is available again.</strong><br />Please refresh this page to continue.", 'wp-migrate-db' ),
 				'ajax_json_message'                     => __( 'JSON Decoding Failure', 'wp-migrate-db' ),
 				'ajax_json_errors'                      => __( 'Our AJAX request was expecting JSON but we received something else. Often this is caused by your theme and/or plugins spitting out PHP errors. If you can edit the theme or plugins causing the errors, you should be able to fix them up, but if not, you can set WP_DEBUG to false in wp-config.php to disable errors from showing up.', 'wp-migrate-db' ),
 				'view_error_messages'                   => __( 'View error messages', 'wp-migrate-db' ),
@@ -3579,8 +3579,8 @@ function load_assets() {
 				'welcome_text'                          => __( 'Hey, this is the first time activating your license, nice! Your migrations are about to get awesome! If you haven’t already, you should check out our <a href="%1$s">Quick Start Guide</a> and <a href="%2$s">Videos</a>. If you run into any trouble at all, use the <strong>Help tab</strong> above to submit a support request.', 'wp-migrate-db' ),
 				'title_progress'                        => __( '%1$s Stage %2$s of %3$s', 'wp-migrate-db' ),
 				'title_paused'                          => __( 'Paused', 'wp-migrate-db' ),
-				'title_cancelling'                      => __( 'Cancelling', 'wp-migrate-db' ),
-				'title_cancelled'                       => __( 'Cancelled', 'wp-migrate-db' ),
+				'title_cancelling'                      => __( 'Canceling', 'wp-migrate-db' ),
+				'title_cancelled'                       => __( 'Canceled', 'wp-migrate-db' ),
 				'title_finalizing'                      => __( 'Finalizing', 'wp-migrate-db' ),
 				'title_complete'                        => __( 'Complete', 'wp-migrate-db' ),
 				'title_error'                           => __( 'Failed', 'wp-migrate-db' ),

readme.txt

@@ -45,7 +45,7 @@ https://www.youtube.com/watch?v=fHFcH4bCzmU
 == Installation ==
 
 1. Use WordPress' built-in installer
-2. Access the "Migrate DB" menu option under Tools (or under Settings on multsite intallations)
+2. Access the "Migrate DB" menu option under Tools (or under Settings on multsite installations)
 
 == Frequently Asked Questions ==
 
@@ -170,7 +170,7 @@ If you upgrade to [WP Migrate DB Pro](http://deliciousbrains.com/wp-migrate-db-p
 * Improvement: Leave it to WordPress core to convert tables to utf8mb4
 * Improvement: Workaround to fix issues with Siteground's staging environments
 * Bug fix: Connection URL with space(s) in beginning failing
-* Bug fix: Cancelling a gzipped Export does not remove file
+* Bug fix: Canceling a gzipped Export does not remove the file
 * Bug fix: Unusual table names causing regular expressions to fail
 * Bug fix: Preserving options not working when default subsite is not 1
 * Bug fix: NAN% shown at beginning of a migration
@@ -239,7 +239,7 @@ If you upgrade to [WP Migrate DB Pro](http://deliciousbrains.com/wp-migrate-db-p
 
 = WP Migrate DB 0.4.3 - 2012-12-18 =
 * Fixed deprecated error notices when debug mode is on
-* Bug fix: [Exports views as tables](https://github.com/bradt/wp-migrate-db/issues/3)
+* Bug fix: [Export views as tables](https://github.com/bradt/wp-migrate-db/issues/3)
 * Compatibility tested with WordPress 3.5
 
 = WP Migrate DB 0.4.2 - 2012-09-13 =

template/addons.php

@@ -5,7 +5,7 @@
 <div class="addons-tab content-tab">
 	<div class="addons-content">
 		<?php if ( ! empty( $licence ) && $this->is_pro ) : ?>
-			<p><?php _e( 'Fetching addon details, please wait...', 'wp-migrate-db' ); ?></p>
+			<p><?php _e( 'Fetching addon details, please wait…', 'wp-migrate-db' ); ?></p>
 		<?php else : ?>
 
 			<?php if ( $this->is_pro ) : ?>
@@ -41,4 +41,4 @@
 
 		<?php endif; ?>
 	</div>
-</div>
+</div>

template/profile.php

@@ -11,7 +11,7 @@
 			</li>
 		<?php } ?>
 		<li>
-			<a href="<?php echo $this->plugin_base . '&wpmdb-profile=-1'; ?>"><?php _e( 'Nope, let\'s start fresh...', 'wp-migrate-db' ); ?></a>
+			<a href="<?php echo $this->plugin_base . '&wpmdb-profile=-1'; ?>"><?php _e( 'Nope, let\'s start fresh…', 'wp-migrate-db' ); ?></a>
 		</li>
 	</ul>
 </div>