xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shadowsocks/ShadowsocksX-NG into fix

Browse Source 
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
This commit is contained in:
Nobel
2017-01-10 17:05:30 +08:00
parent 6175ec2888 dcce6cfce5
commit 58c5befa04
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShadowsocksX-NG/Base.lproj/AdvPreferencesWindowController.xib
View File

@ -44,7 +44,7 @@
</textField> </textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wCp-nB-dda"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wCp-nB-dda">
<rect key="frame" x="18" y="308" width="439" height="17"/> <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"/> <font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

2
ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
View File

@ -33,7 +33,7 @@
</connections> </connections>
</button> </button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="P4f-0N-7JI"> <button translatesAutoresizingMaskIntoConstraints="NO" id="P4f-0N-7JI">
<rect key="frame" x="18" y="155" width="141" height="18"/> <rect key="frame" x="18" y="133" width="141" height="18"/>
<buttonCell key="cell" type="check" title="Follow Global 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"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>

2
ShadowsocksX-NG/Base.lproj/Localizable.strings
View File

@ -26,7 +26,7 @@
"By Handle SS URL" = "By Handle SS URL"; "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."; "Current server profile is not valid." = "Current server profile is not valid.";

4
ShadowsocksX-NG/en.lproj/PreferencesWindowController.strings
View File

@ -17,8 +17,8 @@
/* Class = "NSButtonCell"; title = "Enable OTA"; ObjectID = "hRZ-Rp-I5e"; */ /* Class = "NSButtonCell"; title = "Enable OTA"; ObjectID = "hRZ-Rp-I5e"; */
"hRZ-Rp-I5e.title" = "Enable OTA"; "hRZ-Rp-I5e.title" = "Enable OTA";
/* Class = "NSButtonCell"; title = "Cacnel"; ObjectID = "j03-9E-uHW"; */ /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "j03-9E-uHW"; */
"j03-9E-uHW.title" = "Cacnel"; "j03-9E-uHW.title" = "Cancel";
/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */ /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */
"kil-xC-HPD.title" = "Password:"; "kil-xC-HPD.title" = "Password:";