More work on OS X localization.

Some OS X bug fixes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87971 e17a0e51-4ae3-4d35-97c3-1a29b211df97

29 files changed, 561 insertions, 52 deletions

diff --git a/macosx/Base.lproj/CheatWindow.xib b/macosx/Base.lproj/CheatWindow.xib
index 761d85c7..a0efb8cc 100644
--- a/macosx/Base.lproj/CheatWindow.xib
+++ b/macosx/Base.lproj/CheatWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CheatController">
@@ -27,7 +27,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4">
-                        <rect key="frame" x="145" y="10" width="129" height="32"/>
+                        <rect key="frame" x="144" y="10" width="128" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Save Cheats…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -38,7 +38,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6">
-                        <rect key="frame" x="14" y="10" width="131" height="32"/>
+                        <rect key="frame" x="14" y="10" width="130" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="push" title="Load Cheats…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -115,11 +115,11 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="25">
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="25">
                             <rect key="frame" x="1" y="249" width="607" height="15"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" id="24">
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="24">
                             <rect key="frame" x="224" y="17" width="15" height="102"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
@@ -274,11 +274,11 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="138">
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="138">
                             <rect key="frame" x="1" y="120" width="143" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
-                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" id="140">
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="140">
                             <rect key="frame" x="224" y="17" width="15" height="102"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
diff --git a/macosx/Base.lproj/PcsxrMemCardDocument.xib b/macosx/Base.lproj/PcsxrMemCard.xib
index ceefbfc7..ceefbfc7 100644
--- a/macosx/Base.lproj/PcsxrMemCardDocument.xib
+++ b/macosx/Base.lproj/PcsxrMemCard.xib
diff --git a/macosx/English.lproj/Base.lproj/AddPluginSheet.xib b/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
index 13a6f747..2d8cc223 100644
--- a/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
+++ b/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
@@ -70,6 +70,9 @@
 DQ
 </string>
                         </buttonCell>
+                        <connections>
+                            <action selector="closeAddPluginSheet:" target="-2" id="wuB-p5-1L1"/>
+                        </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116">
                         <rect key="frame" x="286" y="13" width="58" height="32"/>
@@ -81,6 +84,9 @@ DQ
 Gw
 </string>
                         </buttonCell>
+                        <connections>
+                            <action selector="closeAddPluginSheet:" target="-2" id="3PF-nt-DV0"/>
+                        </connections>
                     </button>
                 </subviews>
                 <constraints>
diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index f7fc9722..eb47e165 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
@@ -1,6 +1,7 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "PCSXR";
+CFBundleDisplayName = "PCSX Reloaded";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/en.lproj/Configuration.strings b/macosx/English.lproj/en.lproj/Configuration.strings
index 1b11f90b..5cbba65e 100644
--- a/macosx/English.lproj/en.lproj/Configuration.strings
+++ b/macosx/English.lproj/en.lproj/Configuration.strings
@@ -174,10 +174,10 @@
 "770.title" = "Fast Forward";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "772"; */
-"772.placeholderString" = "None...";
+"772.placeholderString" = "None…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "852"; */
-"852.placeholderString" = "None...";
+"852.placeholderString" = "None…";
 
 /* Class = "NSButtonCell"; title = "Save State"; ObjectID = "853"; */
 "853.title" = "Save State";
@@ -192,13 +192,13 @@
 "868.title" = "Previous State";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "871"; */
-"871.placeholderString" = "None...";
+"871.placeholderString" = "None…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "873"; */
-"873.placeholderString" = "None...";
+"873.placeholderString" = "None…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "875"; */
-"875.placeholderString" = "None...";
+"875.placeholderString" = "None…";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "884"; */
 "884.title" = "Box";
@@ -225,7 +225,7 @@
 "893.title" = "Alt / Option ⌥";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "898"; */
-"898.placeholderString" = "None...";
+"898.placeholderString" = "None…";
 
 /* Class = "NSButtonCell"; title = "Frame Limit"; ObjectID = "899"; */
 "899.title" = "Frame Limit";
diff --git a/macosx/English.lproj/fr.lproj/AddPluginSheet.strings b/macosx/English.lproj/fr.lproj/AddPluginSheet.strings
new file mode 100644
index 00000000..2fd39f1d
--- /dev/null
+++ b/macosx/English.lproj/fr.lproj/AddPluginSheet.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSPanel"; title = "Install Plug-in"; ObjectID = "10"; */
+"10.title" = "Install Greffon";
+
+/* Class = "NSTextFieldCell"; title = "Plugin Installation"; ObjectID = "58"; */
+"58.title" = "Plugin Installation";
+
+/* Class = "NSTextFieldCell"; title = "Do you want to install this plugin into PCSXR?"; ObjectID = "59"; */
+"59.title" = "Do you want to install this plugin into PCSXR?";
+
+/* Class = "NSButtonCell"; title = "Yes"; ObjectID = "113"; */
+"113.title" = "Oui";
+
+/* Class = "NSButtonCell"; title = "No"; ObjectID = "117"; */
+"117.title" = "Non";
diff --git a/macosx/English.lproj/fr.lproj/Configuration.strings b/macosx/English.lproj/fr.lproj/Configuration.strings
index 1e024755..ce232637 100644
--- a/macosx/English.lproj/fr.lproj/Configuration.strings
+++ b/macosx/English.lproj/fr.lproj/Configuration.strings
@@ -48,7 +48,7 @@
 "502.title" = "Options";
 
 /* Class = "NSBox"; title = "Game Fixes"; ObjectID = "509"; */
