diff options
| author | Bradley Sepos <[email protected]> | 2017-12-04 11:02:36 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2017-12-05 07:40:42 -0500 |
| commit | 307b5e3f8b31541b246b7682af080fa05d920422 (patch) | |
| tree | 26db2bf5cb2a679f6550dcd163c4978ae7b02f41 /macosx/HBQueueController.m | |
| parent | f13cbcacce558155112de3ffbea785173b226099 (diff) | |
mac: Rename instances of cancelled to canceled.
Diffstat (limited to 'macosx/HBQueueController.m')
| -rw-r--r-- | macosx/HBQueueController.m | 14 |
1 files changed, 7 insertions, 7 deletions
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)]; |