Commits

Anonymous committed 875ecf4

OK should be uppercase

  • Participants
  • Parent commits efd9d8c

Comments (0)

Files changed (13)

Classes/Application/AppController.m

 	if (!addExtDiff && !addExtBookmarks && !addExtMq && !addExtRebase && !addExtHistEdit && !addExtCollapse)
 	{
 		if (!onStartup)
-			NSRunAlertPanel(@"Editing Extensions Enabled", @"The history editing extensions are enabled in your mercurial configuration file (.hgrc).", @"Ok", nil, nil);
+			NSRunAlertPanel(@"Editing Extensions Enabled", @"The history editing extensions are enabled in your mercurial configuration file (.hgrc).", @"OK", nil, nil);
 		return;
 	}
 	
 		NSString* message = onStartup ? @"History editing was previously enabled, yet some extensions where not enabled in your mercurial configuration file (.hgrc). The necessary extensions have been re-enabled in your mercurial configuration file at %@. These extensions are used when you edit a repositories history from within MacHg. Having these extensions enabled does not effect any other standard mercurial operations." :
 										@"History editing in MacHg has been enabled. The necessary extensions have been enabled in your mercurial configuration file at %@. These extensions are used when you edit a repositories history from within MacHg. Having these extensions enabled does not effect any other standard mercurial operations.";
 		NSString* completeMessage = [NSString stringWithFormat:message, dotHGRC];
-		NSRunAlertPanel(@"Editing Extensions Enabled", completeMessage, @"Ok", nil, nil);
+		NSRunAlertPanel(@"Editing Extensions Enabled", completeMessage, @"OK", nil, nil);
 	}
 }
 
 - (void) checkForFileMerge
 {
 	if(![[NSWorkspace sharedWorkspace] fullPathForApplication:@"FileMerge"])
-		NSRunCriticalAlertPanel(@"FileMerge not found", @"FileMerge was not found on this system. Please install the developer tools from the system disk which came with your computer (they contain the application FileMerge). MacHg can function without FileMerge but you cannot view any diffs, since this is the tool MacHg uses to view diffs.", @"Ok", nil, nil);
+		NSRunCriticalAlertPanel(@"FileMerge not found", @"FileMerge was not found on this system. Please install the developer tools from the system disk which came with your computer (they contain the application FileMerge). MacHg can function without FileMerge but you cannot view any diffs, since this is the tool MacHg uses to view diffs.", @"OK", nil, nil);
 }
 
 
 	if ([results hasWarnings])
 	{
 		NSString* mainMessage = [NSString stringWithFormat:@"The version of Mercurial included with MacHg is producing the following warnings:\n\n%@\n\nMacHg might not function as intended. To resolve this check your configuration settings in your .hgrc file.", results.errStr];
-		RunCriticalAlertPanelWithSuppression(@"Mercurial Warnings", mainMessage, @"Ok", nil, MHGWarnAboutBadMercurialConfiguration);	
+		RunCriticalAlertPanelWithSuppression(@"Mercurial Warnings", mainMessage, @"OK", nil, MHGWarnAboutBadMercurialConfiguration);	
 	}	
 	if ([results hasErrors])
 	{
 		NSString* mainMessage = [NSString stringWithFormat:@"The version of Mercurial included with MacHg is producing the following Errors:\n\n%@\n\nMacHg cannot proceed. To resolve this check your configuration settings in your .hgrc file.", results.errStr];
-		NSRunCriticalAlertPanel(@"Mercurial Errors", mainMessage, @"Ok", nil, nil);
+		NSRunCriticalAlertPanel(@"Mercurial Errors", mainMessage, @"OK", nil, nil);
 		[NSApp terminate:self];
 	}
 }

Classes/Document/MacHgDocument.m

 	}
 	
 	if (DisplayWarningForPostMergeFromDefaults())