-"509.title" = "Game Fixes";
+"509.title" = "les correctifs de jeu";
 
 /* Class = "NSButtonCell"; ibShadowedToolTip = "When enabled the emulation will be faster, but possibly more unstable"; ObjectID = "516"; */
 "516.ibShadowedToolTip" = "When enabled the emulation will be faster, but possibly more unstable";
@@ -174,16 +174,16 @@
 "770.title" = "Fast Forward";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "772"; */
-"772.placeholderString" = "None...";
+"772.placeholderString" = "Non…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "852"; */
-"852.placeholderString" = "None...";
+"852.placeholderString" = "Non…";
 
 /* Class = "NSButtonCell"; title = "Save State"; ObjectID = "853"; */
-"853.title" = "Save State";
+"853.title" = "Sauver un état";
 
 /* Class = "NSButtonCell"; title = "Load State"; ObjectID = "856"; */
-"856.title" = "Load State";
+"856.title" = "Charger un état";
 
 /* Class = "NSButtonCell"; title = "Next State"; ObjectID = "862"; */
 "862.title" = "Next State";
@@ -192,13 +192,13 @@
 "868.title" = "Previous State";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "871"; */
-"871.placeholderString" = "None...";
+"871.placeholderString" = "Non…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "873"; */
-"873.placeholderString" = "None...";
+"873.placeholderString" = "Non…";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "875"; */
-"875.placeholderString" = "None...";
+"875.placeholderString" = "Non…";
 
 /* Class = "NSBox"; title = "Box"; ObjectID = "884"; */
 "884.title" = "Box";
@@ -225,7 +225,7 @@
 "893.title" = "Alt / Option ⌥";
 
 /* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "898"; */
-"898.placeholderString" = "None...";
+"898.placeholderString" = "None…";
 
 /* Class = "NSButtonCell"; title = "Frame Limit"; ObjectID = "899"; */
 "899.title" = "Frame Limit";
