summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h2
-rw-r--r--macosx/HBAdvancedController.m4
-rw-r--r--macosx/HBController.m2
-rw-r--r--macosx/HBDockTile.h2
-rw-r--r--macosx/HBHUD.h2
-rw-r--r--macosx/HBOutputRedirect.m2
-rw-r--r--macosx/HBPresetsManager.h2
-rw-r--r--macosx/HBPresetsManager.m2
-rw-r--r--macosx/HBQueueController.m2
-rw-r--r--macosx/HBQueueOutlineView.h2
-rw-r--r--macosx/HBSubtitles.m2
-rw-r--r--macosx/HBVideo.m2
-rw-r--r--macosx/NSWindow+HBAdditions.h2
-rw-r--r--macosx/NSWindow+HBAdditions.m2
-rw-r--r--macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h2
-rw-r--r--macosx/module.defs4
16 files changed, 18 insertions, 18 deletions
diff --git a/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h b/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
index 363975762..0bf3583e5 100644
--- a/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
+++ b/macosx/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
@@ -421,7 +421,7 @@
* @method openGrowlPreferences:
* @abstract Open Growl preferences, optionally to this app's settings, growl:// method
* @param showApp Whether to show the application's settings, otherwise just opens to the last position
- * @return Return's whether opening the URL was succesfull or not.
+ * @return Returns whether opening the URL was successful or not.
* @discussion Will launch if Growl is installed, but not running, and open the preferences window
* Uses growl:// URL scheme
* @since Growl.framework 1.4
diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m
index 8d4beb8b1..49af2baf5 100644
--- a/macosx/HBAdvancedController.m
+++ b/macosx/HBAdvancedController.m
@@ -1316,7 +1316,7 @@
if( [self X264AdvancedOptionsIsOpt: optNameToChange inString: currentOptString] )
{
- /* If the option is in the string wth a semicolon, or starts the string, it's time to edit.
+ /* If the option is in the string with a semicolon, or starts the string, it's time to edit.
This means parsing the whole string into an array of options and values. From there,
iterate through the options, and when you reach the one that's been changed, edit it. */
@@ -1372,7 +1372,7 @@
}
}
- /* Change the dislayed option string to reflect the new modified settings */
+ /* Change the displayed option string to reflect the new modified settings */
[fDisplayX264Options setStringValue:changedOptString];
}
else // if none exists, add it to the string
diff --git a/macosx/HBController.m b/macosx/HBController.m
index d80ef95c2..38fd515c1 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -795,7 +795,7 @@
/**
* Observe the job settings changes.
- * This is used to update the file name and extention
+ * This is used to update the file name and extension
* and the custom preset string.
*/
- (void)addJobObservers
diff --git a/macosx/HBDockTile.h b/macosx/HBDockTile.h
index 2b14cc824..e30e4bbdc 100644
--- a/macosx/HBDockTile.h
+++ b/macosx/HBDockTile.h
@@ -14,7 +14,7 @@
/**
* Updates two DockTextFields on the dockTile,
* one with total percentage, the other one with the ETA.
- * The ETA string is formated by the callers *
+ * The ETA string is formatted by the callers *
*/
- (void)updateDockIcon:(double)progress withETA:(NSString *)etaStr;
diff --git a/macosx/HBHUD.h b/macosx/HBHUD.h
index d10e42f69..a46c02aa9 100644
--- a/macosx/HBHUD.h
+++ b/macosx/HBHUD.h
@@ -11,7 +11,7 @@
- (BOOL)canBeHidden;
// Responder chains is nice and good, but NSViewController
-// are not automatically insterted in the responder chain prior 10.10
+// are not automatically inserted in the responder chain prior 10.10
// and are removed when the view is hidden, so let's deliver the
// events manually.
diff --git a/macosx/HBOutputRedirect.m b/macosx/HBOutputRedirect.m
index 7c121735d..9aff9eb31 100644
--- a/macosx/HBOutputRedirect.m
+++ b/macosx/HBOutputRedirect.m
@@ -137,7 +137,7 @@ int stderrwrite(void *inFD, const char *buffer, int size)
* Private constructor which should not be called from outside. This is used to
* initialize the class at @c stdoutRedirect and @c stderrRedirect.
*
- * @param aStream Stream that wil be redirected (stdout or stderr).
+ * @param aStream Stream that will be redirected (stdout or stderr).
* @param aSelector Selector that will be called in listeners to redirect the stream.
*
* @return New HBOutputRedirect object.
diff --git a/macosx/HBPresetsManager.h b/macosx/HBPresetsManager.h
index f9fbd9770..7fcc43292 100644
--- a/macosx/HBPresetsManager.h
+++ b/macosx/HBPresetsManager.h
@@ -32,7 +32,7 @@ extern NSString *HBPresetsChangedNotification;
@property (nonatomic, readwrite, strong) HBPreset *defaultPreset;
/**
- * Returs a HBPresetManager with the presets loaded at the passed URL.
+ * Returns a HBPresetManager with the presets loaded at the passed URL.
*
* @param url the URL of the presets file to load.
*
diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m
index 5c11d9359..cb90e5835 100644
--- a/macosx/HBPresetsManager.m
+++ b/macosx/HBPresetsManager.m
@@ -293,7 +293,7 @@ typedef NS_ENUM(NSUInteger, HBPresetLoadingResult) {
__block HBPreset *firstBuiltInPreset = nil;
__block BOOL defaultAlreadySetted = NO;
- // Search for a possibile new default preset
+ // Search for a possible new default preset
// Try to use "Normal" or the first user preset.
[self.root enumerateObjectsUsingBlock:^(id obj, NSIndexPath *idx, BOOL *stop) {
if ([obj isBuiltIn] && [obj isLeaf])
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index 4b37640cb..d2506ef01 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -25,7 +25,7 @@
// Pasteboard type for or drag operations
#define DragDropSimplePboardType @"HBQueueCustomOutlineViewPboardType"
-// DockTile update freqency in total percent increment
+// DockTile update frequency in total percent increment
#define dockTileUpdateFrequency 0.1f
@interface HBQueueController () <NSOutlineViewDataSource, HBQueueOutlineViewDelegate>
diff --git a/macosx/HBQueueOutlineView.h b/macosx/HBQueueOutlineView.h
index 8565237cb..b17d0789e 100644
--- a/macosx/HBQueueOutlineView.h
+++ b/macosx/HBQueueOutlineView.h
@@ -13,7 +13,7 @@
// HBQueueOutlineView exists solely to get around a bug in variable row height outline
// views in which row heights get messed up during live resizes. See this discussion:
// http://lists.apple.com/archives/cocoa-dev/2005/Oct/msg00871.html
-// However, the recommeneded fix (override drawRect:) does not work. Instead, this
+// However, the recommended fix (override drawRect:) does not work. Instead, this
// subclass implements viewDidEndLiveResize in order to recalculate all row heights.
//
// (2) prevent expanding of items during drags
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index 235ceec1e..fcfefdbb7 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -39,7 +39,7 @@ extern NSString *keySubTrackSrtFileURLBookmark;
@property (nonatomic, readwrite, weak) HBJob *job;
@property (nonatomic, readwrite) int container;
-/// Used to aovid circular dependecy validation.
+/// Used to avoid circular dependency validation.
@property (nonatomic, readwrite) BOOL validating;
@end
diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index 21716b0bf..2df476165 100644
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -548,7 +548,7 @@ fail:
}
/**
- * Retuns the tune string plus the fastdecode option (if enabled)
+ * Returns the tune string plus the fastdecode option (if enabled)
*/
- (NSString *)completeTune
{
diff --git a/macosx/NSWindow+HBAdditions.h b/macosx/NSWindow+HBAdditions.h
index caaeaf982..4f4116013 100644
--- a/macosx/NSWindow+HBAdditions.h
+++ b/macosx/NSWindow+HBAdditions.h
@@ -9,7 +9,7 @@
@interface NSWindow (HBAdditions)
/**
- * Resizes the entire window to accomodate a view of a particular size.
+ * Resizes the entire window to accommodate a view of a particular size.
*/
- (void)HB_resizeToBestSizeForViewSize:(NSSize)viewSize center:(NSPoint)center animate:(BOOL)performAnimation;
diff --git a/macosx/NSWindow+HBAdditions.m b/macosx/NSWindow+HBAdditions.m
index ddb9a7899..ea13a9dcc 100644
--- a/macosx/NSWindow+HBAdditions.m
+++ b/macosx/NSWindow+HBAdditions.m
@@ -26,7 +26,7 @@
// Set the new frame size
// Add the border to the new frame size so that the content region
- // of the frame is large enough to accomodate the preview image
+ // of the frame is large enough to accommodate the preview image
frame.size.width = viewSize.width + borderX;
frame.size.height = viewSize.height + borderY;
diff --git a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h
index ed0072af4..a0ff707e7 100644
--- a/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h
+++ b/macosx/Sparkle.framework/Versions/A/Headers/SUUpdater.h
@@ -21,7 +21,7 @@
/*!
The main API in Sparkle for controlling the update mechanism.
- This class is used to configure the update paramters as well as manually
+ This class is used to configure the update parameters as well as manually
and automatically schedule and control checks for updates.
*/
SU_EXPORT @interface SUUpdater : NSObject
diff --git a/macosx/module.defs b/macosx/module.defs
index 622afc78d..befd4daf3 100644
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -41,11 +41,11 @@ endif
## extra CFLAGS: macro definitions
MACOSX.extra_cflags = OTHER_CFLAGS='$(MACOSX.GCC.D)'
-## launch a build thru xcode; which in turn will do a nested make against
+## launch a build through xcode; which in turn will do a nested make against
## this build system with normal build rules enabled.
##
## $(1) = list of targets
-## $(2) = list of goals to shunt thru xcodebuild->make
+## $(2) = list of goals to shunt through xcodebuild->make
##
MACOSX.XCODE = $(strip \