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 --- Interfaces/English.lproj/ExportDialog.xib | 26 +++++----- Interfaces/English.lproj/Preferences.xib | 68 +++++++-------------------- Resources/English.lproj/ExportDialog.strings | Bin 24584 -> 24626 bytes Resources/English.lproj/Localizable.strings | Bin 220174 -> 221176 bytes Resources/English.lproj/Preferences.strings | Bin 63040 -> 62744 bytes Source/SPContentFilterManager.m | 4 +- Source/SPDatabaseDocument.m | 2 +- Source/SPEditorPreferencePane.m | 4 +- Source/SPExportFileUtilities.m | 2 +- Source/SPQueryController.m | 2 +- 10 files changed, 36 insertions(+), 72 deletions(-) diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index f41aedf6..dc47424b 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -2,10 +2,10 @@ 1050 - 10J869 + 10J567 851 1038.35 - 461.00 + 462.00 YES @@ -26,8 +26,8 @@ YES - com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit PluginDependencyRecalculationVersion @@ -49,10 +49,10 @@ 2 {{610, 291}, {517, 480}} 611845120 - Export + Export Window NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {517, 480} @@ -81,7 +81,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -449,7 +449,7 @@ {{0, 0}, {1680, 1028}} {517, 502} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPExportWindow @@ -462,7 +462,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -586,7 +586,7 @@ {{0, 0}, {1680, 1028}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -598,7 +598,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -785,7 +785,7 @@ {{0, 0}, {1680, 1028}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -5363,11 +5363,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{206, 286}, {517, 480}} + {{329, 286}, {517, 480}} com.apple.InterfaceBuilder.CocoaPlugin - {{206, 286}, {517, 480}} + {{329, 286}, {517, 480}} {517, 480} diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index cfcf027d..1d8f12af 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -2,10 +2,10 @@ 1050 - 10J869 + 10J567 851 1038.35 - 461.00 + 462.00 YES @@ -23,6 +23,7 @@ YES + YES @@ -1934,7 +1935,7 @@ NSView - + 274 YES @@ -1958,7 +1959,6 @@ 292 {{-1, -1}, {32, 25}} - YES 67239424 @@ -1983,7 +1983,6 @@ 292 {{30, -1}, {32, 24}} - YES 71433792 @@ -2129,7 +2128,6 @@ {229, 23} - YES YES NO @@ -2150,7 +2148,6 @@ 4370 {231, 358} - YES @@ -2215,7 +2212,6 @@ {{1, 1}, {230, 358}} - @@ -2226,7 +2222,6 @@ -2147483392 {{183, 1}, {11, 317}} - 256 _doScroller: @@ -2238,7 +2233,6 @@ -2147483392 {{-100, -100}, {311, 15}} - YES 1 @@ -2248,7 +2242,6 @@ {{-2, 22}, {232, 360}} - 658 @@ -2259,7 +2252,6 @@ {229, 381} - NSView @@ -2272,7 +2264,6 @@ 266 {{-7, 34}, {370, 282}} - YES @@ -3025,7 +3016,6 @@ 266 {{119, 33}, {159, 19}} - YES -2073952703 @@ -3046,7 +3036,6 @@ 268 {{5, 35}, {109, 14}} - YES 68288064 @@ -3063,7 +3052,6 @@ 265 {{277, 32}, {25, 21}} - YES 67239424 @@ -3085,7 +3073,6 @@ 266 {{119, 59}, {183, 19}} - YES -1804468671 @@ -3103,7 +3090,6 @@ 266 {{119, 33}, {159, 19}} - YES -1804468671 @@ -3121,7 +3107,6 @@ 266 {{119, 85}, {183, 19}} - YES -1804468671 @@ -3139,7 +3124,6 @@ 266 {{119, 7}, {183, 19}} - YES -1804468671 @@ -3158,7 +3142,6 @@ 268 {{5, 61}, {109, 14}} - YES 68288064 @@ -3175,7 +3158,6 @@ 268 {{5, 35}, {109, 14}} - YES 68288064 @@ -3192,7 +3174,6 @@ 268 {{5, 87}, {109, 14}} - YES 68288064 @@ -3209,7 +3190,6 @@ 268 {{5, 9}, {109, 14}} - YES 68288064 @@ -3226,7 +3206,6 @@ 266 {{119, 153}, {183, 19}} - YES -1804468671 @@ -3245,7 +3224,6 @@ 266 {{119, 180}, {183, 19}} - YES 343014976 @@ -3267,7 +3245,6 @@ 266 {{119, 207}, {183, 19}} - YES -1804468671 @@ -3285,7 +3262,6 @@ 266 {{119, 126}, {183, 19}} - YES -1804468671 @@ -3304,7 +3280,6 @@ 266 {{119, 234}, {183, 19}} - YES -1804468671 @@ -3322,7 +3297,6 @@ 268 {{5, 236}, {109, 14}} - YES 68288064 @@ -3339,7 +3313,6 @@ 268 {{5, 209}, {109, 14}} - YES 68288064 @@ -3356,7 +3329,6 @@ 268 {{5, 155}, {109, 14}} - YES 68288064 @@ -3373,7 +3345,6 @@ 268 {{5, 182}, {109, 14}} - YES 68288064 @@ -3390,7 +3361,6 @@ 268 {{5, 128}, {109, 14}} - YES 68288064 @@ -3405,7 +3375,6 @@ {{10, 7}, {335, 262}} - SSH @@ -3426,7 +3395,6 @@ 266 {{112, 342}, {218, 19}} - YES -1804468671 @@ -3444,7 +3412,6 @@ 268 {{9, 344}, {98, 14}} - YES 68288064 @@ -3461,7 +3428,6 @@ 266 {{109, 313}, {224, 22}} - YES -2076049856 @@ -3528,7 +3494,6 @@ 268 {{9, 318}, {98, 14}} - YES 68288064 @@ -3543,20 +3508,16 @@ {{230, 0}, {350, 381}} - NSView {580, 381} - YES 2 {580, 381} - - NSView @@ -3745,7 +3706,7 @@ NSView - + 268 YES @@ -3887,18 +3848,18 @@ AQAAAAA YES YES - dateFormat_10_0 + dateStyle formatterBehavior - lenient + timeStyle YES - %a, %B %e, %Y %H:%M:%S - - + + + - %a, %B %e, %Y %H:%M:%S + EEEE, d. MMMM yyyy HH:mm:ss NO @@ -4015,6 +3976,7 @@ AQAAAAA {580, 180} + NSView @@ -12804,6 +12766,7 @@ AQAAAAA 100.IBPluginDependency 100.ImportedFromIB2 101.IBPluginDependency + 102.IBDateFormatterBehaviorMetadataKey 102.IBPluginDependency 102.ImportedFromIB2 1034.IBPluginDependency @@ -13454,6 +13417,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -14189,7 +14153,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{243, 481}, {580, 180}} + {{329, 481}, {580, 180}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -16171,7 +16135,7 @@ AQAAAAA YES {16, 8} - {10, 10} + {15, 15} {32, 32} {9, 8} {7, 2} diff --git a/Resources/English.lproj/ExportDialog.strings b/Resources/English.lproj/ExportDialog.strings index 827d965c..15ad4cda 100644 Binary files a/Resources/English.lproj/ExportDialog.strings and b/Resources/English.lproj/ExportDialog.strings differ diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings index cf6e63cc..4f6f9aa8 100644 Binary files a/Resources/English.lproj/Localizable.strings and b/Resources/English.lproj/Localizable.strings differ diff --git a/Resources/English.lproj/Preferences.strings b/Resources/English.lproj/Preferences.strings index 1dc95010..9798b78d 100644 Binary files a/Resources/English.lproj/Preferences.strings and b/Resources/English.lproj/Preferences.strings differ 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