diff --git a/macosx/English.lproj/fr.lproj/InfoPlist.strings b/macosx/English.lproj/fr.lproj/InfoPlist.strings
index 65a5b459..76788c07 100644
--- a/macosx/English.lproj/fr.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/fr.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/hu.lproj/AddPluginSheet.strings b/macosx/English.lproj/hu.lproj/AddPluginSheet.strings
new file mode 100644
index 00000000..e303a5ef
--- /dev/null
+++ b/macosx/English.lproj/hu.lproj/AddPluginSheet.strings
@@ -0,0 +1,15 @@
+
+/* Class = "NSPanel"; title = "Install Plug-in"; ObjectID = "10"; */
+"10.title" = "Install Plug-in";
+
+/* Class = "NSTextFieldCell"; title = "Plugin Installation"; ObjectID = "58"; */
+"58.title" = "Plugin Installation";
+
+/* Class = "NSTextFieldCell"; title = "Do you want to install this plugin into PCSXR?"; ObjectID = "59"; */
+"59.title" = "Do you want to install this plugin into PCSXR?";
+
+/* Class = "NSButtonCell"; title = "Yes"; ObjectID = "113"; */
+"113.title" = "Yes";
+
+/* Class = "NSButtonCell"; title = "No"; ObjectID = "117"; */
+"117.title" = "No";
diff --git a/macosx/English.lproj/hu.lproj/Configuration.strings b/macosx/English.lproj/hu.lproj/Configuration.strings
new file mode 100644
index 00000000..1b11f90b
--- /dev/null
+++ b/macosx/English.lproj/hu.lproj/Configuration.strings
@@ -0,0 +1,303 @@
+
+/* Class = "NSWindow"; title = "PCSXR Preferences"; ObjectID = "21"; */
+"21.title" = "PCSXR Preferences";
+
+/* Class = "NSTabViewItem"; label = "Emulation"; ObjectID = "240"; */
+"240.label" = "Emulation";
+
+/* Class = "NSTabViewItem"; label = "Plugins"; ObjectID = "241"; */
+"241.label" = "Plugins";
+
+/* Class = "NSBox"; title = "Graphics"; ObjectID = "257"; */
+"257.title" = "Graphics";
+
+/* Class = "NSBox"; title = "Sound"; ObjectID = "291"; */
+"291.title" = "Sound";
+
+/* Class = "NSBox"; title = "Controller"; ObjectID = "299"; */
+"299.title" = "Controller";
+
+/* Class = "NSBox"; title = "CD-ROM"; ObjectID = "302"; */
+"302.title" = "CD-ROM";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "369"; */
+"369.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Graphics Plugin"; ObjectID = "370"; */
+"370.title" = "Graphics Plugin";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "372"; */
+"372.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Sound Plugin"; ObjectID = "373"; */
+"373.title" = "Sound Plugin";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "375"; */
+"375.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Controller Plugin"; ObjectID = "376"; */
+"376.title" = "Controller Plugin";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "378"; */
+"378.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "CDROM Plugin"; ObjectID = "379"; */
+"379.title" = "CDROM Plugin";
+
+/* Class = "NSBox"; title = "Options"; ObjectID = "502"; */
+"502.title" = "Options";
+
+/* Class = "NSBox"; title = "Game Fixes"; ObjectID = "509"; */
+"509.title" = "Game Fixes";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "When enabled the emulation will be faster, but possibly more unstable"; ObjectID = "516"; */
+"516.ibShadowedToolTip" = "When enabled the emulation will be faster, but possibly more unstable";
+
+/* Class = "NSButtonCell"; title = "Dynarec CPU core"; ObjectID = "516"; */
+"516.title" = "Dynarec CPU core";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "Disables decoding of CD audio tracks"; ObjectID = "517"; */
+"517.ibShadowedToolTip" = "Disables decoding of CD audio tracks";
+
+/* Class = "NSButtonCell"; title = "No CD audio"; ObjectID = "517"; */
+"517.title" = "No CD audio";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "Enables the emulator to run without using an actual Playstation BIOS file. The compatibility might also decrease"; ObjectID = "518"; */
+"518.ibShadowedToolTip" = "Enables the emulator to run without using an actual Playstation BIOS file. The compatibility might also decrease";
+
+/* Class = "NSButtonCell"; title = "Simulate PSX BIOS"; ObjectID = "518"; */
+"518.title" = "Simulate PSX BIOS";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "Disables decoding of streamed XA audio"; ObjectID = "519"; */
+"519.ibShadowedToolTip" = "Disables decoding of streamed XA audio";
+
+/* Class = "NSButtonCell"; title = "No XA audio"; ObjectID = "519"; */
+"519.title" = "No XA audio";
+
+/* Class = "NSButtonCell"; title = "InuYasha Sengoku Battle"; ObjectID = "539"; */
+"539.title" = "InuYasha Sengoku Battle";
+
+/* Class = "NSButtonCell"; title = "Parasite Eve 2, Vandal Hearts 1/2"; ObjectID = "540"; */
+"540.title" = "Parasite Eve 2, Vandal Hearts 1/2";
+
+/* Class = "NSBox"; title = "Hacks"; ObjectID = "542"; */
+"542.title" = "Hacks";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "This should generally be disabled, though it might help to enable it if you are having sound problems"; ObjectID = "543"; */
+"543.ibShadowedToolTip" = "This should generally be disabled, though it might help to enable it if you are having sound problems";
+
+/* Class = "NSButtonCell"; title = "SPU IRQ always enabled"; ObjectID = "543"; */
+"543.title" = "SPU IRQ always enabled";
+
+/* Class = "NSButtonCell"; ibShadowedToolTip = "This should generally be disabled, though it might help to enable it if you are having controller problems"; ObjectID = "545"; */
+"545.ibShadowedToolTip" = "This should generally be disabled, though it might help to enable it if you are having controller problems";
+
+/* Class = "NSButtonCell"; title = "SIO IRQ always enabled"; ObjectID = "545"; */
+"545.title" = "SIO IRQ always enabled";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "561"; */
+"561.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "System Region"; ObjectID = "562"; */
+"562.title" = "System Region";
+
+/* Class = "NSMenuItem"; title = "Autodetect"; ObjectID = "563"; */
+"563.title" = "Autodetect";
+
+/* Class = "NSMenuItem"; title = "NTSC (USA/Japan)"; ObjectID = "564"; */
+"564.title" = "NTSC (USA/Japan)";
+
+/* Class = "NSMenuItem"; title = "PAL (Europe)"; ObjectID = "566"; */
+"566.title" = "PAL (Europe)";
+
+/* Class = "NSTabViewItem"; label = "Memory Cards"; ObjectID = "579"; */
+"579.label" = "Memory Cards";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "599"; */
+"599.title" = "About…";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "600"; */
+"600.title" = "Configure…";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "602"; */
+"602.title" = "About…";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "603"; */
+"603.title" = "Configure…";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "605"; */
+"605.title" = "Configure…";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "606"; */
+"606.title" = "About…";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "608"; */
+"608.title" = "About…";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "609"; */
+"609.title" = "Configure…";
+
+/* Class = "NSButtonCell"; title = "Switch"; ObjectID = "617"; */
+"617.title" = "Switch";
+
+/* Class = "NSButtonCell"; title = "Switch"; ObjectID = "618"; */
+"618.title" = "Switch";
+
+/* Class = "NSButtonCell"; title = "Switch"; ObjectID = "619"; */
+"619.title" = "Switch";
+
+/* Class = "NSBox"; title = "Network"; ObjectID = "622"; */
+"622.title" = "Network";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "626"; */
+"626.title" = "Configure…";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "627"; */
+"627.title" = "About…";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "629"; */
+"629.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Net Plugin"; ObjectID = "630"; */
+"630.title" = "Net Plugin";
+
+/* Class = "NSButtonCell"; title = "Enable NetPlay"; ObjectID = "640"; */
+"640.title" = "Enable NetPlay";
+
+/* Class = "NSButtonCell"; title = "Widescreen"; ObjectID = "652"; */
+"652.title" = "Widescreen";
+
+/* Class = "NSTabViewItem"; label = "Hotkeys"; ObjectID = "655"; */
+"655.label" = "Hotkeys";
+
+/* Class = "NSButtonCell"; title = "Fast Forward"; ObjectID = "770"; */
+"770.title" = "Fast Forward";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "772"; */
+"772.placeholderString" = "None...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "852"; */
+"852.placeholderString" = "None...";
+
+/* Class = "NSButtonCell"; title = "Save State"; ObjectID = "853"; */
+"853.title" = "Save State";
+
+/* Class = "NSButtonCell"; title = "Load State"; ObjectID = "856"; */
+"856.title" = "Load State";
+
+/* Class = "NSButtonCell"; title = "Next State"; ObjectID = "862"; */
+"862.title" = "Next State";
+
+/* Class = "NSButtonCell"; title = "Previous State"; ObjectID = "868"; */
+"868.title" = "Previous State";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "871"; */
+"871.placeholderString" = "None...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "873"; */
+"873.placeholderString" = "None...";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "875"; */
+"875.placeholderString" = "None...";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "884"; */
+"884.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "GPU Key Modifier"; ObjectID = "886"; */
+"886.title" = "GPU Key Modifier";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to."; ObjectID = "887"; */
+"887.ibShadowedToolTip" = "Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "889"; */
+"889.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Control ⌃"; ObjectID = "890"; */
+"890.title" = "Control ⌃";
+
+/* Class = "NSMenuItem"; title = "Shift ⇧"; ObjectID = "891"; */
+"891.title" = "Shift ⇧";
+
+/* Class = "NSMenuItem"; title = "Command ⌘"; ObjectID = "892"; */
+"892.title" = "Command ⌘";
+
+/* Class = "NSMenuItem"; title = "Alt / Option ⌥"; ObjectID = "893"; */
+"893.title" = "Alt / Option ⌥";
+
+/* Class = "NSTextFieldCell"; placeholderString = "None..."; ObjectID = "898"; */
+"898.placeholderString" = "None...";
+
+/* Class = "NSButtonCell"; title = "Frame Limit"; ObjectID = "899"; */
+"899.title" = "Frame Limit";
+
+/* Class = "NSBox"; title = "SIO1"; ObjectID = "902"; */
+"902.title" = "SIO1";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "907"; */
+"907.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Net Plugin"; ObjectID = "908"; */
+"908.title" = "Net Plugin";
+
+/* Class = "NSButtonCell"; title = "About…"; ObjectID = "909"; */
+"909.title" = "About…";
+
+/* Class = "NSButtonCell"; title = "Configure…"; ObjectID = "910"; */
+"910.title" = "Configure…";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "936"; */
+"936.title" = "Label";
+
+/* Class = "NSButtonCell"; title = "Change…"; ObjectID = "937"; */
+"937.title" = "Change…";
+
+/* Class = "NSButtonCell"; title = "New…"; ObjectID = "938"; */
+"938.title" = "New…";
+
+/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "939"; */
+"939.title" = "Label";
+
+/* Class = "NSButtonCell"; title = "Change…"; ObjectID = "940"; */
+"940.title" = "Change…";
+
+/* Class = "NSButtonCell"; title = "New…"; ObjectID = "941"; */
+"941.title" = "New…";
+
+/* Class = "NSButtonCell"; title = "Delete…"; ObjectID = "942"; */
+"942.title" = "Delete…";
+
+/* Class = "NSButtonCell"; title = "Delete…"; ObjectID = "943"; */
+"943.title" = "Delete…";
+
+/* Class = "NSButtonCell"; title = "Format…"; ObjectID = "944"; */
+"944.title" = "Format…";
+
+/* Class = "NSButtonCell"; title = "Format…"; ObjectID = "945"; */
+"945.title" = "Format…";
+
+/* Class = "NSButtonCell"; title = "->"; ObjectID = "952"; */
+"952.title" = "->";
+
+/* Class = "NSButtonCell"; title = "<-"; ObjectID = "954"; */
+"954.title" = "<-";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "965"; */
+"965.title" = "Box";
+
+/* Class = "NSTextFieldCell"; title = "English name"; ObjectID = "981"; */
+"981.title" = "English name";
+
+/* Class = "NSTextFieldCell"; title = "SJIS name"; ObjectID = "982"; */
+"982.title" = "SJIS name";
+
+/* Class = "NSTextFieldCell"; title = "DELETED"; ObjectID = "983"; */
+"983.title" = "DELETED";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "1048"; */
+"1048.title" = "0";
+
+/* Class = "NSButtonCell"; title = "Logging"; ObjectID = "1278"; */
+"1278.title" = "Logging";
+
+/* Class = "NSButtonCell"; title = "Fast boot"; ObjectID = "1279"; */
+"1279.title" = "Fast boot";
diff --git a/macosx/English.lproj/hu.lproj/InfoPlist.strings b/macosx/English.lproj/hu.lproj/InfoPlist.strings
index 591e8d4a..d3de1e56 100644
--- a/macosx/English.lproj/hu.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/hu.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/hu.lproj/Localizable.strings b/macosx/English.lproj/hu.lproj/Localizable.strings
index 91f29b02..cb2e62e3 100644
--- a/macosx/English.lproj/hu.lproj/Localizable.strings
+++ b/macosx/English.lproj/hu.lproj/Localizable.strings
@@ -8,7 +8,6 @@
 
 //Commented out strings are those that need to be translated
 
