Cleaned up Format string is not a string literal (potentially insecure) errors

17 files changed, 54 insertions, 54 deletions

diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 02d1773b..5ddd7426 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -532,7 +532,7 @@
 												 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 											   alternateButton:nil 
 												  otherButton:nil 
-									informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The color theme ‘%@’ already exists.", @"the color theme ‘%@’ already exists."), [filename lastPathComponent]]];
+									informativeTextWithFormat:NSLocalizedString(@"The color theme ‘%@’ already exists.", @"the color theme ‘%@’ already exists."), [filename lastPathComponent]];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
@@ -579,7 +579,7 @@
 													 defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : UUID : OK button") 
 												   alternateButton:nil 
 													  otherButton:nil 
-										informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The Bundle ‘%@’ has no UUID which is necessary to identify installed Bundles.", @"Open Files : Bundle: UUID : UUID-Attribute is missing in bundle's command.plist file"), [filename lastPathComponent]]];
+										informativeTextWithFormat:NSLocalizedString(@"The Bundle ‘%@’ has no UUID which is necessary to identify installed Bundles.", @"Open Files : Bundle: UUID : UUID-Attribute is missing in bundle's command.plist file"), [filename lastPathComponent]];
 
 					[alert setAlertStyle:NSCriticalAlertStyle];
 					[alert runModal];
@@ -596,7 +596,7 @@
 													 defaultButton:NSLocalizedString(@"Update", @"Open Files : Bundle : Already-Installed : Update button") 
 												   alternateButton:NSLocalizedString(@"Cancel", @"Open Files : Bundle : Already-Installed : Cancel button")
 													  otherButton:nil 
-										informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"A Bundle ‘%@’ is already installed. Do you want to update it?", @"Open Files : Bundle : Already-Installed : 'Update Bundle' question dialog message"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"name"]]];
+										informativeTextWithFormat:NSLocalizedString(@"A Bundle ‘%@’ is already installed. Do you want to update it?", @"Open Files : Bundle : Already-Installed : 'Update Bundle' question dialog message"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"name"]];
 
 					[alert setAlertStyle:NSCriticalAlertStyle];
 					NSInteger answer = [alert runModal];
@@ -612,7 +612,7 @@
 															 defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : Already-Installed : Delete-Old-Error : OK button") 
 														   alternateButton:nil 
 															  otherButton:nil 
-												informativeTextWithFormat:[error localizedDescription]];
+												informativeTextWithFormat:@"%@", [error localizedDescription]];
 
 							[alert setAlertStyle:NSCriticalAlertStyle];
 							[alert runModal];
@@ -649,7 +649,7 @@
 												 defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : Install-Error : OK button") 
 											   alternateButton:nil 
 												  otherButton:nil 
-									informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The Bundle ‘%@’ already exists.", @"Open Files : Bundle : Install-Error : Destination path already exists error dialog message"), [filename lastPathComponent]]];
+									informativeTextWithFormat:NSLocalizedString(@"The Bundle ‘%@’ already exists.", @"Open Files : Bundle : Install-Error : Destination path already exists error dialog message"), [filename lastPathComponent]];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
@@ -1480,7 +1480,7 @@
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										  otherButton:nil 
-							informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Couldn't create Application Support Bundle folder!\nError: %@", @"Couldn't create Application Support Bundle folder!\nError: %@"), [appPathError localizedDescription]]];
+							informativeTextWithFormat:NSLocalizedString(@"Couldn't create Application Support Bundle folder!\nError: %@", @"Couldn't create Application Support Bundle folder!\nError: %@"), [appPathError localizedDescription]];
 
 		[alert runModal];
 		return;
@@ -1610,7 +1610,7 @@
 																					 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 																				   alternateButton:nil 
 																					  otherButton:nil 
-																		informativeTextWithFormat:[error localizedDescription]];
+																		informativeTextWithFormat:@"%@", [error localizedDescription]];
 
 													[alert setAlertStyle:NSCriticalAlertStyle];
 													[alert runModal];
