mac: Rename instances of cancelled to canceled.

4 files changed, 11 insertions, 11 deletions

diff --git a/macosx/HBController.m b/macosx/HBController.m
index 8e535ae4b..0521e86ae 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -631,7 +631,7 @@
         else
         {
             // User chose to cancel the scan
-            [HBUtilities writeToActivityLog:"Cannot open physical dvd, scan cancelled"];
+            [HBUtilities writeToActivityLog:"Cannot open physical dvd, scan canceled"];
             canScan = NO;
         }
     }
diff --git a/macosx/HBCore.h b/macosx/HBCore.h
index 26b74073c..fd802efa2 100644
--- a/macosx/HBCore.h
+++ b/macosx/HBCore.h
@@ -38,7 +38,7 @@ typedef NS_ENUM(NSUInteger, HBState) {
 // These constants specify the result of a scan or encode.
 typedef NS_ENUM(NSUInteger, HBCoreResult) {
     HBCoreResultDone,
-    HBCoreResultCancelled,
+    HBCoreResultCanceled,
     HBCoreResultFailed,
 };
 
diff --git a/macosx/HBCore.m b/macosx/HBCore.m
index 5e0cbb80d..160975ada 100644
--- a/macosx/HBCore.m
+++ b/macosx/HBCore.m
@@ -311,7 +311,7 @@ typedef void (^HBCoreCleanupHandler)(void);
 - (void)cancelScan
 {
     hb_scan_stop(_hb_handle);
-    [HBUtilities writeToActivityLog:"%s scan cancelled", self.name.UTF8String];
+    [HBUtilities writeToActivityLog:"%s scan canceled", self.name.UTF8String];
 }
 
 #pragma mark - Preview images
@@ -463,7 +463,7 @@ typedef void (^HBCoreCleanupHandler)(void);
             [HBUtilities writeToActivityLog:"%s work done", self.name.UTF8String];
             break;
         case HB_ERROR_CANCELED:
-            result = HBCoreResultCancelled;
+            result = HBCoreResultCanceled;
             [HBUtilities writeToActivityLog:"%s work canceled", self.name.UTF8String];
             break;
         default:
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index 8ce96e9ec..c54f707b7 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -239,7 +239,7 @@
 
 /**
  * This method will clear the queue of any encodes that are not still pending
- * this includes both successfully completed encodes as well as cancelled encodes
+ * this includes both successfully completed encodes as well as canceled encodes
  */
 - (void)removeCompletedJobs
 {
@@ -662,9 +662,9 @@
 
     self.currentLog = nil;
 
-    // Check to see if the encode state has not been cancelled
+    // Check to see if the encode state has not been canceled
     // to determine if we should send it to external app.
-    if (result != HBCoreResultCancelled)
+    if (result != HBCoreResultCanceled)
     {
         // Send to tagger
         [self sendToExternalApp:job];
@@ -675,7 +675,7 @@
         case HBCoreResultDone:
             job.state = HBJobStateCompleted;
             break;
-        case HBCoreResultCancelled:
+        case HBCoreResultCanceled:
             job.state = HBJobStateCanceled;
             break;
         default:
@@ -697,8 +697,8 @@
             info = NSLocalizedString(@"Encode Finished.", @"");
             [self jobCompletedAlerts:job result:result];
             break;
-        case HBCoreResultCancelled:
-            info = NSLocalizedString(@"Encode Cancelled.", @"");
+        case HBCoreResultCanceled:
+            info = NSLocalizedString(@"Encode Canceled.", @"");
             break;
         default:
             info = NSLocalizedString(@"Encode Failed.", @"");
@@ -1185,7 +1185,7 @@
 
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText:NSLocalizedString(@"You are currently encoding. What would you like to do?", nil)];
-    [alert setInformativeText:NSLocalizedString(@"Your encode will be cancelled if you don't continue encoding.", nil)];
+    [alert setInformativeText:NSLocalizedString(@"Your encode will be canceled if you don't continue encoding.", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Continue Encoding", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Stop", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Continue", nil)];