瀏覽代碼

【会员系统】补充多语文案

wangshuai 4 月之前
父節點
當前提交
7fed98a9a1
共有 23 個文件被更改,包括 368 次插入177 次删除
  1. 1 1
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m
  2. 63 38
      PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings
  3. 66 0
      PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings
  4. 67 0
      PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings
  5. 6 6
      PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift
  6. 8 8
      PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.xib
  7. 6 6
      PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift
  8. 17 16
      PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.xib
  9. 6 6
      PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift
  10. 6 6
      PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.xib
  11. 20 20
      PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift
  12. 18 18
      PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib
  13. 13 14
      PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift
  14. 8 8
      PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift
  15. 2 1
      PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift
  16. 5 5
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.swift
  17. 5 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.swift
  18. 5 5
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift
  19. 4 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib
  20. 18 11
      PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.swift
  21. 8 0
      PDF Office/PDF Master/Strings/en.lproj/Localizable.strings
  22. 8 0
      PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings
  23. 8 0
      PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

+ 1 - 1
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -408,7 +408,7 @@ NSPopoverDelegate>
     self.aiContendView.hidden = YES;
     self.userButton.hidden = YES;
     self.signUpView.hidden = YES;
-    self.signUpLabel.stringValue = NSLocalizedStringFromTable(@"Sign Up", @"MemberCenterLocalizable", nil);
+    self.signUpLabel.stringValue = NSLocalizedStringFromTable(@"Sign in", @"MemberCenterLocalizable", nil);
     [self.signUpLabel sizeToFit];
     CGFloat signUpWidth = self.signUpLabel.frame.size.width;
     signUpWidth += 4;

文件差異過大導致無法顯示
+ 63 - 38
PDF Office/PDF Master/MemberCenter/Assets/en.lproj/MemberCenterLocalizable.strings


文件差異過大導致無法顯示
+ 66 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings


文件差異過大導致無法顯示
+ 67 - 0
PDF Office/PDF Master/MemberCenter/Assets/zh-Hant.lproj/MemberCenterLocalizable.strings


+ 6 - 6
PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift

@@ -51,11 +51,11 @@ class KMEnterNewPasswordView: KMBaseXibView {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Passwords", tableName: "MemberCenterLocalizable", comment: "")
-        finshButton.title = NSLocalizedString("Finsh", tableName: "MemberCenterLocalizable", comment: "")
-        passwordErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: ""))
-        passwordTextField.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
-        passwordTextField1.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
+        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Password", tableName: "MemberCenterLocalizable", comment: "")
+        finshButton.title = NSLocalizedString("Finish", tableName: "MemberCenterLocalizable", comment: "")
+        passwordErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: ""))
+        passwordTextField.placeholderString = NSLocalizedString("Please enter a new password", tableName: "MemberCenterLocalizable", comment: "")
+        passwordTextField1.placeholderString = NSLocalizedString("Please enter a new password", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {
@@ -151,7 +151,7 @@ class KMEnterNewPasswordView: KMBaseXibView {
                 if newValue.count <= 30 && newValue.count >= 0 {
                     self?.viewModel.passwordErrorMessage = ""
                 } else {
-                    self?.viewModel.passwordErrorMessage = NSLocalizedString("*Please enter right Password code", tableName: "MemberCenterLocalizable", comment: "")
+                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Password error.", tableName: "MemberCenterLocalizable", comment: "")
                 }
             }
             .store(in: &cancellables)

+ 8 - 8
PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -35,9 +35,9 @@
                                 <rect key="frame" x="0.0" y="108" width="279" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aJo-ll-hmw">
-                                        <rect key="frame" x="-2" y="4" width="37" height="16"/>
+                                        <rect key="frame" x="-2" y="0.0" width="52" height="24"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="LI7-Tb-Bkb">
-                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <font key="font" metaFont="system" size="20"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -98,9 +98,9 @@
                                                     </secureTextFieldCell>
                                                 </secureTextField>
                                                 <textField hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I9E-f1-hFQ">
-                                                    <rect key="frame" x="6" y="5" width="247" height="16"/>
+                                                    <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="Yxo-Qm-Gcx">
-                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <font key="font" metaFont="system" size="11"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -144,9 +144,9 @@
                                 </constraints>
                             </box>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qlQ-Xr-lw9">
-                                <rect key="frame" x="-2" y="40" width="283" height="16"/>
+                                <rect key="frame" x="-2" y="41" width="283" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="EhP-4f-hOw">
-                                    <font key="font" metaFont="system"/>
+                                    <font key="font" metaFont="system" size="12"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>

+ 6 - 6
PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift

@@ -84,12 +84,12 @@ class KMEnterVerificationCodeView: KMBaseXibView {
     }
     
     private func languageLocalized() -> Void {
-        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Passwords", tableName: "MemberCenterLocalizable", comment: "")
-        tipLabel.stringValue = String(format: "%@%@", NSLocalizedString("验证码已通过邮件发送至", tableName: "MemberCenterLocalizable", comment: ""), viewModel.email)
-        verifficationTextField.placeholderString = NSLocalizedString("Enter Verification code", tableName: "MemberCenterLocalizable", comment: "")
+        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Password", tableName: "MemberCenterLocalizable", comment: "")
+        tipLabel.stringValue = String(format: "%@%@", NSLocalizedString("We have sent you a code via email to", tableName: "MemberCenterLocalizable", comment: ""), viewModel.email)
+        verifficationTextField.placeholderString = NSLocalizedString("Please enter code", tableName: "MemberCenterLocalizable", comment: "")
         verifficationErrorLabel.stringValue = viewModel.passwordErrorMessage
         nextButton.title = NSLocalizedString("Next", tableName: "MemberCenterLocalizable", comment: "")
-        backButton.title = NSLocalizedString("Back", tableName: "MemberCenterLocalizable", comment: "")
+        backButton.title = NSLocalizedString("Previous Step", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {
@@ -191,7 +191,7 @@ class KMEnterVerificationCodeView: KMBaseXibView {
                 if newValue.count <= 6 && newValue.count >= 0 {
                     self?.viewModel.passwordErrorMessage = ""
                 } else {
-                    self?.viewModel.passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
+                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
                 }
             }
             .store(in: &cancellables)
@@ -201,7 +201,7 @@ class KMEnterVerificationCodeView: KMBaseXibView {
     
     @IBAction func nextButtonAction(_ sender: NSButton) {
         if viewModel.verificationCode.count <= 0 || viewModel.verificationCode.count > 6 || !viewModel.isValidVerificationCode() {
-            viewModel.passwordErrorMessage = NSLocalizedString("Please enter the correct email format", tableName: "MemberCenterLocalizable", comment: "")
+            viewModel.passwordErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
             return
         }
         viewModel.passwordErrorMessage = ""

+ 17 - 16
PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,9 +37,9 @@
                                 <rect key="frame" x="0.0" y="160" width="279" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QSF-lY-iwc">
-                                        <rect key="frame" x="-2" y="4" width="37" height="16"/>
+                                        <rect key="frame" x="-2" y="0.0" width="52" height="24"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="KuR-yV-OTv">
-                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <font key="font" metaFont="system" size="20"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -93,15 +93,16 @@
                                 <rect key="frame" x="0.0" y="134" width="279" height="14"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LZA-oE-Mth">
-                                        <rect key="frame" x="-2" y="-1" width="37" height="16"/>
+                                        <rect key="frame" x="-2" y="-1" width="283" height="15"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="oxN-El-oBZ">
-                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <font key="font" metaFont="system" size="12"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
                                 </subviews>
                                 <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="LZA-oE-Mth" secondAttribute="trailing" id="2BW-ZP-EK7"/>
                                     <constraint firstItem="LZA-oE-Mth" firstAttribute="centerY" secondItem="Cfy-N6-c4n" secondAttribute="centerY" id="A9h-YE-nIV"/>
                                     <constraint firstAttribute="height" constant="14" id="RTv-D8-mbf"/>
                                     <constraint firstItem="LZA-oE-Mth" firstAttribute="leading" secondItem="Cfy-N6-c4n" secondAttribute="leading" id="jRx-ap-yh4"/>
@@ -111,15 +112,15 @@
                                 <rect key="frame" x="0.0" y="82" width="279" height="28"/>
                                 <subviews>
                                     <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="gAH-oP-4Eg">
-                                        <rect key="frame" x="0.0" y="0.0" width="226" height="28"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="228" height="28"/>
                                         <view key="contentView" id="5R5-GG-fog">
-                                            <rect key="frame" x="1" y="1" width="224" height="26"/>
+                                            <rect key="frame" x="1" y="1" width="226" height="26"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3WV-H8-R9L">
-                                                    <rect key="frame" x="6" y="5" width="212" height="16"/>
+                                                    <rect key="frame" x="6" y="6" width="214" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="Fux-Lx-ckR">
-                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <font key="font" metaFont="system" size="11"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -135,15 +136,15 @@
                                         </constraints>
                                     </box>
                                     <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Sn4-mT-M5h" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="226" y="0.0" width="53" height="28"/>
+                                        <rect key="frame" x="228" y="0.0" width="51" height="28"/>
                                         <view key="contentView" id="0pK-Pr-2qe">
-                                            <rect key="frame" x="0.0" y="0.0" width="53" height="28"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="51" height="28"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EBN-jV-4Nt">
-                                                    <rect key="frame" x="6" y="6" width="41" height="16"/>
+                                                    <rect key="frame" x="6" y="6" width="39" height="15"/>
                                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="imF-dG-EJc">
-                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <font key="font" metaFont="system" size="12"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -171,9 +172,9 @@
                                 </constraints>
                             </customView>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G5c-Rs-bm9">
-                                <rect key="frame" x="-2" y="66" width="283" height="16"/>
+                                <rect key="frame" x="-2" y="67" width="283" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="J6k-lX-XBH">
-                                    <font key="font" usesAppearanceFont="YES"/>
+                                    <font key="font" metaFont="system" size="12"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>

+ 6 - 6
PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift

@@ -49,11 +49,11 @@ class KMForgotPasswordView: KMBaseXibView {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Passwords", tableName: "MemberCenterLocalizable", comment: "")
-        emailTextField.placeholderString = NSLocalizedString("Please enter Email", tableName: "MemberCenterLocalizable", comment: "")
-        emailErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Please enter right Address", tableName: "MemberCenterLocalizable", comment: ""))
+        resetPasswordsLabel.stringValue = NSLocalizedString("Reset Password", tableName: "MemberCenterLocalizable", comment: "")
+        emailTextField.placeholderString = NSLocalizedString("Please enter email address", tableName: "MemberCenterLocalizable", comment: "")
+        emailErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Email format error. Please enter the correct email.", tableName: "MemberCenterLocalizable", comment: ""))
         nextButton.title = NSLocalizedString("Next", tableName: "MemberCenterLocalizable", comment: "")
-        backButton.title = NSLocalizedString("Back", tableName: "MemberCenterLocalizable", comment: "")
+        backButton.title = NSLocalizedString("Previous Step", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {
@@ -171,7 +171,7 @@ class KMForgotPasswordView: KMBaseXibView {
     
     @IBAction func nextButtonAction(_ sender: NSButton) {
         if viewModel.email.count <= 0 || viewModel.email.count > 100 || !viewModel.isValidEmail() {
-            viewModel.emailErrorMessage = NSLocalizedString("Please enter the correct email format", tableName: "MemberCenterLocalizable", comment: "")
+            viewModel.emailErrorMessage = NSLocalizedString("Email format error. Please enter the correct email.", tableName: "MemberCenterLocalizable", comment: "")
             return
         }
         viewModel.emailErrorMessage = ""
@@ -181,7 +181,7 @@ class KMForgotPasswordView: KMBaseXibView {
                 self.skipEnterVerificationCodeView()
             } else {
                 let alert = NSAlert()
-                alert.messageText = NSLocalizedString("该邮箱还未注册,请先通过账号验证码登录,我们将自动为您注册账号", tableName: "MemberCenterLocalizable", comment: "")
+                alert.messageText = NSLocalizedString("This email has not been registered, please log in through the account verification code, we will automatically register an account for you.", tableName: "MemberCenterLocalizable", comment: "")
                 alert.addButton(withTitle: "OK")
                 let response = alert.runModal()
                 if response == .alertFirstButtonReturn {

+ 6 - 6
PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -33,9 +33,9 @@
                                 <rect key="frame" x="0.0" y="134" width="279" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kIh-0S-6Hs">
-                                        <rect key="frame" x="-2" y="4" width="37" height="16"/>
+                                        <rect key="frame" x="-2" y="0.0" width="52" height="24"/>
                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="jvP-Dt-Zdw">
-                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <font key="font" metaFont="system" size="20"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -54,9 +54,9 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LZp-o9-Dhb">
-                                            <rect key="frame" x="6" y="5" width="265" height="16"/>
+                                            <rect key="frame" x="6" y="6" width="265" height="14"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="11111" id="GEZ-nT-23M">
-                                                <font key="font" usesAppearanceFont="YES"/>
+                                                <font key="font" metaFont="system" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>

+ 20 - 20
PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -70,19 +70,19 @@ class KMSignUpView: KMBaseXibView {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        signUpLabel.stringValue = NSLocalizedString("Sign Up", tableName: "MemberCenterLocalizable", comment: "")
-        verificationCodeButton.title = NSLocalizedString("Verification code", tableName: "MemberCenterLocalizable", comment: "")
+        signUpLabel.stringValue = NSLocalizedString("Sign in(titile)", tableName: "MemberCenterLocalizable", comment: "")
+        verificationCodeButton.title = NSLocalizedString("Verification Code", tableName: "MemberCenterLocalizable", comment: "")
         passwordButton.title = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
-        stayLabel.stringValue = NSLocalizedString("Stay logged in", tableName: "MemberCenterLocalizable", comment: "")
-        forgetButton.title = NSLocalizedString("Forget Password?", tableName: "MemberCenterLocalizable", comment: "")
-        signUpButton.title = NSLocalizedString("Sign Up", tableName: "MemberCenterLocalizable", comment: "")
-        emailErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Please enter right Address", tableName: "MemberCenterLocalizable", comment: ""))
-        passwordErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: ""))
-        emailTextField.placeholderString = NSLocalizedString("Please enter Email", tableName: "MemberCenterLocalizable", comment: "")
-        verifficationTextField.placeholderString = NSLocalizedString("Enter Verification code", tableName: "MemberCenterLocalizable", comment: "")
-        passwordTextField.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
-        passwordTextField1.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
-        privacyCheckButton.toolTip = NSLocalizedString("Please first agree and check the above agreement.", tableName: "MemberCenterLocalizable", comment: "")
+        stayLabel.stringValue = NSLocalizedString("Stay signed in", tableName: "MemberCenterLocalizable", comment: "")
+        forgetButton.title = NSLocalizedString("Forgot password?", tableName: "MemberCenterLocalizable", comment: "")
+        signUpButton.title = NSLocalizedString("Sign in(button)", tableName: "MemberCenterLocalizable", comment: "")
+        emailErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Email format error. Please enter the correct email.", tableName: "MemberCenterLocalizable", comment: ""))
+        passwordErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: ""))
+        emailTextField.placeholderString = NSLocalizedString("Please enter email address", tableName: "MemberCenterLocalizable", comment: "")
+        verifficationTextField.placeholderString = NSLocalizedString("Please enter code", tableName: "MemberCenterLocalizable", comment: "")
+        passwordTextField.placeholderString = NSLocalizedString("Please enter password", tableName: "MemberCenterLocalizable", comment: "")
+        passwordTextField1.placeholderString = NSLocalizedString("Please enter password", tableName: "MemberCenterLocalizable", comment: "")
+        privacyCheckButton.toolTip = NSLocalizedString("Please agree and check the above agreement first.", tableName: "MemberCenterLocalizable", comment: "")
         emailTextField.stringValue = viewModel.email
         verifficationTextField.stringValue = viewModel.verificationCode
         passwordTextField.stringValue = viewModel.password
@@ -127,9 +127,9 @@ class KMSignUpView: KMBaseXibView {
         privacyLabel.allowsEditingTextAttributes = true
         privacyLabel.textColor = NSColor.black
         privacyLabel.font = NSFont.SFProTextRegularFont(16.0)
-        let tipsString = NSLocalizedString("I have read and agree to the %@ and %@, and an account will be automatically created after I log in to an unregistered email address", comment: "")
-        let specialOffer = NSLocalizedString("User Agreement", comment: "")
-        let contactsUs = NSLocalizedString("Privacy Policy", comment: "")
+        let tipsString = NSLocalizedString("I have read and agreed to the %@ and %@. An account will be automatically created after signing in with an unregistered email address.", tableName: "MemberCenterLocalizable", comment: "")
+        let specialOffer = NSLocalizedString("Terms of Service", tableName: "MemberCenterLocalizable", comment: "")
+        let contactsUs = NSLocalizedString("Privacy Policy", tableName: "MemberCenterLocalizable", comment: "")
         let fullString = String(format: tipsString, specialOffer, contactsUs)
         let attributedString = NSMutableAttributedString(string: fullString)
         // 定义链接的范围
@@ -190,7 +190,7 @@ class KMSignUpView: KMBaseXibView {
             passwordButton.setTitleColor(color: NSColor(named: "42464D") ?? NSColor.black, font: NSFont.SFProTextRegularFont(14))
             verifficationView.isHidden = false
             passwordView.isHidden = true
-            verifficationTextField.placeholderString = NSLocalizedString("Enter Verification code", tableName: "MemberCenterLocalizable", comment: "")
+            verifficationTextField.placeholderString = NSLocalizedString("Please enter code", tableName: "MemberCenterLocalizable", comment: "")
             forgetButton.isHidden = true
         } else if viewModel.signUpState == .password {
             selectBox1.isHidden = true
@@ -199,8 +199,8 @@ class KMSignUpView: KMBaseXibView {
             passwordButton.setTitleColor(color: NSColor(named: "4982E6") ?? NSColor.black, font: NSFont.SFProTextRegularFont(14))
             verifficationView.isHidden = true
             passwordView.isHidden = false
-            passwordTextField.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
-            passwordTextField1.placeholderString = NSLocalizedString("Password", tableName: "MemberCenterLocalizable", comment: "")
+            passwordTextField.placeholderString = NSLocalizedString("Please enter password", tableName: "MemberCenterLocalizable", comment: "")
+            passwordTextField1.placeholderString = NSLocalizedString("Please enter password", tableName: "MemberCenterLocalizable", comment: "")
             forgetButton.isHidden = false
         }
     }
@@ -342,7 +342,7 @@ class KMSignUpView: KMBaseXibView {
                 if newValue.count <= 6 && newValue.count >= 0 {
                     self?.viewModel.passwordErrorMessage = ""
                 } else {
-                    self?.viewModel.passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
+                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
                 }
             }
             .store(in: &cancellables)
@@ -352,7 +352,7 @@ class KMSignUpView: KMBaseXibView {
                 if newValue.count <= 30 && newValue.count >= 0 {
                     self?.viewModel.passwordErrorMessage = ""
                 } else {
-                    self?.viewModel.passwordErrorMessage = NSLocalizedString("*Please enter right Password code", tableName: "MemberCenterLocalizable", comment: "")
+                    self?.viewModel.passwordErrorMessage = NSLocalizedString("Account or password error.", tableName: "MemberCenterLocalizable", comment: "")
                 }
             }
             .store(in: &cancellables)

+ 18 - 18
PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -75,9 +75,9 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lob-YZ-RnN">
-                                            <rect key="frame" x="6" y="5" width="265" height="16"/>
+                                            <rect key="frame" x="6" y="6" width="265" height="14"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="11111" id="pGk-LP-wDS">
-                                                <font key="font" usesAppearanceFont="YES"/>
+                                                <font key="font" metaFont="system" size="11"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -211,7 +211,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="140" height="28"/>
                                             <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="TR5-7V-IZH">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="systemBold" size="14"/>
                                             </buttonCell>
                                             <connections>
                                                 <action selector="verificationCodeAction:" target="-2" id="WkF-Tc-Sxd"/>
@@ -221,7 +221,7 @@
                                             <rect key="frame" x="140" y="0.0" width="139" height="28"/>
                                             <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3Nj-KL-9F9">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="system"/>
+                                                <font key="font" metaFont="systemBold" size="14"/>
                                             </buttonCell>
                                             <connections>
                                                 <action selector="passwordAction:" target="-2" id="A7x-sa-JI9"/>
@@ -285,15 +285,15 @@
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="26"/>
                                             <subviews>
                                                 <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="JUe-bQ-uSN">
-                                                    <rect key="frame" x="0.0" y="0.0" width="224" height="26"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="226" height="26"/>
                                                     <view key="contentView" id="LsV-oy-6JL">
-                                                        <rect key="frame" x="1" y="1" width="222" height="24"/>
+                                                        <rect key="frame" x="1" y="1" width="224" height="24"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q4E-Ah-Yxy">
-                                                                <rect key="frame" x="6" y="4" width="210" height="16"/>
+                                                                <rect key="frame" x="6" y="5" width="212" height="14"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="7p1-b6-AOB">
-                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                    <font key="font" metaFont="system" size="11"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -309,15 +309,15 @@
                                                     </constraints>
                                                 </box>
                                                 <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="YTg-zc-9kj" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                    <rect key="frame" x="224" y="0.0" width="53" height="26"/>
+                                                    <rect key="frame" x="226" y="0.0" width="51" height="26"/>
                                                     <view key="contentView" id="zmY-cn-OGB">
-                                                        <rect key="frame" x="0.0" y="0.0" width="53" height="26"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="51" height="26"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9CR-yj-hV6">
-                                                                <rect key="frame" x="6" y="5" width="41" height="16"/>
+                                                                <rect key="frame" x="6" y="6" width="39" height="15"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="fPD-Vb-cyJ">
-                                                                    <font key="font" usesAppearanceFont="YES"/>
+                                                                    <font key="font" metaFont="system" size="12"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -347,9 +347,9 @@
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="26"/>
                                             <subviews>
                                                 <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AGE-IA-Gl4">
-                                                    <rect key="frame" x="6" y="5" width="247" height="16"/>
+                                                    <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="QCj-QO-AzJ">
-                                                        <font key="font" metaFont="system"/>
+                                                        <font key="font" metaFont="system" size="11"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <allowedInputSourceLocales>
@@ -358,9 +358,9 @@
                                                     </secureTextFieldCell>
                                                 </secureTextField>
                                                 <textField hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GgF-lg-2Qh">
-                                                    <rect key="frame" x="6" y="5" width="247" height="16"/>
+                                                    <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="GAi-ha-pFG">
-                                                        <font key="font" usesAppearanceFont="YES"/>
+                                                        <font key="font" metaFont="system" size="11"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>

+ 13 - 14
PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -93,20 +93,19 @@ class KMUserInfoViewController: NSViewController {
     
     private func languageLocalized() -> Void {
         emailLabel.stringValue = KMMemberInfo.shared.userEmail
-        productLabel.stringValue = NSLocalizedString("PDF Reader Pro Account", tableName: "MemberCenterLocalizable", comment: "")
+        productLabel.stringValue = NSLocalizedString("Personal Account", tableName: "MemberCenterLocalizable", comment: "")
         membershipLabel.stringValue = NSLocalizedString("Membership Benefits", tableName: "MemberCenterLocalizable", comment: "")
-        buyNow3Label.stringValue = NSLocalizedString("Upgrade", tableName: "MemberCenterLocalizable", comment: "")
+        buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
         accountLabel.stringValue = NSLocalizedString("Account Center", tableName: "MemberCenterLocalizable", comment: "")
         signOutLabel.stringValue = NSLocalizedString("Sign out", tableName: "MemberCenterLocalizable", comment: "")
         if KMMemberInfo.shared.validFlag == "5" {
-            closeAccountLabel.stringValue = NSLocalizedString("撤销注销账户", tableName: "MemberCenterLocalizable", comment: "")
+            closeAccountLabel.stringValue = NSLocalizedString("Undo Remove Account", tableName: "MemberCenterLocalizable", comment: "")
         } else {
-            closeAccountLabel.stringValue = NSLocalizedString("Close account", tableName: "MemberCenterLocalizable", comment: "")
+            closeAccountLabel.stringValue = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
         }
-        number4Label.stringValue = NSLocalizedString("4 devices", tableName: "MemberCenterLocalizable", comment: "")
 
         if KMMemberInfo.shared.vip_maxDeviceNum == 1 {
-            number4Label.stringValue = String.localizedStringWithFormat(NSLocalizedString("%d device", tableName: "MemberCenterLocalizable", comment: ""), KMMemberInfo.shared.vip_maxDeviceNum)
+            number4Label.stringValue = String.localizedStringWithFormat(NSLocalizedString("%d devices", tableName: "MemberCenterLocalizable", comment: ""), KMMemberInfo.shared.vip_maxDeviceNum)
         } else {
             number4Label.stringValue = String.localizedStringWithFormat(NSLocalizedString("%d devices", tableName: "MemberCenterLocalizable", comment: ""), KMMemberInfo.shared.vip_maxDeviceNum)
         }
@@ -115,7 +114,7 @@ class KMUserInfoViewController: NSViewController {
         } else if KMMemberInfo.shared.vip_levels == "3" {
             number2Label.stringValue = NSLocalizedString("Advanced Version", tableName: "MemberCenterLocalizable", comment: "")
         } else {
-            number2Label.stringValue = NSLocalizedString("Benefits of functions", tableName: "MemberCenterLocalizable", comment: "")
+            number2Label.stringValue = NSLocalizedString("Benefits of Functions", tableName: "MemberCenterLocalizable", comment: "")
         }
         if KMMemberInfo.shared.vip_paymentModel == "2" {
             lockedLabel.stringValue = NSLocalizedString("Permanent Plan", tableName: "MemberCenterLocalizable", comment: "")
@@ -126,25 +125,25 @@ class KMUserInfoViewController: NSViewController {
         }
         if userState == .unPay_UnTrial {
             number1Label.stringValue = NSLocalizedString("150+", tableName: "MemberCenterLocalizable", comment: "")
-            number3Label.stringValue = NSLocalizedString("All-platform available", tableName: "MemberCenterLocalizable", comment: "")
+            number3Label.stringValue = NSLocalizedString("All-platform Available", tableName: "MemberCenterLocalizable", comment: "")
             number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow1Label.stringValue = NSLocalizedString("开通会员", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow2Label.stringValue = NSLocalizedString("立即试用", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow1Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow2Label.stringValue = NSLocalizedString("7-Day Free Trial", tableName: "MemberCenterLocalizable", comment: "")
         } else if userState == .unPay_UnTrial_old {
             number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
             number3Label.stringValue = NSLocalizedString("Platform", tableName: "MemberCenterLocalizable", comment: "")
             number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow1Label.stringValue = NSLocalizedString("Upgrade", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
         } else if userState == .permanentAccount {
             number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
             number3Label.stringValue = NSLocalizedString("Platform", tableName: "MemberCenterLocalizable", comment: "")
             number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow1Label.stringValue = NSLocalizedString("Upgrade", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
         } else if userState == .subscribe {
             number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
             number3Label.stringValue = NSLocalizedString("Platform", tableName: "MemberCenterLocalizable", comment: "")
             number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow1Label.stringValue = NSLocalizedString("Upgrade", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow1Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
         } else if userState == .unAutomatic_RemainValid {
             number1Label.stringValue = NSLocalizedString("", tableName: "MemberCenterLocalizable", comment: "")
             number3Label.stringValue = NSLocalizedString("Platform", tableName: "MemberCenterLocalizable", comment: "")
@@ -152,7 +151,7 @@ class KMUserInfoViewController: NSViewController {
             buyNow3Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
         } else if userState == .expired {
             number1Label.stringValue = NSLocalizedString("150+", tableName: "MemberCenterLocalizable", comment: "")
-            number3Label.stringValue = NSLocalizedString("All-platform available", tableName: "MemberCenterLocalizable", comment: "")
+            number3Label.stringValue = NSLocalizedString("All-platform Available", tableName: "MemberCenterLocalizable", comment: "")
             number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
             buyNow2Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
         }

+ 8 - 8
PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift

@@ -176,27 +176,27 @@ class KMSignUpViewModel: ObservableObject {
      */
     func signUpAction() -> Void {
         if email.count <= 0 || email.count > 100 || !isValidEmail() {
-            emailErrorMessage = NSLocalizedString("Please enter the correct email format", tableName: "MemberCenterLocalizable", comment: "")
+            emailErrorMessage = NSLocalizedString("Email format error. Please enter the correct email.", tableName: "MemberCenterLocalizable", comment: "")
             return
         }
         
         var code: String = ""
         if signUpState == .verificationCode {
             if verificationCode.count <= 0 || verificationCode.count > 6 || !isValidVerificationCode() {
-                passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
+                passwordErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
                 return
             }
             code = verificationCode
         } else if signUpState == .password {
             if password.count <= 0 || verificationCode.count > 30 {
-                passwordErrorMessage = NSLocalizedString("*Please enter right Password code", tableName: "MemberCenterLocalizable", comment: "")
+                passwordErrorMessage = NSLocalizedString("Password error.", tableName: "MemberCenterLocalizable", comment: "")
                 return
             }
             code = password
         }
         if !privacyState {
             let alert = NSAlert()
-            alert.messageText = NSLocalizedString("请先同意并勾选上述协议", comment: "")
+            alert.messageText = NSLocalizedString("Please agree and check the above agreement first.", tableName: "MemberCenterLocalizable", comment: "")
             alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
 //            alert.beginSheetModal(for: NSApp.mainWindow!)
             let result = alert.runModal()
@@ -270,7 +270,7 @@ class KMSignUpViewModel: ObservableObject {
      */
     func enterVerificationCodeNextAction(_ complete: @escaping ForgotPasswordComplete) -> Void {
         if verificationCode.count <= 0 || verificationCode.count > 6 || !isValidVerificationCode() {
-            emailErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
+            emailErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
             complete(false, "")
             return
         }
@@ -282,7 +282,7 @@ class KMSignUpViewModel: ObservableObject {
             if success {
                 complete(true, "")
             } else {
-                self.passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
+                self.passwordErrorMessage = NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: "")
                 complete(false, "")
             }
         }
@@ -305,7 +305,7 @@ class KMSignUpViewModel: ObservableObject {
             if success {
                 print("验证邮箱成功")
             } else {
-                self.emailErrorMessage = NSLocalizedString("*Please enter right Address", tableName: "MemberCenterLocalizable", comment: "")
+                self.emailErrorMessage = NSLocalizedString("Please enter the correct email format", tableName: "MemberCenterLocalizable", comment: "")
             }
         }
     }
@@ -316,7 +316,7 @@ class KMSignUpViewModel: ObservableObject {
      */
     func resetPassword(_ complete: @escaping ForgotPasswordComplete) -> Void {
         if password.count <= 0 || verificationCode.count > 30 {
-            passwordErrorMessage = NSLocalizedString("*Please enter right Password code", tableName: "MemberCenterLocalizable", comment: "")
+            passwordErrorMessage = NSLocalizedString("Password error.", tableName: "MemberCenterLocalizable", comment: "")
             return
         }
         KMMemberCenterManager.manager.resetPassword(email: email, verifyCode: verificationCode, password: password) { [weak self] success, wrapper  in

+ 2 - 1
PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift

@@ -148,7 +148,8 @@ class KMUserInfoVCModel: ObservableObject {
                 let msg = resultDict.msg
                 if success {
                     self.refreshUserInfo { success, msg in
-                        // 撤销注销申请后刷新用户数据
+                        KMMemberPromptWC.shared.tipType = .cancelSignout
+                        KMMemberPromptWC.shared.showWindow(nil)
                     }
                 } else {
                     print(msg as Any)

+ 5 - 5
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.swift

@@ -42,13 +42,13 @@ class KMCloseAccountWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        titleLabel.stringValue = NSLocalizedString("删除您的账号和相关授权", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel.stringValue = NSLocalizedString("注销账号会永久删除一切账号数据,包括您在此账号下购买的其他端的PDF Reader Pro的权益。您确定要继续吗?", tableName: "MemberCenterLocalizable", comment: "")
-        productLabel.stringValue = NSLocalizedString("您的产品与服务:", tableName: "MemberCenterLocalizable", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Delete your account and related authorizations", tableName: "MemberCenterLocalizable", comment: "")
+        subTitleLabel.stringValue = NSLocalizedString("Removing your account will permanently delete all account data, including the membership benefits of PDF Reader Pro across all platforms you purchased under this account. Are you sure you want to continue?", tableName: "MemberCenterLocalizable", comment: "")
+        productLabel.stringValue = NSLocalizedString("Your products and services:", tableName: "MemberCenterLocalizable", comment: "")
         proLabel.stringValue = KMMemberInfo.shared.vip_productName
         aiLabel.stringValue = KMMemberInfo.shared.ai_productName
-        cancelButton.title = NSLocalizedString("取消", tableName: "MemberCenterLocalizable", comment: "")
-        yesButton.title = NSLocalizedString("删除我的账户", tableName: "MemberCenterLocalizable", comment: "")
+        cancelButton.title = NSLocalizedString("Cancel", tableName: "MemberCenterLocalizable", comment: "")
+        yesButton.title = NSLocalizedString("Remove Account", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {

+ 5 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.swift

@@ -15,7 +15,7 @@ class KMCloseApplyWC: NSWindowController {
     @IBOutlet weak var yesButton: NSButton!
     
     var currentTime: String = ""
-    var logOffTime: String = ""
+    var logOffTime: String = "7"
 
     private var viewModel = KMUserInfoVCModel()
     
@@ -36,9 +36,10 @@ class KMCloseApplyWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        titleLabel.stringValue = NSLocalizedString("账号注销申请已提交", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel.stringValue = String(format: NSLocalizedString("您的帐户将于%@自动注销。欢迎您再次使用PDF Reader Pro的产品与服务!\n在%@之前,您可以使用此帐户登入并选择撤销「注销帐户」,然后继续使用帐户,您享有的权益与产品服务将会保留。", tableName: "MemberCenterLocalizable", comment: ""), logOffTime, logOffTime)
-        yesButton.title = NSLocalizedString("知道了", tableName: "MemberCenterLocalizable", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Account cancellation application has been submitted", tableName: "MemberCenterLocalizable", comment: "")
+        subTitleLabel.stringValue = String(format: NSLocalizedString("Your account will be automatically deleted in %@ days. Welcome to use PDF Reader Pro again!\nYou can log in with this account and choose to Undo Remove Account within %ld days, and continue to use. The benefits and product services you enjoy will be retained.", tableName: "MemberCenterLocalizable", comment: ""), logOffTime, logOffTime)
+        
+        yesButton.title = NSLocalizedString("Got it", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {

+ 5 - 5
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift

@@ -47,12 +47,12 @@ class KMCloseVerificationWC: NSWindowController {
     // MARK: Private Method
     
     private func languageLocalized() -> Void {
-        titleLabel.stringValue = NSLocalizedString("验证您的身份", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel1.stringValue = NSLocalizedString("验证码已通过邮件发送至", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Verify your identity", tableName: "MemberCenterLocalizable", comment: "")
+        subTitleLabel1.stringValue = NSLocalizedString("We have sent you a code via email to", comment: "")
         subTitleLabel2.stringValue = KMMemberInfo.shared.userEmail
-        nextButton.title = NSLocalizedString("下一步", tableName: "MemberCenterLocalizable", comment: "")
-        verifficationErrorLabel.stringValue = String(format: "*%@", NSLocalizedString("Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: ""))
-        verifficationTextField.placeholderString = NSLocalizedString("Enter Verification code", tableName: "MemberCenterLocalizable", comment: "")
+        nextButton.title = NSLocalizedString("Next", tableName: "MemberCenterLocalizable", comment: "")
+        verifficationErrorLabel.stringValue = String(format: "%@", NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: ""))
+        verifficationTextField.placeholderString = NSLocalizedString("Please enter code", tableName: "MemberCenterLocalizable", comment: "")
     }
     
     private func initializeUI() -> Void {

+ 4 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,10 +16,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="196" y="240" width="661" height="443"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="661" height="443"/>
             <value key="maxSize" type="size" width="661" height="443"/>
             <view key="contentView" id="se5-gp-TjO">

+ 18 - 11
PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.swift

@@ -12,6 +12,8 @@ import Cocoa
     case logout = 0     // 验证码
     case unsubscribe    // 注销账户 存在会员中
     case signout        // 注销账户
+    case cancelSignout  // 撤销用户注销成功
+
 }
 
 class KMMemberPromptWC: NSWindowController {
@@ -47,19 +49,24 @@ class KMMemberPromptWC: NSWindowController {
         var cance = ""
         var yes = ""
         if tipType == .logout {
-            title = "退出登录"
-            subTitle = "确定要退出当前账号吗?"
-            cance = "Cancel"
-            yes = "Yes"
+            title = NSLocalizedString("Sign out", tableName: "MemberCenterLocalizable", comment: "")
+            subTitle = NSLocalizedString("Are you sure to sign out of your account?", tableName: "MemberCenterLocalizable", comment: "")
+            cance = NSLocalizedString("Cancel", tableName: "MemberCenterLocalizable", comment: "")
+            yes = NSLocalizedString("OK", tableName: "MemberCenterLocalizable", comment: "")
         } else if tipType == .unsubscribe {
-            title = "提示"
-            subTitle = "您当前处于会员订阅中,以防下个周期继续扣费,请先在支付平台取消订阅后,再操作注销账户"
-            yes = "知道了"
+            title = NSLocalizedString("Hint", tableName: "MemberCenterLocalizable", comment: "")
+            subTitle = NSLocalizedString("You are currently in a membership subscription. To prevent further deductions in the next cycle, please cancel your subscription on the payment platform before removing your account.", tableName: "MemberCenterLocalizable", comment: "")
+            cance = NSLocalizedString("Cancel", tableName: "MemberCenterLocalizable", comment: "")
+            yes = NSLocalizedString("Got it", tableName: "MemberCenterLocalizable", comment: "")
         } else if tipType == .signout {
-            title = "警告"
-            subTitle = "注销账号会永久删除一切账号数据,包括您在此账号下购买的其他端的PDF Reader Pro的权益。您确定要继续吗?"
-            cance = "Cancel"
-            yes = "Yes"
+            title = NSLocalizedString("Warning", tableName: "MemberCenterLocalizable", comment: "")
+            subTitle = NSLocalizedString("Removing your account will permanently delete all account data, including the membership benefits of PDF Reader Pro across all platforms you purchased under this account. Are you sure you want to continue?", tableName: "MemberCenterLocalizable", comment: "")
+            cance = NSLocalizedString("Cancel", tableName: "MemberCenterLocalizable", comment: "")
+            yes = NSLocalizedString("Continue", tableName: "MemberCenterLocalizable", comment: "")
+        } else if tipType == .cancelSignout {
+            title = NSLocalizedString("Undo Remove Account", tableName: "MemberCenterLocalizable", comment: "")
+            subTitle = NSLocalizedString("Restore your account successfully! Enjoy PDF Reader Pro now.", tableName: "MemberCenterLocalizable", comment: "")
+            yes = NSLocalizedString("Got it", tableName: "MemberCenterLocalizable", comment: "")
         }
         titleLabel.stringValue = NSLocalizedString(title, tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel.stringValue = NSLocalizedString(subTitle, tableName: "MemberCenterLocalizable", comment: "")

+ 8 - 0
PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -4265,3 +4265,11 @@
 
 "Note State" = "State";
 "View Bookmarks" = "View Bookmarks";
+
+
+"Benefit" = "Benefit";
+"Supported platforms" = "Supported platforms";
+"Maximum number of accessible devices" = "Maximum number of accessible devices";
+
+"2 devices" = "2 devices";
+"4 devices" = "2 devices";

+ 8 - 0
PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -4167,3 +4167,11 @@
 
 "Note State" = "状态";
 "View Bookmarks" = "查看书签";
+
+
+"Benefit" = "权益";
+"Supported platforms" = "多平台支持";
+"Maximum number of accessible devices" = "同时登录设备数";
+
+"2 devices" = "2台设备";
+"4 devices" = "4台设备";

+ 8 - 0
PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4297,3 +4297,11 @@
 
 "Note State" = "狀態";
 "View Bookmarks" = "查看書籤";
+
+
+"Benefit" = "權益";
+"Supported platforms" = "多平台支援";
+"Maximum number of accessible devices" = "同時登入設備數";
+
+"2 devices" = "2台設備";
+"4 devices" = "4台設備";