@@ -1755,7 +1755,7 @@
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										  otherButton:nil 
-							informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The following default Bundles were updated:\n%@\nYour modifications were stored as “(user)”.", @"the following default bundles were updated:\n%@\nyour modifications were stored as “(user)”."), infoAboutUpdatedDefaultBundles]];
+							informativeTextWithFormat:NSLocalizedString(@"The following default Bundles were updated:\n%@\nYour modifications were stored as “(user)”.", @"the following default bundles were updated:\n%@\nyour modifications were stored as “(user)”."), infoAboutUpdatedDefaultBundles];
 
 		[alert runModal];
 		[self reloadBundles:nil];
@@ -2146,7 +2146,7 @@
 										 defaultButton:NSLocalizedString(@"OK", @"OK button")
 									   alternateButton:nil
                                            otherButton:nil
-                             informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Couldn't create Application Support Theme folder!\nError: %@", @"Couldn't create Application Support Theme folder!\nError: %@"), [appPathError localizedDescription]]];
+                             informativeTextWithFormat:NSLocalizedString(@"Couldn't create Application Support Theme folder!\nError: %@", @"Couldn't create Application Support Theme folder!\nError: %@"), [appPathError localizedDescription]];
         
 		[alert runModal];
 		return;
@@ -2176,7 +2176,7 @@
 										 defaultButton:NSLocalizedString(@"OK", @"OK button")
 									   alternateButton:nil
                                            otherButton:nil
-                             informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Couldn't copy default themes to Application Support Theme folder!\nError: %@", @"Couldn't copy default themes to Application Support Theme folder!\nError: %@"), [copyError localizedDescription]]];
+                             informativeTextWithFormat:NSLocalizedString(@"Couldn't copy default themes to Application Support Theme folder!\nError: %@", @"Couldn't copy default themes to Application Support Theme folder!\nError: %@"), [copyError localizedDescription]];
         
 		[alert runModal];
 		
diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m
index 87abe4a4..15b4dc77 100644
--- a/Source/SPBundleEditorController.m
+++ b/Source/SPBundleEditorController.m
@@ -1001,7 +1001,7 @@
 														 defaultButton:NSLocalizedString(@"OK", @"Bundle Editor : Trash-Bundle(s)-Error : OK button") 
 													   alternateButton:nil 
 														  otherButton:nil 
-											informativeTextWithFormat:[error localizedDescription]];
+											informativeTextWithFormat:@"%@", [error localizedDescription]];
 					
 						[alert setAlertStyle:NSCriticalAlertStyle];
 						[alert runModal];
diff --git a/Source/SPBundleHTMLOutputController.m b/Source/SPBundleHTMLOutputController.m
index 444d59e0..e3def2db 100644
--- a/Source/SPBundleHTMLOutputController.m
+++ b/Source/SPBundleHTMLOutputController.m
@@ -520,7 +520,7 @@
 									 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 								   alternateButton:nil 
 									  otherButton:nil 
-						informativeTextWithFormat:mes];
+						informativeTextWithFormat:@"%@", mes];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 	[alert runModal];
@@ -540,7 +540,7 @@
 									 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 								   alternateButton:nil 
 									  otherButton:nil 
-						informativeTextWithFormat:mes];
+						informativeTextWithFormat:@"%@", mes];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 	[alert runModal];
@@ -689,7 +689,7 @@
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										  otherButton:nil 
-							informativeTextWithFormat:[err localizedDescription]];
+							informativeTextWithFormat:@"%@", [err localizedDescription]];
 
 		[alert setAlertStyle:NSCriticalAlertStyle];
 		[alert runModal];
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index f35f27dc..db6851d9 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -872,7 +872,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
 											 defaultButton:NSLocalizedString(@"Delete", @"delete button") 
 										   alternateButton:NSLocalizedString(@"Cancel", @"cancel button") 
 											   otherButton:nil 
-								 informativeTextWithFormat:informativeMessage];
+								 informativeTextWithFormat:@"%@", informativeMessage];
 			
 			NSArray *buttons = [alert buttons];
 			
diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m
index 1865a6a2..a704de92 100644
--- a/Source/SPConnectionControllerDelegate.m
+++ b/Source/SPConnectionControllerDelegate.m
@@ -678,7 +678,7 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
 										 defaultButton:NSLocalizedString(@"OK", @"OK")
 									   alternateButton:nil 
 										   otherButton:nil 
-							 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The following error occurred during the export process:\n\n%@", @"favorites export error informative message"), [error localizedDescription]]];
+							 informativeTextWithFormat:NSLocalizedString(@"The following error occurred during the export process:\n\n%@", @"favorites export error informative message"), [error localizedDescription]];
 	
 		[alert beginSheetModalForWindow:[dbDocument parentWindow] 
 						  modalDelegate:self
@@ -730,7 +730,7 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
 										 defaultButton:NSLocalizedString(@"OK", @"OK")
 									   alternateButton:nil 
 										   otherButton:nil 
-							 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The following error occurred during the import process:\n\n%@", @"favorites import error informative message"), [error localizedDescription]]];	
+							 informativeTextWithFormat:NSLocalizedString(@"The following error occurred during the import process:\n\n%@", @"favorites import error informative message"), [error localizedDescription]];
 		
 		[alert beginSheetModalForWindow:[dbDocument parentWindow] 
 						  modalDelegate:self
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index d47b2c90..019e0b6b 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -953,7 +953,7 @@
 												 defaultButton:NSLocalizedString(@"OK", @"OK button")
 											   alternateButton:nil
 												  otherButton:nil
-									informativeTextWithFormat:err];
+									informativeTextWithFormat:@"%@", err];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index d4c540bb..0a76030b 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -513,7 +513,7 @@
 									 defaultButton:NSLocalizedString(@"Clear", @"clear button")
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
 									   otherButton:nil
-						 informativeTextWithFormat:infoString];
+						 informativeTextWithFormat:@"%@", infoString];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 2fce7598..05c25e92 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -874,7 +874,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 									 defaultButton:NSLocalizedString(@"Delete", @"delete button") 
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button") 
 									  otherButton:nil 
-						informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the database '%@'? This operation cannot be undone.", @"delete database informative message"), [self database]]];
+						informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to delete the database '%@'? This operation cannot be undone.", @"delete database informative message"), [self database]];
 
 	NSArray *buttons = [alert buttons];
 
@@ -1878,7 +1878,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to check the %@.\n\nMySQL said:%@",@"an error occurred while trying to check the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while trying to check the %@.\n\nMySQL said:%@",@"an error occurred while trying to check the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -1913,7 +1913,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:message] 
+			 informativeTextWithFormat:@"%@", message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -1955,7 +1955,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while analyzing the %@.\n\nMySQL said:%@",@"an error occurred while analyzing the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while analyzing the %@.\n\nMySQL said:%@",@"an error occurred while analyzing the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -1990,7 +1990,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:message] 
+			 informativeTextWithFormat:@"%@", message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -2032,7 +2032,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while optimzing the %@.\n\nMySQL said:%@",@"an error occurred while trying to optimze the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while optimzing the %@.\n\nMySQL said:%@",@"an error occurred while trying to optimze the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -2067,7 +2067,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:message] 
+			 informativeTextWithFormat:@"%@", message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -2108,7 +2108,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while repairing the %@.\n\nMySQL said:%@",@"an error occurred while trying to repair the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while repairing the %@.\n\nMySQL said:%@",@"an error occurred while trying to repair the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -2143,7 +2143,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:message] 
+			 informativeTextWithFormat:@"%@", message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -2184,7 +2184,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while flushing the %@.\n\nMySQL said:%@",@"an error occurred while trying to flush the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while flushing the %@.\n\nMySQL said:%@",@"an error occurred while trying to flush the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -2219,7 +2219,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:message] 
+			 informativeTextWithFormat:@"%@", message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -2258,7 +2258,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while performing the checksum on %@.\n\nMySQL said:%@",@"an error occurred while performing the checksum on the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while performing the checksum on %@.\n\nMySQL said:%@",@"an error occurred while performing the checksum on the %@.\n\nMySQL said:%@"), what, [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:parentWindow 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -2276,7 +2276,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 						 defaultButton:@"OK" 
 					   alternateButton:nil 
 						   otherButton:nil 
