From d6b74afdc938c78425050e8a0f907b09cec9f852 Mon Sep 17 00:00:00 2001
From: imnotpopo <bliu18@knox.nsw.edu.au>
Date: Tue, 20 Dec 2016 17:50:46 +0800
Subject: [PATCH 1/4] Update AdvPreferencesWindowController.xib

fix typo
---
 ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib
index e4d375b..874760b 100644
--- a/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib
+++ b/ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib
@@ -43,7 +43,7 @@
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wCp-nB-dda">
                         <rect key="frame" x="18" y="308" width="439" height="17"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Don't change these preferences if you have no idea what are they." id="8wL-qv-5nD">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Don't change these preferences if you have no idea what they are." id="8wL-qv-5nD">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

From 417f8f84578096ad4bf59acdcbf3b5056592e263 Mon Sep 17 00:00:00 2001
From: imnotpopo <bliu18@knox.nsw.edu.au>
Date: Tue, 20 Dec 2016 17:51:27 +0800
Subject: [PATCH 2/4] Update HTTPPreferencesWindowController.xib

fix typo
---
 ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib b/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
index 7bb527a..1cdbb68 100644
--- a/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
+++ b/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
@@ -28,7 +28,7 @@
                     </button>
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="P4f-0N-7JI">
                         <rect key="frame" x="18" y="133" width="141" height="18"/>
-                        <buttonCell key="cell" type="check" title="Follow Globel Mode" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ofk-Pc-c8f">
+                        <buttonCell key="cell" type="check" title="Follow Global Mode" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ofk-Pc-c8f">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>

From 0b4bc253734bce80052bc9cd157e81880aedab85 Mon Sep 17 00:00:00 2001
From: imnotpopo <bliu18@knox.nsw.edu.au>
Date: Tue, 20 Dec 2016 17:52:18 +0800
Subject: [PATCH 3/4] Update Localizable.strings

fix typo
---
 ShadowsocksX-NG/Base.lproj/Localizable.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShadowsocksX-NG/Base.lproj/Localizable.strings b/ShadowsocksX-NG/Base.lproj/Localizable.strings
index b33b000..6bfdced 100755
--- a/ShadowsocksX-NG/Base.lproj/Localizable.strings
+++ b/ShadowsocksX-NG/Base.lproj/Localizable.strings
@@ -26,7 +26,7 @@
 
 "By Handle SS URL" = "By Handle SS URL";
 
-" Encription Method: \(profile.method)" = " Encription Method: \(profile.method)";
+" Encryption Method: \(profile.method)" = " Encryption Method: \(profile.method)";
 
 "Current server profile is not valid." = "Current server profile is not valid.";
 

From cc3b016a517a147e79bf10a6b5e08f23409a2583 Mon Sep 17 00:00:00 2001
From: imnotpopo <bliu18@knox.nsw.edu.au>
Date: Tue, 20 Dec 2016 17:52:58 +0800
Subject: [PATCH 4/4] Update PreferencesWindowController.strings

fix typo
---
 ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings b/ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings
index 8cabe1f..75e163e 100644
--- a/ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings
+++ b/ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings
@@ -17,8 +17,8 @@
 /* Class = "NSButtonCell"; title = "Enable OTA"; ObjectID = "hRZ-Rp-I5e"; */
 "hRZ-Rp-I5e.title" = "Enable OTA";
 
-/* Class = "NSButtonCell"; title = "Cacnel"; ObjectID = "j03-9E-uHW"; */
-"j03-9E-uHW.title" = "Cacnel";
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "j03-9E-uHW"; */
+"j03-9E-uHW.title" = "Cancel";
 
 /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */
 "kil-xC-HPD.title" = "Password:";