-
 //libpcsxrcore strings
 "Error Opening CDR Plugin" = "Error Opening CDR Plugin";
 "Error Opening SPU Plugin" = "Hiba a hang plugin megnyitáskor";
diff --git a/macosx/English.lproj/it.lproj/InfoPlist.strings b/macosx/English.lproj/it.lproj/InfoPlist.strings
index 05c1cdf0..4024f21e 100644
--- a/macosx/English.lproj/it.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/it.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings b/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
index 328129e7..4eb53210 100644
--- a/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/ru.lproj/InfoPlist.strings b/macosx/English.lproj/ru.lproj/InfoPlist.strings
index b26adcb8..7f8b09a3 100644
--- a/macosx/English.lproj/ru.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/ru.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings b/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
index c90cf15e..b7bcd052 100644
--- a/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings b/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
index 2a89426a..04cea9e0 100644
--- a/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
@@ -3,6 +3,7 @@
 //Commented out strings are those that need to be translated
 
 //CFBundleName = "PCSXR";
+//CFBundleDisplayName = "PCSX Reloaded";
 //CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
 //NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 4525f677..fa38fcf8 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -187,9 +187,10 @@
 		55BBA69614945628003B2CEC /* PcsxrPluginHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69514945628003B2CEC /* PcsxrPluginHandler.m */; };
 		55BBA69914953887003B2CEC /* PcsxrDiscHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */; };
 		55BBA69C1495839A003B2CEC /* PcsxrFreezeStateHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69B1495839A003B2CEC /* PcsxrFreezeStateHandler.m */; };
