summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/HBAddPresetController.m4
-rw-r--r--macosx/HBController.m6
-rw-r--r--macosx/HBPresetsViewController.m8
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme2
-rw-r--r--macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme8
5 files changed, 16 insertions, 12 deletions
diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m
index 5720bfd84..41b507d0c 100644
--- a/macosx/HBAddPresetController.m
+++ b/macosx/HBAddPresetController.m
@@ -96,8 +96,8 @@
if (self.name.stringValue.length == 0)
{
NSAlert *alert = [[NSAlert alloc] init];
- [alert setMessageText:NSLocalizedString(@"Warning!", @"")];
- [alert setInformativeText:NSLocalizedString(@"You need to insert a name for the preset.", @"")];
+ [alert setMessageText:NSLocalizedString(@"The preset name cannot be empty.", @"")];
+ [alert setInformativeText:NSLocalizedString(@"Please enter a name.", @"")];
[alert runModal];
}
else
diff --git a/macosx/HBController.m b/macosx/HBController.m
index ec470c454..d5599e899 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -1096,8 +1096,8 @@
if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0)
{
NSAlert *alert = [[NSAlert alloc] init];
- [alert setMessageText:NSLocalizedString(@"Warning!", @"")];
- [alert setInformativeText:NSLocalizedString(@"This is not a valid destination directory!", @"")];
+ [alert setMessageText:NSLocalizedString(@"Invalid destination.", @"")];
+ [alert setInformativeText:NSLocalizedString(@"The current destination folder is not a valid.", @"")];
[alert runModal];
return;
}
@@ -1106,7 +1106,7 @@
if ([[NSFileManager defaultManager] fileExistsAtPath:self.job.destURL.path])
{
NSAlert *alert = [[NSAlert alloc] init];
- [alert setMessageText:NSLocalizedString(@"Warning!", @"")];
+ [alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"")];
[alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @""), self.job.destURL.path]];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"")];
[alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"")];
diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m
index 2b5be6d84..d58cb6715 100644
--- a/macosx/HBPresetsViewController.m
+++ b/macosx/HBPresetsViewController.m
@@ -169,11 +169,11 @@
// Save the current selection path and apply it again after the deletion
NSIndexPath *currentSelection = [self.treeController selectionIndexPath];
/* Alert user before deleting preset */
- NSAlert *alert = [NSAlert alertWithMessageText:@"Warning!"
- defaultButton:@"OK"
- alternateButton:@"Cancel"
+ NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Are you sure you want to permanently delete the selected preset?", nil)
+ defaultButton:NSLocalizedString(@"Delete Preset", nil)
+ alternateButton:NSLocalizedString(@"Cancel", nil)
otherButton:nil
- informativeTextWithFormat:@"Are you sure that you want to delete the selected preset?"];
+ informativeTextWithFormat:NSLocalizedString(@"You can't undo this action.", nil)];
[alert setAlertStyle:NSCriticalAlertStyle];
NSInteger status = [alert runModal];
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme
index f2dfbaa50..d5569aaf5 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0630"
+ LastUpgradeVersion = "0640"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme
index 6eb50b46b..15822333f 100644
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0630"
- version = "1.3">
+ LastUpgradeVersion = "0640"
+ version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -76,6 +76,8 @@
ReferencedContainer = "container:HandBrake.xcodeproj">
</BuildableReference>
</MacroExpansion>
+ <AdditionalOptions>
+ </AdditionalOptions>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -85,6 +87,8 @@
buildConfiguration = "release"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
+ enableAddressSanitizer = "YES"
+ debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">