-			 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Table checksum: %@",@"table checksum: %@"), message]] 
+			 informativeTextWithFormat:NSLocalizedString(@"Table checksum: %@",@"table checksum: %@"), message]
 			  beginSheetModalForWindow:parentWindow 
 						 modalDelegate:self 
 						didEndSelector:NULL 
@@ -3136,7 +3136,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 												 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 											   alternateButton:nil 
 												  otherButton:nil 
-									informativeTextWithFormat:err];
+									informativeTextWithFormat:@"%@", err];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
@@ -3262,7 +3262,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 											 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 										   alternateButton:nil 
 											  otherButton:nil 
-								informativeTextWithFormat:err];
+								informativeTextWithFormat:@"%@", err];
 
 			[alert setAlertStyle:NSCriticalAlertStyle];
 			[alert runModal];
@@ -3360,7 +3360,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										   otherButton:nil 
-							 informativeTextWithFormat:err];
+							 informativeTextWithFormat:@"%@", err];
 
 		[alert setAlertStyle:NSCriticalAlertStyle];
 		[alert runModal];
@@ -4762,7 +4762,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										  otherButton:nil 
-							informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The chosen file “%@” contains ‘%@’ data.", @"message while reading a spf file which matches non-supported formats."), path, [spf objectForKey:@"format"]]];
+							informativeTextWithFormat:NSLocalizedString(@"The chosen file “%@” contains ‘%@’ data.", @"message while reading a spf file which matches non-supported formats."), path, [spf objectForKey:@"format"]];
 
 		[alert setAlertStyle:NSWarningAlertStyle];
 		[spf release];
@@ -4883,7 +4883,7 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase";
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										  otherButton:nil 
-							informativeTextWithFormat:informativeText];
+							informativeTextWithFormat:@"%@", informativeText];
 
 		[alert setAlertStyle:NSCriticalAlertStyle];
 		[alert runModal];
diff --git a/Source/SPEditorPreferencePane.m b/Source/SPEditorPreferencePane.m
index 186af05a..027b5f8c 100644
--- a/Source/SPEditorPreferencePane.m
+++ b/Source/SPEditorPreferencePane.m
@@ -909,7 +909,7 @@ static NSString *SPCustomColorSchemeNameLC       = @"user-defined";
 										 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 									   alternateButton:nil 
 										   otherButton:nil 
-							 informativeTextWithFormat:err];
+							 informativeTextWithFormat:@"%@", err];
 		
 		[alert setAlertStyle:NSCriticalAlertStyle];
 		[alert runModal];
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 5b289a01..4e62016f 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -428,7 +428,7 @@ static NSString *SPTableViewSqlColumnID         = @"sql";
 												 defaultButton:NSLocalizedString(@"OK", @"OK button")
 											   alternateButton:nil
 												   otherButton:nil
-									 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to add the new column '%@' by\n\n%@.\n\nMySQL said: %@", @"error adding new column informative message"), [fieldMappingTableColumnNames objectAtIndex:currentIndex], createString, [mySQLConnection lastErrorMessage]]];
+									 informativeTextWithFormat:NSLocalizedString(@"An error occurred while trying to add the new column '%@' by\n\n%@.\n\nMySQL said: %@", @"error adding new column informative message"), [fieldMappingTableColumnNames objectAtIndex:currentIndex], createString, [mySQLConnection lastErrorMessage]];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
@@ -482,7 +482,7 @@ static NSString *SPTableViewSqlColumnID         = @"sql";
 											 defaultButton:NSLocalizedString(@"OK", @"OK button")
 										   alternateButton:nil
 											   otherButton:nil