-		55C7A214148B2B3800C22ABC /* PcsxrMemCardDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */; };
+		55C7A214148B2B3800C22ABC /* PcsxrMemCard.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C7A216148B2B3800C22ABC /* PcsxrMemCard.xib */; };
 		55CA586B17E799E6007424D5 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA586A17E799E6007424D5 /* DiskArbitration.framework */; };
 		55E0ACE0178B69620005C945 /* LaunchArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E0ACDF178B69600005C945 /* LaunchArg.m */; };
+		55E15994184564D4007983CB /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55E15993184564D4007983CB /* GLKit.framework */; };
 		55EC05FB1788B1230053AC23 /* PcsxrMemCardArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */; };
 		55EC05FE178916E80053AC23 /* MemBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FD178916E70053AC23 /* MemBadgeView.m */; };
 		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
@@ -616,7 +617,7 @@
 		5569B09A182F0B3A00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Configuration.xib; sourceTree = "<group>"; };
 		5569B09B182F0B3B00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PCSXR.xib; sourceTree = "<group>"; };
 		5569B09C182F0B3C00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AddPluginSheet.xib; sourceTree = "<group>"; };
-		5569B09D182F0B3D00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PcsxrMemCardDocument.xib; sourceTree = "<group>"; };
+		5569B09D182F0B3D00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PcsxrMemCard.xib; sourceTree = "<group>"; };
 		5569B09E182F0B3E00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/CheatWindow.xib; sourceTree = "<group>"; };
 		5569B09F182F0B3F00991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Bladesio1PluginConfig.xib; sourceTree = "<group>"; };
 		5569B0A0182F0B4000991C9C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DFCdromPluginConfig.xib; sourceTree = "<group>"; };
@@ -630,7 +631,7 @@
 		5569B0A9182F0B6500991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Configuration.strings; sourceTree = "<group>"; };
 		5569B0AB182F0B6B00991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PCSXR.strings; sourceTree = "<group>"; };
 		5569B0AD182F0B7200991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AddPluginSheet.strings; sourceTree = "<group>"; };
-		5569B0AF182F0B7900991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PcsxrMemCardDocument.strings; sourceTree = "<group>"; };
+		5569B0AF182F0B7900991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PcsxrMemCard.strings; sourceTree = "<group>"; };
 		5569B0B1182F0B8100991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/CheatWindow.strings; sourceTree = "<group>"; };
 		5569B0B3182F0B8B00991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Bladesio1PluginConfig.strings; sourceTree = "<group>"; };
 		5569B0B5182F0B9800991C9C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DFCdromPluginConfig.strings; sourceTree = "<group>"; };
@@ -693,6 +694,14 @@
 		55CA586A17E799E6007424D5 /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = System/Library/Frameworks/DiskArbitration.framework; sourceTree = SDKROOT; };
 		55E0ACDE178B695F0005C945 /* LaunchArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchArg.h; sourceTree = "<group>"; };
 		55E0ACDF178B69600005C945 /* LaunchArg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchArg.m; sourceTree = "<group>"; usesTabs = 1; };
+		55E1598618455B69007983CB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Configuration.strings; sourceTree = "<group>"; };
+		55E1598818455BB9007983CB /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AddPluginSheet.strings; sourceTree = "<group>"; };
+		55E1598A18455BBD007983CB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/AddPluginSheet.strings; sourceTree = "<group>"; };
+		55E1598C18455C60007983CB /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/CheatWindow.strings; sourceTree = "<group>"; };
+		55E1598E18455C78007983CB /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PcsxrMemCard.strings; sourceTree = "<group>"; };
+		55E1599018455C7C007983CB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/PcsxrMemCard.strings; sourceTree = "<group>"; };
+		55E1599218455D7E007983CB /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/CheatWindow.strings; sourceTree = "<group>"; };
+		55E15993184564D4007983CB /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
 		55EC05F91788B1230053AC23 /* PcsxrMemCardArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardArray.h; sourceTree = "<group>"; };
 		55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardArray.m; sourceTree = "<group>"; usesTabs = 1; };
 		55EC05FC178916E70053AC23 /* MemBadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemBadgeView.h; sourceTree = "<group>"; };
@@ -801,6 +810,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				55E15994184564D4007983CB /* GLKit.framework in Frameworks */,
 				551A76D3178695D10052D185 /* GLUT.framework in Frameworks */,
 				551A76D4178695D20052D185 /* OpenGL.framework in Frameworks */,
 				551A76B7178693FF0052D185 /* Cocoa.framework in Frameworks */,