-		NSRunAlertPanel(@"Merged Files", @"You now need to examine the merged files, resolve and conflicts, and finally commit all the merged files to complete the merge.", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Merged Files", @"You now need to examine the merged files, resolve and conflicts, and finally commit all the merged files to complete the merge.", @"OK", nil, nil);
 
 	switch (AfterMergeDoFromDefaults())
 	{

Classes/General/Common.m

 	if ([baseURL getCapturesWithRegexAndComponents:@"(.*?://)(.*)"  firstComponent:&protocol  secondComponent:&rest])
 		return fstr(@"%@%@%@", nonNil(protocol), nonNil(password), nonNil(rest));
 
-	NSRunAlertPanel(@"Badly Formed Server URL", fstr(@"The server URL %@ is not of the form protocol://username@server", baseURL), @"Ok", nil, nil);
+	NSRunAlertPanel(@"Badly Formed Server URL", fstr(@"The server URL %@ is not of the form protocol://username@server", baseURL), @"OK", nil, nil);
 	return nil;
 }
 

Classes/General/TaskExecutions.m

 		NSString* errorString = IsEmpty(result.errStr) ? result.outStr : result.errStr;
 		NSString* fullErrorMessage = [NSString stringWithFormat:@"Mercurial reported error number %d:\n%@", result.result, errorString];
 		dispatch_async(mainQueue(), ^{
-			NSRunAlertPanel(errorMessage, fullErrorMessage, @"Ok", nil, nil);
+			NSRunAlertPanel(errorMessage, fullErrorMessage, @"OK", nil, nil);
 		});
 	}
 }

Classes/HistoryPane/HistoryPaneController.m

 	if (!label)
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"No Label Selected", @"You need to select a label first to move it", @"Ok", nil, nil);
+		NSRunAlertPanel(@"No Label Selected", @"You need to select a label first to move it", @"OK", nil, nil);
 		return;
 	}
 	[[myDocument theMoveLabelSheetController] openMoveLabelSheetForMoveLabel:label];
 	if (!label)
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"No Label Selected", @"You need to select a label first to remove it", @"Ok", nil, nil);
+		NSRunAlertPanel(@"No Label Selected", @"You need to select a label first to remove it", @"OK", nil, nil);
 		return;
 	}
 	

Classes/Sheets/CollapseSheet/CollapseSheetController.m

 	
 	if ([myDocument repositoryHasFilesWhichContainStatus:eHGStatusCommittable])
 	{
-		NSRunAlertPanel(@"Outstanding Changes", @"Collapsing is only allowed in repositories with no outstanding uncommitted changes.", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Outstanding Changes", @"Collapsing is only allowed in repositories with no outstanding uncommitted changes.", @"OK", nil, nil);
 		return;
 	}	
 	

Classes/Sheets/HistoryEditSheet/HistoryEditSheetController.m

 	{
 		NSString* operation = (result == NSAlertDefaultReturn ? @"Continue" : @"Abort");
 		NSString* titleMessage = [NSString stringWithFormat:@"Results of History Edit %@",operation];
-		NSRunAlertPanel(titleMessage, @"Mercurial reported the result of the history edit %@:\n\ncode %d:\n%@", @"Ok", nil, nil, operation, results.result, results.outStr);
+		NSRunAlertPanel(titleMessage, @"Mercurial reported the result of the history edit %@:\n\ncode %d:\n%@", @"OK", nil, nil, operation, results.result, results.outStr);
 	}
 }
 
 	
 	if ([myDocument repositoryHasFilesWhichContainStatus:eHGStatusCommittable])
 	{
-		NSRunAlertPanel(@"Outstanding Changes", @"History editing is only allowed in repositories with no outstanding uncommitted changes.", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Outstanding Changes", @"History editing is only allowed in repositories with no outstanding uncommitted changes.", @"OK", nil, nil);
 		return;
 	}
 	

Classes/Sheets/RebaseSheet/RebaseSheetController.m

 	{
 		NSString* operation = (result == NSAlertDefaultReturn ? @"Continue" : @"Abort");
 		NSString* titleMessage = [NSString stringWithFormat:@"Results of Rebase %@",operation];
-		NSRunAlertPanel(titleMessage, @"Mercurial reported the result of the rebase %@:\n\ncode %d:\n%@", @"Ok", nil, nil, operation, results.result, results.outStr);
+		NSRunAlertPanel(titleMessage, @"Mercurial reported the result of the rebase %@:\n\ncode %d:\n%@", @"OK", nil, nil, operation, results.result, results.outStr);
 	}
 }
 
 
 	if ([myDocument repositoryHasFilesWhichContainStatus:eHGStatusCommittable])
 	{
-		NSRunAlertPanel(@"Outstanding Changes", @"Rebasing is only allowed in repositories with no outstanding uncommitted changes.", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Outstanding Changes", @"Rebasing is only allowed in repositories with no outstanding uncommitted changes.", @"OK", nil, nil);
 		return;
 	}	
 	

Classes/Sheets/RenameFileSheet/RenameFileSheetController.m

 	if ([theSelectedFiles count] < 1)
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"No File Selected", @"You need to select a file to rename", @"Ok", nil, nil);
+		NSRunAlertPanel(@"No File Selected", @"You need to select a file to rename", @"OK", nil, nil);
 		return;
 	}
 	
 	if (![theSelectedFiles count] > 1)
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"Too Many Files Selected", @"You need to select just a single file to rename", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Too Many Files Selected", @"You need to select just a single file to rename", @"OK", nil, nil);
 		return;
 	}
 	
 	{
 		PlayBeep();
 		NSString* subMessage = [NSString stringWithFormat:@"“%@” is a directory. Mercurial only permits renaming files", [filePath lastPathComponent]];
-		NSRunAlertPanel(@"Rename Not Allowed", subMessage, @"Ok", nil, nil);
+		NSRunAlertPanel(@"Rename Not Allowed", subMessage, @"OK", nil, nil);
 		return;
 	}
 
 	{
 		PlayBeep();
 		NSString* subMessage = [NSString stringWithFormat:@"“%@” is not managed by Mercurial. You can rename or relocate the file in the finder without incident.", [filePath lastPathComponent]];
-		NSRunAlertPanel(@"File Not Under Management", subMessage, @"Ok", nil, nil);
+		NSRunAlertPanel(@"File Not Under Management", subMessage, @"OK", nil, nil);
 		return;
 	}
 	