-								 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to add the new table '%@' by\n\n%@.\n\nMySQL said: %@", @"error adding new table informative message"), [newTableNameTextField stringValue], createString, [mySQLConnection lastErrorMessage]]];
+								 informativeTextWithFormat:NSLocalizedString(@"An error occurred while trying to add the new table '%@' by\n\n%@.\n\nMySQL said: %@", @"error adding new table informative message"), [newTableNameTextField stringValue], createString, [mySQLConnection lastErrorMessage]];
 
 			[alert setAlertStyle:NSCriticalAlertStyle];
 			[alert beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index 08c1cdef..8fa65a1d 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -292,7 +292,7 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 									 defaultButton:NSLocalizedString(@"Delete", @"delete button")
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
 									   otherButton:nil
-						 informativeTextWithFormat:hasForeignKey ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]];
+						 informativeTextWithFormat:hasForeignKey ? NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName : NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 
diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m
index 5c4ad477..024afdc4 100644
--- a/Source/SPPrintController.m
+++ b/Source/SPPrintController.m
@@ -127,7 +127,7 @@
 											 defaultButton:NSLocalizedString(@"Print", @"print button")
 										   alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
 											   otherButton:nil
-								 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to print the current content view of the table '%@'?\n\nIt currently contains %@ rows, which may take a significant amount of time to print.", @"continue to print informative message"), [self table], [numberFormatter stringFromNumber:[NSNumber numberWithLongLong:resultRows]]]];
+								 informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to print the current content view of the table '%@'?\n\nIt currently contains %@ rows, which may take a significant amount of time to print.", @"continue to print informative message"), [self table], [numberFormatter stringFromNumber:[NSNumber numberWithLongLong:resultRows]]];
 
 			NSArray *buttons = [alert buttons];
 
diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m
index 2b26eb90..913035d4 100644
--- a/Source/SPProcessListController.m
+++ b/Source/SPProcessListController.m
@@ -252,7 +252,7 @@ static NSString *SPTableViewIDColumnIdentifier = @"Id";
 									 defaultButton:NSLocalizedString(@"Kill", @"kill button") 
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button") 
 									   otherButton:nil 
-						 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to kill the current query executing on connection ID %lld?\n\nPlease be aware that continuing to kill this query may result in data corruption. Please proceed with caution.", @"kill query informative message"), processId]];
+						 informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to kill the current query executing on connection ID %lld?\n\nPlease be aware that continuing to kill this query may result in data corruption. Please proceed with caution.", @"kill query informative message"), processId];
 	
 	NSArray *buttons = [alert buttons];
 	
@@ -280,7 +280,7 @@ static NSString *SPTableViewIDColumnIdentifier = @"Id";
 									 defaultButton:NSLocalizedString(@"Kill", @"kill button") 
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button") 
 									   otherButton:nil 
-						 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to kill connection ID %lld?\n\nPlease be aware that continuing to kill this connection may result in data corruption. Please proceed with caution.", @"kill connection informative message"), processId]];
+						 informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to kill connection ID %lld?\n\nPlease be aware that continuing to kill this connection may result in data corruption. Please proceed with caution.", @"kill connection informative message"), processId];
 	
 	NSArray *buttons = [alert buttons];
 	
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index 9e49c6b0..17d2a452 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -940,7 +940,7 @@
 												 defaultButton:NSLocalizedString(@"OK", @"OK button") 
 											   alternateButton:nil 
 												  otherButton:nil 
-									informativeTextWithFormat:err];
+									informativeTextWithFormat:@"%@", err];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index 0a316379..72c357d9 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -292,7 +292,7 @@ static NSString *SPRemoveFieldAndForeignKey = @"SPRemoveFieldAndForeignKey";
 							 defaultButton:@"OK" 
 						   alternateButton:nil 
 							   otherButton:nil 
-				 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while fetching the optimized field type.\n\nMySQL said:%@", @"an error occurred while fetching the optimized field type.\n\nMySQL said:%@"), [mySQLConnection lastErrorMessage]]] 
+				 informativeTextWithFormat:NSLocalizedString(@"An error occurred while fetching the optimized field type.\n\nMySQL said:%@", @"an error occurred while fetching the optimized field type.\n\nMySQL said:%@"), [mySQLConnection lastErrorMessage]]
 				  beginSheetModalForWindow:[tableDocumentInstance parentWindow] 
 							 modalDelegate:self 
 							didEndSelector:NULL 