@@ -919,7 +929,7 @@
 				559DACEC146C72FF00C5DF71 /* Localizable.strings */,
 				28F0C3C7146521B000A90285 /* PCSXR.xib */,
 				28F0C3CA146521B700A90285 /* AddPluginSheet.xib */,
-				55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */,
+				55C7A216148B2B3800C22ABC /* PcsxrMemCard.xib */,
 				D422E66C16DC48D000526DCF /* CheatWindow.xib */,
 			);
 			name = Resources;
@@ -1014,6 +1024,7 @@
 		551A749D17868B110052D185 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				55E15993184564D4007983CB /* GLKit.framework */,
 				554FD70817C6A13E0056CF66 /* SDL2.framework */,
 				55CA586A17E799E6007424D5 /* DiskArbitration.framework */,
 				551A7723178699250052D185 /* OpenAL.framework */,
@@ -1883,7 +1894,7 @@
 				28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */,
 				5557769A17EBE7D60019D008 /* Media.xcassets in Resources */,
 				559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */,
-				55C7A214148B2B3800C22ABC /* PcsxrMemCardDocument.xib in Resources */,
+				55C7A214148B2B3800C22ABC /* PcsxrMemCard.xib in Resources */,
 				02FE55E816765F9400205CF2 /* KeyNames.plist in Resources */,
 				D422E66E16DC48D000526DCF /* CheatWindow.xib in Resources */,
 			);
@@ -2297,6 +2308,7 @@
 				5569B09A182F0B3A00991C9C /* Base */,
 				5569B0A7182F0B5D00991C9C /* fr */,
 				5569B0A9182F0B6500991C9C /* en */,
+				55E1598618455B69007983CB /* hu */,
 			);
 			name = Configuration.xib;
 			path = English.lproj;
@@ -2319,6 +2331,8 @@
 			children = (
 				5569B09C182F0B3C00991C9C /* Base */,
 				5569B0AD182F0B7200991C9C /* en */,
+				55E1598818455BB9007983CB /* fr */,
+				55E1598A18455BBD007983CB /* hu */,
 			);
 			name = AddPluginSheet.xib;
 			path = English.lproj;
@@ -2620,13 +2634,15 @@
 			path = English.lproj;
 			sourceTree = "<group>";
 		};
-		55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */ = {
+		55C7A216148B2B3800C22ABC /* PcsxrMemCard.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				5569B09D182F0B3D00991C9C /* Base */,
 				5569B0AF182F0B7900991C9C /* en */,
+				55E1598E18455C78007983CB /* fr */,
+				55E1599018455C7C007983CB /* hu */,
 			);
