【订阅】整理文案调整、确认

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.swift

@@ -49,7 +49,7 @@ class KMComparativeView: KMBaseXibView {
                 ["title": "Basic functions like annotation and viewing",
                  "state": 2,
                  "color": "#252629"],
-                ["title": "Convert PDF to Office (Only first ten pages)",
+                ["title": "Convert PDF to Office (Only first 10 pages)",
                  "state": 2,
                  "color": "#252629"],
                 ["title": "Merge only 2 files for free",
@@ -60,7 +60,7 @@ class KMComparativeView: KMBaseXibView {
         ],
         [
             "type": 1,
-            "title": "Annual Plan",
+            "title": "Yearly Plan",
             "subtitle": "$79.99",
             "describe": "Save 50%@ for the first year, auto-renew at %@. Billed yearly.",
             "productId": PRODUCT_1,
@@ -77,7 +77,7 @@ class KMComparativeView: KMBaseXibView {
                 ["title": "Convert PDF to Office without limitation",
                  "state": 1,
                  "color": "#252629"],
-                ["title": "Batch Merge files without limitation",
+                ["title": "Batch merge files without limitation",
                  "state": 1,
                  "color": "#252629"]
             ],

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -63,6 +63,11 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
     
     var isContinue: Bool?
     var isAI: Bool?
+    var type: KMSubscribeWaterMarkType? {
+        didSet {
+            self.waterMarkView.type = type
+        }
+    }
     
     deinit {
         KMPrint("KMSubscribeWaterMarkWindowController 释放")
@@ -115,6 +120,8 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
             window.beginSheet(subscribeWaterMarkWindowController.window!)
             subscribeWaterMarkWindowController.window?.center()
             
+            subscribeWaterMarkWindowController.type = type
+            
             subscribeWaterMarkWindowController.closeAction = { controller in
                 completion(false, false, true)
                 subscribeWaterMarkMainWindow?.endSheet(controller.window!)
@@ -163,7 +170,7 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
                     if KMLightMemberManager.manager.isLogin() {
                         subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Convert First 10 Pages", comment: "")
                     } else {
-                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Cancel", comment: "")
+                        subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Later", comment: "")
                     }
                 } else {
                     subscribeWaterMarkWindowController.waterMarkView.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -35,6 +35,12 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
     
     var dataArray: [[String: String]] = [[:]]
     
+    var type: KMSubscribeWaterMarkType? {
+        didSet {
+            self.updateLanguage()
+        }
+    }
+    
     var afterLoginDataArray = [
         ["title": "Save without watermark",
          "subtitle": "When you save a document with PDF Master after editing, no watermark will be attached",
@@ -46,7 +52,7 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
          "subtitle": "Convert PDF to Office and image without any limitations, get converted files in high quality",
          "image": "convert"],
         ["title": "Batch Processing",
-         "subtitle": "Trial Version users can convert only 2 files at a time in batch processing.",
+         "subtitle": "The trial version can merge only 2 files at a time in batch processing",
          "image": "merging"]
     ]
     
@@ -132,16 +138,21 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
             self.waterExportButton.title = NSLocalizedString("Save with Watermark", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Upgrade Now", comment: "")
         } else {
-            self.subtitleContentHeightConstraint.constant = 60
+            self.subtitleContentHeightConstraint.constant = 80
             self.collectionContentViewHeightConstraint.constant = 180
-            self.collectionViewContentTopConstraint.constant = 96
+            self.collectionViewContentTopConstraint.constant = 116
             self.titleLabel.stringValue = NSLocalizedString("Login Benefits", comment: "")
             self.waterExportButton.title = NSLocalizedString("Save with Watermark ", comment: "")
             self.subscribeLabel.stringValue = NSLocalizedString("Login or Sign up", comment: "")
         }
 //        + "  " + NSLocalizedString("Subscription", comment: ""
         
-        let subtitleString = NSLocalizedString("This is a trial version. While saving, PDF Master's watermark will be added to the document.", comment: "")
+        var subtitleString = ""
+        if type == .merge {
+            subtitleString = NSLocalizedString("The trial version can merge only 2 files at a time in batch processing. Login or sign up PDF Master to speed your workflow!", comment: "")
+        } else {
+            subtitleString = NSLocalizedString("Login or sign up PDF Master lets you enjoy all features including annotating, text editing and page organization for FREE!", comment: "")
+        }
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .left