Remove use of multiple comments for localized strings.

6 files changed, 11 insertions, 11 deletions

diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 481584e9..159ca149 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index 8d1c0713..26114a2e 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -31,10 +31,10 @@
 #import "SPConstants.h"
 #import "SPConnectionController.h"
 
-#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"displayed when multiple content filters are selected in ContentFilterManager")
-#define SP_NO_SELECTION_PLACEHOLDER_STRING       NSLocalizedString(@"[no selection]", @"displayed if there is no content filter selected in ContentFilterManager")
+#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
+#define SP_NO_SELECTION_PLACEHOLDER_STRING       NSLocalizedString(@"[no selection]", @"[no selection]")
 #define SP_NAME_REQUIRED_PLACEHOLDER_STRING      NSLocalizedString(@"[name required]", @"displayed when new content filter has empty Name field (ContentFilterManager)")
-#define SP_FILE_PARSER_ERROR_TITLE_STRING        NSLocalizedString(@"Error while reading data file", @"File with content filters could not be parsed - message title (ContentFilterManager)")
+#define SP_FILE_PARSER_ERROR_TITLE_STRING        NSLocalizedString(@"Error while reading data file", @"error while reading data file")
 
 @interface SPContentFilterManager (PrivateAPI)
 
@@ -841,7 +841,7 @@
 												 defaultButton:NSLocalizedString(@"OK", @"OK button")
 											   alternateButton:nil
 												  otherButton:nil
-									informativeTextWithFormat:NSLocalizedString(@"File couldn't be read.", @"file with content filters could not be parsed - message text (ContentFilterManager)")];
+									informativeTextWithFormat:NSLocalizedString(@"File couldn't be read.", @"error while reading data file")];
 
 				[alert setAlertStyle:NSCriticalAlertStyle];
 				[alert runModal];
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index ec42b092..5ffac179 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -1198,7 +1198,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte
 			case 0:
 			return NSLocalizedString(@"Type", @"type label (Navigator)");
 			case 1:
-			return NSLocalizedString(@"Default", @"default label (Navigator)");
+			return NSLocalizedString(@"Default", @"default label");
 			case 2:
 			return NSLocalizedString(@"Is Nullable", @"is nullable label (Navigator)");
 			case 3:
@@ -1212,7 +1212,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte
 			case 7:
 			return NSLocalizedString(@"Privileges", @"privileges label (Navigator)");
 			case 8:
-			return NSLocalizedString(@"Comment", @"comment label (Navigator)");
+			return NSLocalizedString(@"Comment", @"comment label");
 		}
 
 	if(type == 2) // PROCEDURE
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 838d48e5..eb429b61 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -143,7 +143,7 @@
 		NSLocalizedString(@"Text",@"text label for color table (Prefs > Editor)"),
 		NSLocalizedString(@"Background",@"background label for color table (Prefs > Editor)"),
 		NSLocalizedString(@"Caret",@"caret label for color table (Prefs > Editor)"),
-		NSLocalizedString(@"Comment",@"comment label for color table (Prefs > Editor)"),
+		NSLocalizedString(@"Comment",@"comment label"),
 		NSLocalizedString(@"Keyword",@"keyword label for color table (Prefs > Editor)"),
 		NSLocalizedString(@"Numeric",@"numeric label for color table (Prefs > Editor)"),
 		NSLocalizedString(@"Quote",@"quote label for color table (Prefs > Editor)"),
@@ -1620,7 +1620,7 @@
 	[themeSelectionMenu removeAllItems];
 	[themeSelectionMenu setAutoenablesItems:YES];
 	[themeSelectionMenu setShowsStateColumn:YES];
-	[themeSelectionMenu addItemWithTitle:NSLocalizedString(@"Default", @"Name of 'Default' color theme (Prefs > Editor)") action:@selector(setDefaultColors:) keyEquivalent:@""];
+	[themeSelectionMenu addItemWithTitle:NSLocalizedString(@"Default", @"default label") action:@selector(setDefaultColors:) keyEquivalent:@""];
 	[themeSelectionMenu addItem:[NSMenuItem separatorItem]];
 	
 	NSArray *foundThemes = [self getAvailableThemes];
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index 08b10d45..78c1d3b4 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -766,12 +766,12 @@
 		}
 		// Filter task came from filter table
 		else if(activeFilter == 1){
-			[filterTableWindow setTitle:[NSString stringWithFormat:@"%@ – %@", NSLocalizedString(@"Filter", @"filter table window title"), NSLocalizedString(@"WHERE clause not valid", @"WHERE clause not valid")]];
+			[filterTableWindow setTitle:[NSString stringWithFormat:@"%@ – %@", NSLocalizedString(@"Filter", @"filter label"), NSLocalizedString(@"WHERE clause not valid", @"WHERE clause not valid")]];
 		}
 	} else {
 		// Trigger a full reload if required
 		if (fullTableReloadRequired) [self reloadTable:self];
-		[filterTableWindow setTitle:NSLocalizedString(@"Filter", @"filter table window title")];
+		[filterTableWindow setTitle:NSLocalizedString(@"Filter", @"filter label")];
 	}
 }
 
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index 1a694fc2..965ddf8e 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -263,7 +263,7 @@
 
 	// Set the filter placeholder text
 	if ([tableDocumentInstance database]) {
-		[[[listFilterField cell] onMainThread] setPlaceholderString:NSLocalizedString(@"Filter", @"Filter placeholder")];
+		[[[listFilterField cell] onMainThread] setPlaceholderString:NSLocalizedString(@"Filter", @"filter label")];
 	}
 
 	if (previousSelectedTable) [previousSelectedTable release];