diff options
| -rw-r--r-- | Resources/English.lproj/Localizable.strings | bin | 178868 -> 179780 bytes | |||
| -rw-r--r-- | Source/SPCustomQuery.m | 2 | ||||
| -rw-r--r-- | Source/SPDataImport.m | 8 | ||||
| -rw-r--r-- | Source/SPPreferenceController.m | 24 | ||||
| -rw-r--r-- | Source/SPTableContent.m | 2 | ||||
| -rw-r--r-- | Source/SPTableStructure.m | 1 |
6 files changed, 18 insertions, 19 deletions
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex acd62f5f..20d5128d 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 35401d97..5f658a1d 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -3438,7 +3438,7 @@ kCellEditorErrorNoMatch = NSLocalizedString(@"Field is not editable. No matching record found.\nReload data, check encoding, or try to add\na primary key field or more fields\nin your SELECT statement for table '%@'\nto identify field origin unambiguously.", @"Custom Query result editing error - could not identify original row"); kCellEditorErrorNoMultiTabDb = NSLocalizedString(@"Field is not editable. Field has no or multiple table or database origin(s).",@"field is not editable due to no table/database"); - kCellEditorErrorTooManyMatches = NSLocalizedString(@"Field is not editable. Couldn't identify field origin unambiguously (%ld match%@).", @"Custom Query result editing error - could not match row being edited uniquely"); + kCellEditorErrorTooManyMatches = NSLocalizedString(@"Field is not editable. Couldn't identify field origin unambiguously (%ld match%@).", @"Query result editing error - could not match row being edited uniquely"); } diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index efc85bbc..11113a58 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -436,7 +436,7 @@ [mySQLConnection queryString:[NSString stringWithFormat:@"SET NAMES '%@'", connectionEncodingToRestore]]; } [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"SQL read error title"), + SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld queries were executed.\n\n(%@)", @"SQL read error, including detail from system"), (long)queriesPerformed, [exception reason]]); @@ -486,7 +486,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:sqlEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"SQL read error title"), + SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read in the encoding you selected (%@).\n\nOnly %ld queries were executed.", @"SQL encoding read error"), displayEncoding, (long)queriesPerformed]); @@ -763,7 +763,7 @@ // Report file read errors, and bail @catch (NSException *exception) { [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"CSV read error title"), + SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld rows were imported.\n\n(%@)", @"CSV read error, including detail string from system"), (long)rowsImported, [exception reason]]); @@ -812,7 +812,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:csvEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"CSV read error title"), + SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read using the encoding you selected (%@).\n\nOnly %ld rows were imported.", @"CSV encoding read error"), displayEncoding, (long)rowsImported]); diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index d05868b9..f12cd54a 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -142,17 +142,17 @@ nil ] retain]; editorNameForColors = [[NSArray arrayWithObjects: - NSLocalizedString(@"Text",@"text lable for color table"), - NSLocalizedString(@"Background",@"background lable for color table"), - NSLocalizedString(@"Caret",@"caret lable for color table"), - NSLocalizedString(@"Comment",@"comment lable for color table"), - NSLocalizedString(@"Keyword",@"keyword lable for color table"), - NSLocalizedString(@"Numeric",@"numeric lable for color table"), - NSLocalizedString(@"Quote",@"quote lable for color table"), - NSLocalizedString(@"Backtick Quote",@"backtick quote lable for color table"), - NSLocalizedString(@"Variable",@"variable lable for color table"), - NSLocalizedString(@"Query Background",@"query background lable for color table"), - NSLocalizedString(@"Selection",@"selection lable for color table"), + NSLocalizedString(@"Text",@"text label for color table"), + NSLocalizedString(@"Background",@"background label for color table"), + NSLocalizedString(@"Caret",@"caret label for color table"), + NSLocalizedString(@"Comment",@"comment label"), + NSLocalizedString(@"Keyword",@"keyword label for color table"), + NSLocalizedString(@"Numeric",@"numeric label for color table"), + NSLocalizedString(@"Quote",@"quote label for color table"), + NSLocalizedString(@"Backtick Quote",@"backtick quote label for color table"), + NSLocalizedString(@"Variable",@"variable label for color table"), + NSLocalizedString(@"Query Background",@"query background label for color table"), + NSLocalizedString(@"Selection",@"selection label for color table"), nil ] retain]; @@ -1651,7 +1651,7 @@ [themeSelectionMenu removeAllItems]; [themeSelectionMenu setAutoenablesItems:YES]; [themeSelectionMenu setShowsStateColumn:YES]; - [themeSelectionMenu addItemWithTitle:NSLocalizedString(@"Default", @"default color scheme label") 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 9a1fc14c..59a9e8c4 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -127,7 +127,7 @@ kCellEditorErrorNoMatch = NSLocalizedString(@"Field is not editable. No matching record found.\nReload table, check the encoding, or try to add\na primary key field or more fields\nin the view declaration of '%@' to identify\nfield origin unambiguously.", @"Table Content result editing error - could not identify original row"); kCellEditorErrorNoMultiTabDb = NSLocalizedString(@"Field is not editable. Field has no or multiple table or database origin(s).",@"field is not editable due to no table/database"); - kCellEditorErrorTooManyMatches = NSLocalizedString(@"Field is not editable. Couldn't identify field origin unambiguously (%ld match%@).", @"Table Content result editing error - could not match row being edited uniquely"); + kCellEditorErrorTooManyMatches = NSLocalizedString(@"Field is not editable. Couldn't identify field origin unambiguously (%ld match%@).", @"Query result editing error - could not match row being edited uniquely"); } diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m index a0e80306..350bc8ea 100644 --- a/Source/SPTableStructure.m +++ b/Source/SPTableStructure.m @@ -1036,7 +1036,6 @@ closes the keySheet isEditingNewRow = NO; currentlyEditingRow = -1; [tableFields removeAllObjects]; - //[indexes removeAllObjects]; [tableSourceView reloadData]; [indexesTableView reloadData]; [addFieldButton setEnabled:NO]; |