Classes/Sheets/RepositorySheets/LocalRepositoryRefSheetController.m

 	@catch (NSException* e)
 	{
 		if ([[e name] isEqualTo:@"Initialize Repository"])
-			NSRunAlertPanel(@"Initialize Repository", [e reason], @"Ok", nil, nil);
+			NSRunAlertPanel(@"Initialize Repository", [e reason], @"OK", nil, nil);
 		else
 			[e raise];
 	}

Classes/Sheets/StripSheet/StripSheetController.m

 {
 	if ([myDocument repositoryHasFilesWhichContainStatus:eHGStatusCommittable])
 	{
-		NSRunAlertPanel(@"Outstanding Changes", @"Stripping is only allowed in repositories with no outstanding uncommitted changes.", @"Ok", nil, nil);
+		NSRunAlertPanel(@"Outstanding Changes", @"Stripping is only allowed in repositories with no outstanding uncommitted changes.", @"OK", nil, nil);
 		return;
 	}	
 		

Classes/Sidebar/Sidebar.m

 	if (!node)
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"No Bookmark Selected", @"You need to select a local bookmark", @"Ok", nil, nil);
+		NSRunAlertPanel(@"No Bookmark Selected", @"You need to select a local bookmark", @"OK", nil, nil);
 		return;
 	}
 
 	if (![node isLocalRepositoryRef])
 	{
 		PlayBeep();
-		NSRunAlertPanel(@"No Local Bookmark Selected", @"You need to select a local bookmark", @"Ok", nil, nil);
+		NSRunAlertPanel(@"No Local Bookmark Selected", @"You need to select a local bookmark", @"OK", nil, nil);
 		return;
 	}
 	

Classes/Sidebar/SidebarNode.m

 			path = caseSensitiveFilePath(path);
 		}
 		else
-			NSRunCriticalAlertPanel(@"Max Path Length exceeded", fstr(@"The maximum path length for the path to the repository root was exceeded. Functionality for this repository could be erratic. The path is", path), @"Ok", nil, nil);
+			NSRunCriticalAlertPanel(@"Max Path Length exceeded", fstr(@"The maximum path length for the path to the repository root was exceeded. Functionality for this repository could be erratic. The path is", path), @"OK", nil, nil);
 	}
 
 	if ([self isServerRepositoryRef] && path)