From d3943164cdba8b528413942e3b01ffc67e64436f Mon Sep 17 00:00:00 2001 From: dmoagx Date: Tue, 10 May 2011 15:44:29 +0000 Subject: * Fixes most parts of #1006 (Translation of file names) * Update strings files --- Source/SPContentFilterManager.m | 4 ++-- Source/SPDatabaseDocument.m | 2 +- Source/SPEditorPreferencePane.m | 4 ++-- Source/SPExportFileUtilities.m | 2 +- Source/SPQueryController.m | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Source') diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m index 7b24d6e1..57ff7dac 100644 --- a/Source/SPContentFilterManager.m +++ b/Source/SPContentFilterManager.m @@ -233,10 +233,10 @@ // Duplicate a selected filter if sender == self if(sender == self) - filter = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[[contentFilterNameTextField stringValue] stringByAppendingFormat:@" Copy"], [contentFilterTextView string], nil] forKeys:[NSArray arrayWithObjects:@"MenuLabel", @"Clause", nil]]; + filter = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[NSString stringWithFormat:NSLocalizedString(@"%@ Copy",@"Content Filter Manager : Initial name of copied filter"),[contentFilterNameTextField stringValue]], [contentFilterTextView string], nil] forKeys:[NSArray arrayWithObjects:@"MenuLabel", @"Clause", nil]]; // Add a new filter else - filter = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:@"New Filter", @"", @"", nil] forKeys:[NSArray arrayWithObjects:@"MenuLabel", @"Clause", @"ConjunctionLabel", nil]]; + filter = [NSMutableDictionary dictionaryWithObjects:[NSArray arrayWithObjects:NSLocalizedString(@"New Filter",@"Content Filter Manager : Initial name for new filter"), @"", @"", nil] forKeys:[NSArray arrayWithObjects:@"MenuLabel", @"Clause", @"ConjunctionLabel", nil]]; if([contentFilterTableView numberOfSelectedRows] > 0) { insertIndex = [[contentFilterTableView selectedRowIndexes] lastIndex]+1; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index c8f926e1..d93d5a14 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -2718,7 +2718,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax"; if([[NSApp delegate] sessionURL]) filename = [[[[NSApp delegate] sessionURL] absoluteString] lastPathComponent]; else - filename = [NSString stringWithFormat:@"%@", @"session"]; + filename = [NSString stringWithFormat:NSLocalizedString(@"Session",@"Initial filename for 'Save session' file")]; contextInfo = @"saveSession"; } diff --git a/Source/SPEditorPreferencePane.m b/Source/SPEditorPreferencePane.m index 51ffacf6..08e91936 100644 --- a/Source/SPEditorPreferencePane.m +++ b/Source/SPEditorPreferencePane.m @@ -37,7 +37,7 @@ static NSString *SPDefaultColorSchemeName = @"Default"; static NSString *SPDefaultColorSchemeNameLC = @"default"; static NSString *SPCustomColorSchemeName = @"User-defined"; static NSString *SPCustomColorSchemeNameLC = @"user-defined"; -static NSString *SPDefaultExportColourSchemeName = @"MyTheme"; +#define SP_EXPORT_COLOR_SCHEME_NAME_STRING NSLocalizedString(@"MyTheme",@"Preferences : Themes : Initial filename for 'Export'") @interface SPEditorPreferencePane (PrivateAPI) @@ -136,7 +136,7 @@ static NSString *SPDefaultExportColourSchemeName = @"MyTheme"; [panel setCanCreateDirectories:YES]; [panel beginSheetForDirectory:nil - file:[SPDefaultExportColourSchemeName stringByAppendingPathExtension:SPColorThemeFileExtension] + file:[SP_EXPORT_COLOR_SCHEME_NAME_STRING stringByAppendingPathExtension:SPColorThemeFileExtension] modalForWindow:[[self view] window] modalDelegate:self didEndSelector:@selector(panelDidEnd:returnCode:contextInfo:) diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m index 2a490307..b23d0b78 100644 --- a/Source/SPExportFileUtilities.m +++ b/Source/SPExportFileUtilities.m @@ -158,7 +158,7 @@ typedef enum if (filesAlreadyExisting) { // Set up a string for use if files had to be skipped. - NSString *additionalErrors = filesFailed ? NSLocalizedString(@"\n\n(In addition, one or more errors occurred while attempting to create the export files: %lu could not be created. These will be ignored.", @"Additional export file errors") : @""; + NSString *additionalErrors = filesFailed ? NSLocalizedString(@"\n\n(In addition, one or more errors occurred while attempting to create the export files: %lu could not be created. These files will be ignored.)", @"Additional export file errors") : @""; if (filesAlreadyExisting == 1) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"“%@” already exists. Do you want to replace it?", @"Export file already exists message"), [[[files objectAtIndex:0] exportFilePath] lastPathComponent]]]; diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index 475b96bc..3a003f82 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -295,7 +295,7 @@ static SPQueryController *sharedQueryController = nil; [panel setAccessoryView:saveLogView]; - [panel beginSheetForDirectory:nil file:@"untitled" modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; + [panel beginSheetForDirectory:nil file:NSLocalizedString(@"ConsoleLog",@"Console : Save as : Initial filename") modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; } /** -- cgit v1.2.3