【fix】多个文案bug修复

PDF Office/PDF Master/Class/Common/Window/KMNotesPanelController.swift

@@ -9,6 +9,15 @@ import Cocoa
 
 class KMNotesPanelController: NSWindowController {
 
+    @IBOutlet weak var textBtn: NSButton!
+    @IBOutlet weak var AnchoredBtn: NSButton!
+    @IBOutlet weak var circleBtn: NSButton!
+    @IBOutlet weak var rectangleBtn: NSButton!
+    @IBOutlet weak var highlightBtn: NSButton!
+    @IBOutlet weak var underlineBtn: NSButton!
+    @IBOutlet weak var strikeThroughBtn: NSButton!
+    @IBOutlet weak var lineBtn: NSButton!
+    
     private static var _existFlag = false
     static let shared: KMNotesPanelController = {
         let windowC = KMNotesPanelController(windowNibName: "NotesPanel")
@@ -28,6 +37,16 @@ class KMNotesPanelController: NSWindowController {
         super.windowDidLoad()
     
         self.windowFrameAutosaveName = self.SKNotesPanelFrameAutosaveName
+        
+        self.window?.title = NSLocalizedString("Notes", comment: "")
+        self.textBtn.title = NSLocalizedString("Text", comment: "")
+        self.AnchoredBtn.title = NSLocalizedString("Anchored", comment: "")
+        self.circleBtn.title = NSLocalizedString("Circle", comment: "")
+        self.rectangleBtn.title = NSLocalizedString("Rectangle", comment: "")
+        self.highlightBtn.title = NSLocalizedString("Highlight", comment: "")
+        self.underlineBtn.title = NSLocalizedString("Underline", comment: "")
+        self.strikeThroughBtn.title = NSLocalizedString("Strikethrough", comment: "")
+        self.lineBtn.title = NSLocalizedString("Line", comment: "")
     }
     
     @IBAction func addNote(_ sender: Any?) {

PDF Office/PDF Master/Class/Common/Window/NotesPanel.xib

@@ -6,8 +6,16 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMNotesPanelController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMNotesPanelController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
+                <outlet property="AnchoredBtn" destination="8" id="WZ4-HL-WW3"/>
+                <outlet property="circleBtn" destination="15" id="6Jr-aW-qRb"/>
+                <outlet property="highlightBtn" destination="17" id="xQh-hp-mk6"/>
+                <outlet property="lineBtn" destination="20" id="88z-7L-SE6"/>
+                <outlet property="rectangleBtn" destination="16" id="8fp-gD-Bba"/>
+                <outlet property="strikeThroughBtn" destination="19" id="SBb-7N-c0M"/>
+                <outlet property="textBtn" destination="7" id="0f2-Fb-i5X"/>
+                <outlet property="underlineBtn" destination="18" id="8m5-As-fiu"/>
                 <outlet property="window" destination="5" id="21"/>
             </connections>
         </customObject>
@@ -17,7 +25,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="242" y="611" width="288" height="128"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="203" height="113"/>
             <view key="contentView" id="6">
                 <rect key="frame" x="0.0" y="0.0" width="288" height="128"/>

PDF Office/PDF Master/Class/PDFTools/FindSearch/KMSearchFindView.swift

@@ -33,6 +33,9 @@ class KMSearchFindView: KMBaseXibView {
         findField.delegate = self
         
         refreshSearchBarMenu()
+        
+        self.showAllButton.title = NSLocalizedString("Show All", comment: "")
+        self.doneButton.title = NSLocalizedString("Done", comment: "")
     }
 
     private func refreshSearchBarMenu() {

PDF Office/PDF Master/Class/PDFTools/SelfSign/Window/KMProfileInfoWindowController.xib

@@ -7,7 +7,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMProfileInfoWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMProfileInfoWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="addButton" destination="Tj7-dF-cXg" id="zcz-NP-Al4"/>
                 <outlet property="addNewInfoButton" destination="KmW-Wb-5U4" id="axV-bJ-832"/>
@@ -24,7 +24,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="585" height="460"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="350" height="250"/>
             <value key="maxSize" type="size" width="700" height="460"/>
             <view key="contentView" misplaced="YES" id="se5-gp-TjO">
@@ -128,7 +128,7 @@ DQ
                         </constraints>
                     </customView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HcI-gL-dgj">
-                        <rect key="frame" x="38" y="398" width="37" height="18"/>
+                        <rect key="frame" x="38" y="396" width="37" height="18"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="YeK-uM-b3g">
                             <font key="font" size="13" name="PingFangSC-Regular"/>
                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -136,13 +136,13 @@ DQ
                         </textFieldCell>
                     </textField>
                     <scrollView autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P2P-jH-JNm">
-                        <rect key="frame" x="40" y="74" width="584" height="323"/>
+                        <rect key="frame" x="40" y="74" width="584" height="321"/>
                         <clipView key="contentView" id="Txz-Kp-TvA">
-                            <rect key="frame" x="1" y="1" width="582" height="321"/>
+                            <rect key="frame" x="1" y="1" width="582" height="319"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="ldR-2V-TXt">
-                                    <rect key="frame" x="0.0" y="0.0" width="582" height="321"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="582" height="319"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
@@ -159,7 +159,7 @@ DQ
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <prototypeCellViews>
-                                                <tableCellView identifier="Normal" misplaced="YES" id="VL0-rw-bVq" customClass="KMProfileCellView" customModule="PDF_Master" customModuleProvider="target">
+                                                <tableCellView identifier="Normal" misplaced="YES" id="VL0-rw-bVq" customClass="KMProfileCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="0.0" width="518" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
@@ -170,7 +170,7 @@ DQ
                                                                 <font key="font" metaFont="system"/>
                                                             </buttonCell>
                                                         </button>
-                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jaJ-ef-ZVq" customClass="KMProfileTextField">
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jaJ-ef-ZVq">
                                                             <rect key="frame" x="6" y="-1" width="171" height="18"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="dsfdfsdf" id="ZHq-Kp-fZd">
                                                                 <font key="font" size="13" name="PingFangSC-Regular"/>
@@ -178,7 +178,7 @@ DQ
                                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                             </textFieldCell>
                                                         </textField>
-                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EAb-dY-AtZ" customClass="KMProfileTextField">
+                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EAb-dY-AtZ">
                                                             <rect key="frame" x="173" y="-1" width="339" height="18"/>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="right" title="ddddd" id="5VQ-la-WIf">
                                                                 <font key="font" size="13" name="PingFangSC-Regular"/>
@@ -204,7 +204,7 @@ DQ
                                                         <outlet property="textField" destination="jaJ-ef-ZVq" id="GzH-wx-MQQ"/>
                                                     </connections>
                                                 </tableCellView>
-                                                <tableCellView identifier="TitleCell" id="FUh-ze-Iiz" customClass="KMProfileTitleCellView" customModule="PDF_Master" customModuleProvider="target">
+                                                <tableCellView identifier="TitleCell" id="FUh-ze-Iiz" customClass="KMProfileTitleCellView" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                     <rect key="frame" x="0.0" y="17" width="518" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/Split/View/KMSecondaryPDFView.swift

@@ -139,7 +139,7 @@ class KMSecondaryPDFView: CPDFListView {
             // fill it
             for i in 0 ..< numberOfDefaultItems {
                 cnt = i
-                label = Bundle.main.localizedString(forKey: SKDefaultScaleMenuLabels[i], value: "", table: "ZoomValues")
+                label = Bundle.main.localizedString(forKey: SKDefaultScaleMenuLabels[i], value: "", table: "")
                 width = NSWidth(label!.boundingRect(with: size, options: NSString.DrawingOptions(rawValue: 0), attributes: attrs))
                 if (width > maxWidth) {
                     maxWidth = width

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -1208,7 +1208,7 @@ extension KMToolbarViewController {
             item?.image = NSImage(named: "KMImageNameUXIconToolbarEditNor")
             item?.boxImagePosition = .imageAbove
             item?.btnTag = KMToolbarViewType.editPDF.rawValue
-            item?.toolTip = NSLocalizedString("Edit text and image in PDF", comment: "")
+            item?.toolTip = NSLocalizedString("Edit text and image in PDF ", comment: "")
             item?.selectBackgroundType = .imageBox
             item?.btnAction = #selector(leftControllButtonAction)
             item?.promptIdentifier = identifier

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMTextFieldSheetController.swift

@@ -28,7 +28,9 @@ class KMTextFieldSheetController: NSWindowController {
         super.windowDidLoad()
         
         KMTextFieldSheetController.windowController = self
-        pageLabel.stringValue = NSLocalizedString("Page:", comment: "")
+        pageLabel.stringValue = NSLocalizedString("Page", comment: "") + ":"
+        self.cancelButton.title = NSLocalizedString("Cancel", comment: "")
+        self.okButton.title = NSLocalizedString("OK", comment: "")
     }
     
     var stringValue: String {