MacGui: updated the text on some warning messages.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7339 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m
index 5720bfd844ef467d1dd0816f29b4f97b3a0f6fe8..41b507d0c40d8ef070481f553a11449ecb47f07f 100644 (file)
--- 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 ec470c4547158b7565bab3e69c0b72d10beca31d..d5599e899ff7f7f759b3529e218a978a1e3c1b2a 100644 (file)
--- 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 2b5be6d8487a26a3784d8a158e32cf2ff8b6d625..d58cb67157d6b7e0e8e1a2241d57fdf555fd3c6d 100644 (file)
--- 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 f2dfbaa50dc3a7050bb5cc9a7827343f46e9f5c0..d5569aaf523fde642f7689fe5628dfbcd6960267 100644 (file)
--- 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 6eb50b46b7ebb96add926f71fa25c6036dcebcc3..15822333f8826d820cf1dc8bfb094ad3224a88bb 100644 (file)
--- 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">