From 3c4fabc58bebf15fd7acc1724599b8749e43213c Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Sun, 1 Sep 2013 04:18:25 +0000 Subject: Remove the Spanish localization because there isn't a spanish .po file. Translate some localizable.strings files to French, as well as some of the app's preference xib and InfoPlist.strings. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87048 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFCdrom/es.lproj/Credits.rtf | 13 - .../DFCdrom/es.lproj/DFCdromPluginConfig.xib | 1418 -------------------- macosx/plugins/DFCdrom/es.lproj/InfoPlist.strings | 6 - .../plugins/DFCdrom/es.lproj/Localizable.strings | 9 - .../plugins/DFCdrom/fr.lproj/Localizable.strings | 9 + .../DFCdrom/macsrc/PluginConfigController.h | 2 + .../DFCdrom/macsrc/PluginConfigController.m | 26 +- 7 files changed, 30 insertions(+), 1453 deletions(-) delete mode 100644 macosx/plugins/DFCdrom/es.lproj/Credits.rtf delete mode 100644 macosx/plugins/DFCdrom/es.lproj/DFCdromPluginConfig.xib delete mode 100644 macosx/plugins/DFCdrom/es.lproj/InfoPlist.strings delete mode 100644 macosx/plugins/DFCdrom/es.lproj/Localizable.strings create mode 100644 macosx/plugins/DFCdrom/fr.lproj/Localizable.strings (limited to 'macosx/plugins/DFCdrom') diff --git a/macosx/plugins/DFCdrom/es.lproj/Credits.rtf b/macosx/plugins/DFCdrom/es.lproj/Credits.rtf deleted file mode 100644 index 76fa6442..00000000 --- a/macosx/plugins/DFCdrom/es.lproj/Credits.rtf +++ /dev/null @@ -1,13 +0,0 @@ -{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf420 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Original coder: -\f1\b0 \ - linuzappz\ -\ - -\f0\b Macintosh Port: -\f1\b0 \ - Wei Mingzhi} \ No newline at end of file diff --git a/macosx/plugins/DFCdrom/es.lproj/DFCdromPluginConfig.xib b/macosx/plugins/DFCdrom/es.lproj/DFCdromPluginConfig.xib deleted file mode 100644 index ca6a67f7..00000000 --- a/macosx/plugins/DFCdrom/es.lproj/DFCdromPluginConfig.xib +++ /dev/null @@ -1,1418 +0,0 @@ - - - - 1070 - 12E55 - 3084 - 1187.39 - 626.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 3084 - - - IBNSLayoutConstraint - NSBox - NSButton - NSButtonCell - NSCustomObject - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSSlider - NSSliderCell - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - DFCdromPluginConfigController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{131, 362}, {377, 238}} - 1886912512 - CDR Configuration - NSWindow - - View - - - {377, 238} - - - 256 - - - - 256 - - - - 274 - - - - 256 - {{15, 21}, {151, 18}} - - - - YES - - 67108864 - 0 - Use Cached Reading - - LucidaGrande - 13 - 1044 - - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 256 - {{128, 40}, {197, 26}} - - - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Default - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - - - - 1 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - 2 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - - - - - 4 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 4 - - - - - 8 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 8 - - - - - 16 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 16 - - - - - 32 X - - 1048576 - 2147483647 - - - _popUpItemAction: - 32 - - - - - -1 - 3 - YES - YES - 1 - - NO - - - - 268 - {{14, 46}, {106, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - CD-ROM Speed: - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - {{2, 2}, {339, 73}} - - - - - - {{17, 128}, {343, 90}} - - - - {0, 0} - - 67108864 - 0 - General Settings - - LucidaGrande - 11 - 3100 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{14, 21}, {114, 17}} - - - - {250, 750} - YES - - 67108864 - 272629760 - Q2FjaGUgU2l6ZToKA - - - - - - NO - - - - 256 - {{129, 15}, {195, 25}} - - - - YES - - 67108864 - 0 - - - - - Helvetica - 12 - 16 - - - 512 - 32 - 64 - 0.0 - 16 - 0 - YES - NO - - NO - - - {{2, 2}, {339, 51}} - - - - - - {{17, 56}, {343, 68}} - - - - {0, 0} - - 67108864 - 0 - Misc - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 268 - {{304, 13}, {59, 32}} - - - - _NS:9 - YES - - 67108864 - 134217728 - OK - - _NS:9 - - -2038284288 - 129 - - DQ - 200 - 25 - - NO - - - - 268 - {{222, 13}, {82, 32}} - - - - _NS:9 - YES - - 67108864 - 134217728 - Cancel - - _NS:9 - - -2038284288 - 129 - - Gw - 200 - 25 - - NO - - - {377, 238} - - - - - {{0, 0}, {1920, 1058}} - {377, 260} - {10000000000000, 10000000000000} - YES - - - - - - - window - - - - 141 - - - - Cached - - - - 183 - - - - CdSpeed - - - - 182 - - - - CacheSize - - - - 184 - - - - ok: - - - - 246 - - - - cancel: - - - - 254 - - - - delegate - - - - 158 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - - - - Window - - - 6 - - - - - 5 - 0 - - 6 - 1 - - 12 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 4 - 0 - - 4 - 1 - - 60 - - 1000 - - 3 - 9 - 3 - - - - 3 - 0 - - 3 - 1 - - 114 - - 1000 - - 3 - 9 - 3 - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 8 - 29 - 3 - - - - - - - - - - 162 - - - - - 11 - 0 - - 11 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 6 - 0 - - 6 - 1 - - 16 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 24 - - 1000 - - 3 - 9 - 3 - - - - 4 - 0 - - 4 - 1 - - 21 - - 1000 - - 3 - 9 - 3 - - - - 5 - 0 - - 5 - 1 - - 16 - - 1000 - - 8 - 29 - 3 - - - - 5 - 0 - - 5 - 1 - - 16 - - 1000 - - 8 - 29 - 3 - - - - - - - - - 164 - - - - - 6 - 0 - - 6 - 1 - - 16 - - 1000 - - 8 - 29 - 3 - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - - - - 3 - 0 - - 3 - 1 - - 28 - - 1000 - - 3 - 9 - 3 - - - - 5 - 0 - - 5 - 1 - - 16 - - 1000 - - 8 - 29 - 3 - - - - - - - - -3 - - - Application - - - 169 - - - - - - - - 189 - - - - - 173 - - - - - - 7 - 0 - - 0 - 1 - - 192 - - 1000 - - 3 - 9 - 1 - - - - - - 190 - - - - - - - - 174 - - - - - - - - - - - - - - 175 - - - - - 176 - - - - - 177 - - - - - 178 - - - - - 179 - - - - - 180 - - - - - 181 - - - - - 171 - - - - - - 8 - 0 - - 0 - 1 - - 17 - - 1000 - - 3 - 9 - 1 - - - - 7 - 0 - - 0 - 1 - - 108 - - 1000 - - 3 - 9 - 1 - - - - - - 191 - - - - - 172 - - - - - - 7 - 0 - - 0 - 1 - - 191 - - 1000 - - 3 - 9 - 1 - - - - - - 192 - - - - - 212 - - - - - 213 - - - - - 215 - - - - - 216 - - - - - 217 - - - - - 220 - - - - - 221 - - - - - 222 - - - - - 224 - - - - - 236 - - - - - 238 - - - - - 239 - - - - - 240 - - - - - 241 - - - - - 242 - - - - - - - - 243 - - - - - 245 - - - - - 247 - - - - - 249 - - - - - 250 - - - - - - - - 251 - - - - - 252 - - - - - 253 - - - - - 232 - - - - - 234 - - - - - 225 - - - - - 266 - - - - - - - - 267 - - - - - 270 - - - - - 271 - - - - - 272 - - - - - 273 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 273 - - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {11, 11} - {10, 3} - {15, 15} - - YES - - diff --git a/macosx/plugins/DFCdrom/es.lproj/InfoPlist.strings b/macosx/plugins/DFCdrom/es.lproj/InfoPlist.strings deleted file mode 100644 index 114b6964..00000000 --- a/macosx/plugins/DFCdrom/es.lproj/InfoPlist.strings +++ /dev/null @@ -1,6 +0,0 @@ -/* Localized versions of Info.plist keys */ - -CFBundleName = "CD-ROM Drive Reader"; -CFBundleShortVersionString = "1.0"; -CFBundleGetInfoString = "Based on CDR plugin by linuzappz."; -NSHumanReadableCopyright = "Copyright (c) 2010 Wei Mingzhi."; diff --git a/macosx/plugins/DFCdrom/es.lproj/Localizable.strings b/macosx/plugins/DFCdrom/es.lproj/Localizable.strings deleted file mode 100644 index 2faf6e07..00000000 --- a/macosx/plugins/DFCdrom/es.lproj/Localizable.strings +++ /dev/null @@ -1,9 +0,0 @@ -/* - Localizable.strings - DFCdrom - - Created by C.W. Betts on 11/16/11. - Copyright 2011 __MyCompanyName__. All rights reserved. - */ - -"CD-ROM Drive Reader" = "CD-ROM Drive Reader"; diff --git a/macosx/plugins/DFCdrom/fr.lproj/Localizable.strings b/macosx/plugins/DFCdrom/fr.lproj/Localizable.strings new file mode 100644 index 00000000..7d26db69 --- /dev/null +++ b/macosx/plugins/DFCdrom/fr.lproj/Localizable.strings @@ -0,0 +1,9 @@ +/* + Localizable.strings + DFCdrom + + Created by C.W. Betts on 11/16/11. + Copyright 2011 __MyCompanyName__. All rights reserved. + */ + +"CD-ROM Drive Reader" = "Lecteur CR-ROM"; diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h index b7f6fafb..6e5913c4 100755 --- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h +++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.h @@ -10,6 +10,8 @@ NSMutableDictionary *keyValues; } +@property (retain) NSMutableDictionary *keyValues; + - (IBAction)cancel:(id)sender; - (IBAction)ok:(id)sender; diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m index 855d6df0..e33f182d 100755 --- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m @@ -106,13 +106,15 @@ void ReadConfig() ReadMode = ([[keyValues objectForKey:@"Threaded"] boolValue] ? THREADED : NORMAL); CacheSize = [[keyValues objectForKey:@"Cache Size"] intValue]; - CdrSpeed = [[keyValues objectForKey:@"Speed"] intValue]; + CdrSpeed = [[keyValues objectForKey:@"Speed"] integerValue]; } @implementation PluginConfigController +@synthesize keyValues; - (IBAction)cancel:(id)sender { + self.keyValues = nil; [self close]; } @@ -120,10 +122,10 @@ void ReadConfig() { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; + NSMutableDictionary *writeDic = [keyValues mutableCopy]; [writeDic setObject:([Cached intValue] ? @YES : @NO) forKey:@"Threaded"]; - [writeDic setObject:@([CacheSize intValue]) forKey:@"Cache Size"]; + [writeDic setObject:@([CacheSize integerValue]) forKey:@"Cache Size"]; switch ([CdSpeed indexOfSelectedItem]) { case 1: [writeDic setObject:@1 forKey:@"Speed"]; break; @@ -141,7 +143,9 @@ void ReadConfig() // and set global values accordingly ReadConfig(); - + + RELEASEOBJ(writeDic); + self.keyValues = nil; [self close]; } @@ -152,11 +156,10 @@ void ReadConfig() ReadConfig(); // load from preferences - RELEASEOBJ(keyValues); - keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; + self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]]; [Cached setIntValue:[[keyValues objectForKey:@"Threaded"] intValue]]; - [CacheSize setIntValue:[[keyValues objectForKey:@"Cache Size"] intValue]]; + [CacheSize setIntegerValue:[[keyValues objectForKey:@"Cache Size"] integerValue]]; switch ([[keyValues objectForKey:@"Speed"] intValue]) { case 1: [CdSpeed selectItemAtIndex:1]; break; @@ -169,6 +172,15 @@ void ReadConfig() } } +#if !__has_feature(objc_arc) +- (void)dealloc +{ + self.keyValues = nil; + + [super dealloc]; +} +#endif + - (void)awakeFromNib { } -- cgit v1.2.3