-			name = PcsxrMemCardDocument.xib;
+			name = PcsxrMemCard.xib;
 			sourceTree = "<group>";
 		};
 		D422E66C16DC48D000526DCF /* CheatWindow.xib */ = {
@@ -2634,6 +2650,8 @@
 			children = (
 				5569B09E182F0B3E00991C9C /* Base */,
 				5569B0B1182F0B8100991C9C /* en */,
+				55E1598C18455C60007983CB /* fr */,
+				55E1599218455D7E007983CB /* hu */,
 			);
 			name = CheatWindow.xib;
 			sourceTree = "<group>";
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index a7b0c04f..2ef2f36e 100755
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -24,7 +24,7 @@
 - (NSURL*)discURL
 {
 	if (!_discURL) {
-		self.discURL = [NSURL fileURLWithPath:discPath isDirectory:NO];
+		self.discURL = [NSURL fileURLWithPath:discPath];
 	}
 	return _discURL;
 }
diff --git a/macosx/PcsxrMemCardHandler.h b/macosx/PcsxrMemCardHandler.h
index 7a4aa888..d87b73a7 100755
--- a/macosx/PcsxrMemCardHandler.h
+++ b/macosx/PcsxrMemCardHandler.h
@@ -9,10 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PcsxrFileHandle.h"
 
-@interface PcsxrMemCardHandler : NSWindowController <PcsxrFileHandle> {
-	IBOutlet NSTextField *cardPath;
-	NSInteger memChosen;
-}
+@interface PcsxrMemCardHandler : NSWindowController <PcsxrFileHandle>
+@property (weak) IBOutlet NSTextField *cardPath;
 - (IBAction)setMemCard:(id)sender;
-
 @end
diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m
index ae7ea0a3..5b03023f 100755
--- a/macosx/PcsxrMemCardHandler.m
+++ b/macosx/PcsxrMemCardHandler.m
@@ -10,7 +10,13 @@
 #import "ConfigurationController.h"
 #import "EmuThread.h"
 
+@interface PcsxrMemCardHandler ()
+@property NSInteger memChosen;
+@end
+
 @implementation PcsxrMemCardHandler
+@synthesize cardPath;
+@synthesize memChosen;
 
 + (NSArray *)supportedUTIs
 {
@@ -33,19 +39,18 @@
 
 - (id)init
 {
-	return self = [self initWithWindowNibName:@"PcsxrMemCardDocument"];
+	return self = [self initWithWindowNibName:@"PcsxrMemCard"];
 }
 
 - (void)windowDidLoad
 {
-    [super windowDidLoad];
-    
-    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+	[super windowDidLoad];
+	// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 }
 
 - (NSString*)windowNibName
 {
-	return @"PcsxrMemCardDocument";
+	return @"PcsxrMemCard";
 }
 
 - (IBAction)setMemCard:(id)sender
diff --git a/macosx/PcsxrPluginHandler.h b/macosx/PcsxrPluginHandler.h
index 8b79a4fb..2855e410 100755
--- a/macosx/PcsxrPluginHandler.h
+++ b/macosx/PcsxrPluginHandler.h
@@ -9,11 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PcsxrFileHandle.h"
 
-@interface PcsxrPluginHandler : NSWindowController <PcsxrFileHandle> {
-	IBOutlet NSTextField *pluginName;
-	
-	BOOL moveOK;
-}
+@interface PcsxrPluginHandler : NSWindowController <PcsxrFileHandle>
+@property (weak) IBOutlet NSTextField *pluginName;
 - (IBAction)closeAddPluginSheet:(id)sender;
-
 @end
diff --git a/macosx/PcsxrPluginHandler.m b/macosx/PcsxrPluginHandler.m
index 2c80cf91..6e99932b 100755
--- a/macosx/PcsxrPluginHandler.m
+++ b/macosx/PcsxrPluginHandler.m
@@ -9,7 +9,13 @@
 #import "PcsxrPluginHandler.h"
 #import "EmuThread.h"
 
+@interface PcsxrPluginHandler ()
+@property BOOL moveOK;
+@end
+
 @implementation PcsxrPluginHandler
+@synthesize pluginName;
+@synthesize moveOK;
 
 + (NSArray *)supportedUTIs
 {
@@ -37,8 +43,7 @@
 
 - (id)init
 {
-	self = [self initWithWindowNibName:@"AddPluginSheet"];
-	return self;
+	return self = [self initWithWindowNibName:@"AddPluginSheet"];
 }
 
 - (void)windowDidLoad
@@ -71,7 +76,7 @@
 	[[self window] orderOut:nil];
 	if (moveOK == YES) {
 		NSURL *supportURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
-		NSURL *url = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"PlugIns"];
+		NSURL *url = [[supportURL URLByAppendingPathComponent:@"Pcsxr" isDirectory:YES] URLByAppendingPathComponent:@"PlugIns" isDirectory:YES];
 
 		NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithPath:theFile];
 		NSString *dst = [[url URLByAppendingPathComponent:[wrapper filename]] path];
diff --git a/macosx/en.lproj/PcsxrMemCardDocument.strings b/macosx/en.lproj/PcsxrMemCard.strings
index 652102be..652102be 100644
--- a/macosx/en.lproj/PcsxrMemCardDocument.strings
+++ b/macosx/en.lproj/PcsxrMemCard.strings
diff --git a/macosx/fr.lproj/CheatWindow.strings b/macosx/fr.lproj/CheatWindow.strings
new file mode 100644
index 00000000..a520f02e
--- /dev/null
+++ b/macosx/fr.lproj/CheatWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSWindow"; title = "Cheats"; ObjectID = "1"; */
+"1.title" = "Cheats";
+
+/* Class = "NSButtonCell"; title = "Save Cheats…"; ObjectID = "5"; */
+"5.title" = "Save Cheats…";
+
+/* Class = "NSButtonCell"; title = "Load Cheats…"; ObjectID = "7"; */
+"7.title" = "Load Cheats…";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "28"; */
+"28.headerCell.title" = "Name";
+
+/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "29"; */
+"29.headerCell.title" = "Enabled";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "31"; */
+"31.title" = "Text Cell";
+
+/* Class = "NSButtonCell"; title = "Clear"; ObjectID = "79"; */
+"79.title" = "Clear";
+
+/* Class = "NSButtonCell"; title = "Edit…"; ObjectID = "130"; */
+"130.title" = "Edit…";
+
+/* Class = "NSWindow"; title = "Edit Cheat"; ObjectID = "134"; */
+"134.title" = "Edit Cheat";
+
+/* Class = "NSTableColumn"; headerCell.title = "Address"; ObjectID = "141"; */
+"141.headerCell.title" = "Address";
+
+/* Class = "NSTableColumn"; headerCell.title = "Value"; ObjectID = "142"; */
+"142.headerCell.title" = "Value";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "153"; */
+"153.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "157"; */
+"157.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "207"; */
+"207.title" = "Add";
+
+/* Class = "NSButtonCell"; title = "Remove"; ObjectID = "228"; */
+"228.title" = "Remove";
+
+/* Class = "NSButtonCell"; title = "Apply"; ObjectID = "257"; */
+"257.title" = "Apply";
diff --git a/macosx/fr.lproj/PcsxrMemCard.strings b/macosx/fr.lproj/PcsxrMemCard.strings
new file mode 100644
index 00000000..9c5dcb74
--- /dev/null
+++ b/macosx/fr.lproj/PcsxrMemCard.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSWindow"; title = "Memory Card"; ObjectID = "5"; */
+"5.title" = "Memory Card";
+
+/* Class = "NSTextFieldCell"; title = "Select which memory card slot you want to put this card in."; ObjectID = "100028"; */
+"100028.title" = "Select which memory card slot you want to put this card in.";
+
+/* Class = "NSTextFieldCell"; title = "Memory Card Selection"; ObjectID = "100029"; */
+"100029.title" = "Memory Card Selection";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mem card file name"; ObjectID = "100035"; */
+"100035.placeholderString" = "Mem card file name";
+
+/* Class = "NSButtonCell"; title = "Slot 2"; ObjectID = "100127"; */
+"100127.title" = "Slot 2";
+
+/* Class = "NSButtonCell"; title = "Slot 1"; ObjectID = "100131"; */
+"100131.title" = "Slot 1";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "100135"; */
+"100135.title" = "Cancel";
diff --git a/macosx/hu.lproj/CheatWindow.strings b/macosx/hu.lproj/CheatWindow.strings
new file mode 100644
index 00000000..a520f02e
--- /dev/null
+++ b/macosx/hu.lproj/CheatWindow.strings
@@ -0,0 +1,48 @@
+
+/* Class = "NSWindow"; title = "Cheats"; ObjectID = "1"; */
+"1.title" = "Cheats";
+
+/* Class = "NSButtonCell"; title = "Save Cheats…"; ObjectID = "5"; */
+"5.title" = "Save Cheats…";
+
+/* Class = "NSButtonCell"; title = "Load Cheats…"; ObjectID = "7"; */
+"7.title" = "Load Cheats…";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "28"; */
+"28.headerCell.title" = "Name";
+
+/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "29"; */
+"29.headerCell.title" = "Enabled";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "31"; */
+"31.title" = "Text Cell";
+
+/* Class = "NSButtonCell"; title = "Clear"; ObjectID = "79"; */
+"79.title" = "Clear";
+
+/* Class = "NSButtonCell"; title = "Edit…"; ObjectID = "130"; */
+"130.title" = "Edit…";
+
+/* Class = "NSWindow"; title = "Edit Cheat"; ObjectID = "134"; */
+"134.title" = "Edit Cheat";
+
+/* Class = "NSTableColumn"; headerCell.title = "Address"; ObjectID = "141"; */
+"141.headerCell.title" = "Address";
+
+/* Class = "NSTableColumn"; headerCell.title = "Value"; ObjectID = "142"; */
+"142.headerCell.title" = "Value";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "153"; */
+"153.title" = "OK";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "157"; */
+"157.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "207"; */
+"207.title" = "Add";
+
+/* Class = "NSButtonCell"; title = "Remove"; ObjectID = "228"; */
+"228.title" = "Remove";
+
+/* Class = "NSButtonCell"; title = "Apply"; ObjectID = "257"; */
+"257.title" = "Apply";
diff --git a/macosx/hu.lproj/PcsxrMemCard.strings b/macosx/hu.lproj/PcsxrMemCard.strings
new file mode 100644
index 00000000..9c5dcb74
--- /dev/null
+++ b/macosx/hu.lproj/PcsxrMemCard.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSWindow"; title = "Memory Card"; ObjectID = "5"; */
+"5.title" = "Memory Card";
+
+/* Class = "NSTextFieldCell"; title = "Select which memory card slot you want to put this card in."; ObjectID = "100028"; */
+"100028.title" = "Select which memory card slot you want to put this card in.";
+
+/* Class = "NSTextFieldCell"; title = "Memory Card Selection"; ObjectID = "100029"; */
+"100029.title" = "Memory Card Selection";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Mem card file name"; ObjectID = "100035"; */
+"100035.placeholderString" = "Mem card file name";
+
+/* Class = "NSButtonCell"; title = "Slot 2"; ObjectID = "100127"; */
+"100127.title" = "Slot 2";
+
+/* Class = "NSButtonCell"; title = "Slot 1"; ObjectID = "100131"; */
+"100131.title" = "Slot 1";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "100135"; */
+"100135.title" = "Cancel";
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
index 09375671..7cf9ca8e 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
@@ -326,6 +326,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 				
 				
 				glBegin(GL_QUADS);
+				{
 					glTexCoord2f(0.0f, 0.0f);
 					glVertex2f(-1.0f, 1.0f);
 					
@@ -337,6 +338,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 					
 					glTexCoord2f(image_width, 0.0f);
 					glVertex2f(1.0f, 1.0f);
+				}
 				glEnd();
 			}
 			else
@@ -381,6 +383,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 				}
 				
 				glBegin(GL_QUADS);
+				{
 					glTexCoord2f(0.0f, 0.0f);
 					glVertex2f(-1.0f, 1.0f);
 					
@@ -392,6 +395,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 					
 					glTexCoord2f(image_tx, 0.0f);
 					glVertex2f(1.0f, 1.0f);
+				}
 				glEnd();
 			}
 		}