@@ -316,7 +316,7 @@ static NSString *SPRemoveFieldAndForeignKey = @"SPRemoveFieldAndForeignKey";
 					 defaultButton:@"OK" 
 				   alternateButton:nil 
 					   otherButton:nil 
-		 informativeTextWithFormat:type] 
+		 informativeTextWithFormat:@"%@", type]
 		  beginSheetModalForWindow:[tableDocumentInstance parentWindow] 
 					 modalDelegate:self 
 					didEndSelector:NULL 
@@ -446,7 +446,7 @@ static NSString *SPRemoveFieldAndForeignKey = @"SPRemoveFieldAndForeignKey";
 									 defaultButton:NSLocalizedString(@"Delete", @"delete button")
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
 									   otherButton:nil
-						 informativeTextWithFormat:hasForeignKey ? [NSString stringWithFormat:NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to delete the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field]];
+						 informativeTextWithFormat:hasForeignKey ? NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to delete the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable : NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index fb07dfef..0f4f743a 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -1822,8 +1822,8 @@ static NSString *SPDuplicateTable = @"SPDuplicateTable";
 											 defaultButton:NSLocalizedString(@"OK", @"OK button")
 										   alternateButton:nil
 											   otherButton:nil
-								 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to import a table via: \n%@\n\n\nMySQL said: %@", @"error importing table informative message"),
-									query, [mySQLConnection lastErrorMessage]]];
+								 informativeTextWithFormat:NSLocalizedString(@"An error occurred while trying to import a table via: \n%@\n\n\nMySQL said: %@", @"error importing table informative message"),
+									query, [mySQLConnection lastErrorMessage]];
 
 			[alert setAlertStyle:NSCriticalAlertStyle];
 			[alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"truncateTableError"];
@@ -2273,8 +2273,8 @@ static NSString *SPDuplicateTable = @"SPDuplicateTable";
 											 defaultButton:NSLocalizedString(@"OK", @"OK button")
 										   alternateButton:nil
 											   otherButton:nil
-								 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to truncate the table '%@'.\n\nMySQL said: %@", @"error truncating table informative message"),
-									[filteredTables objectAtIndex:currentIndex], [mySQLConnection lastErrorMessage]]];
+								 informativeTextWithFormat:NSLocalizedString(@"An error occurred while trying to truncate the table '%@'.\n\nMySQL said: %@", @"error truncating table informative message"),
+									[filteredTables objectAtIndex:currentIndex], [mySQLConnection lastErrorMessage]];
 
 			[alert setAlertStyle:NSCriticalAlertStyle];
 			
diff --git a/Source/SPUserManagerDelegate.m b/Source/SPUserManagerDelegate.m
index c00abba3..a5bedca7 100644
--- a/Source/SPUserManagerDelegate.m
+++ b/Source/SPUserManagerDelegate.m
@@ -303,7 +303,7 @@ static NSString *SPSchemaPrivilegesTabIdentifier = @"Schema Privileges";
 												 defaultButton:NSLocalizedString(@"OK", @"OK button")
 											   alternateButton:nil
 												   otherButton:nil
-									 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"A user with the name '%@' already exists", @"duplicate user informative message"), name]];
+									 informativeTextWithFormat:NSLocalizedString(@"A user with the name '%@' already exists", @"duplicate user informative message"), name];
 				[alert runModal];
 				
 				return NO;
@@ -322,7 +322,7 @@ static NSString *SPSchemaPrivilegesTabIdentifier = @"Schema Privileges";
 													 defaultButton:NSLocalizedString(@"OK", @"OK button")
 												   alternateButton:nil
 													   otherButton:nil
-										 informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"A user with the host '%@' already exists", @"duplicate host informative message"), host]];
+										 informativeTextWithFormat:NSLocalizedString(@"A user with the host '%@' already exists", @"duplicate host informative message"), host];
 					
 					[alert runModal];