Pārlūkot izejas kodu

【多语】整体多语替换

lizhe 1 gadu atpakaļ
vecāks
revīzija
4ac9b619ea
26 mainītis faili ar 117 papildinājumiem un 80 dzēšanām
  1. 3 3
      PDF Office/PDF Office DMG/Base.lproj/Main.storyboard
  2. 4 5
      PDF Office/PDF Office Pro/Base.lproj/Main.storyboard
  3. 12 12
      PDF Office/PDF Office.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 7 8
      PDF Office/PDF Office/Base.lproj/Main.storyboard
  5. 2 3
      PDF Office/PDF Office/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.xib
  6. 8 8
      PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift
  7. 2 2
      PDF Office/PDF Office/Class/Merge/OCPart/KMPDFEditAppendWindow.m
  8. 2 3
      PDF Office/PDF Office/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/TextRecognition/KMBatchTextRecognitionView.xib
  9. 1 1
      PDF Office/PDF Office/Class/PDFTools/Convert/Controller/KMConvertCSVWindowController.swift
  10. 1 1
      PDF Office/PDF Office/Class/PDFTools/Convert/Controller/KMConvertImageWindowController.swift
  11. 1 1
      PDF Office/PDF Office/Class/PDFTools/PageEdit/View/KMPageEditSplitSettingView.swift
  12. 1 1
      PDF Office/PDF Office/Class/PDFTools/Secure/Window/KMPasswordInputWindow.swift
  13. 2 2
      PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift
  14. 2 2
      PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/BookMarks/KMBookMarkViewController.swift
  15. 1 1
      PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineViewController.swift
  16. 1 1
      PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/ViewPanel/KMPDFViewPanelSetViewController.swift
  17. 1 1
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m
  18. 2 3
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.xib
  19. 2 3
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.xib
  20. 4 4
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m
  21. 4 5
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.xib
  22. 1 1
      PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m
  23. 1 1
      PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController.swift
  24. 1 1
      PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceDisplayController.swift
  25. 1 1
      PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceGeneralController.swift
  26. 50 6
      PDF Office/PDF Office/Strings/en.lproj/Localizable.strings

+ 3 - 3
PDF Office/PDF Office DMG/Base.lproj/Main.storyboard

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <scenes>
     <scenes>
@@ -15,7 +15,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="PDF Office DMG" systemMenu="apple" id="uQy-DD-JDr">
                                 <menu key="submenu" title="PDF Office DMG" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
                                     <items>
-                                        <menuItem title="About PDF Office DMG" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Master DMG" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>

+ 4 - 5
PDF Office/PDF Office Pro/Base.lproj/Main.storyboard

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <scenes>
     <scenes>
@@ -16,7 +15,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="PDF Office Pro" systemMenu="apple" id="uQy-DD-JDr">
                                 <menu key="submenu" title="PDF Office Pro" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
                                     <items>
-                                        <menuItem title="About PDF Office Pro" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Master Pro" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -89,7 +88,7 @@
                                                 <action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
                                                 <action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
                                             </connections>
                                             </connections>
                                         </menuItem>
                                         </menuItem>
-                                        <menuItem title="Save" keyEquivalent="s" id="pxx-59-PXV">
+                                        <menuItem title="Save" keyEquivalent="s" id="pxx-59-PXV">
                                             <connections>
                                             <connections>
                                                 <action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
                                                 <action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
                                             </connections>
                                             </connections>

+ 12 - 12
PDF Office/PDF Office.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1574,7 +1574,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "416"
             startingLineNumber = "416"
             endingLineNumber = "416"
             endingLineNumber = "416"
-            landmarkName = "deleteBookMark(bookMarks:)"
+            landmarkName = "renamePDFBook(bookmark:label:)"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2049,7 +2049,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "376"
             startingLineNumber = "376"
             endingLineNumber = "376"
             endingLineNumber = "376"
-            landmarkName = "mouseUp(with:)"
+            landmarkName = "dealConfirmButtonEnabledState(enabled:)"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2447,7 +2447,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "596"
             startingLineNumber = "596"
             endingLineNumber = "596"
             endingLineNumber = "596"
-            landmarkName = "printItemAction(menu:)"
+            landmarkName = "cutItemAction(menu:)"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2527,8 +2527,8 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "143"
             startingLineNumber = "143"
             endingLineNumber = "143"
             endingLineNumber = "143"
-            landmarkName = "renameBookAction()"
-            landmarkType = "7">
+            landmarkName = "KMBookMarkViewController"
+            landmarkType = "3">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
       <BreakpointProxy
       <BreakpointProxy
@@ -2543,7 +2543,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "384"
             startingLineNumber = "384"
             endingLineNumber = "384"
             endingLineNumber = "384"
-            landmarkName = "changeLocation(oldBookMark:newBookMark:)"
+            landmarkName = "cancelSelect()"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2591,7 +2591,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "297"
             startingLineNumber = "297"
             endingLineNumber = "297"
             endingLineNumber = "297"
-            landmarkName = "renameItemAction()"
+            landmarkName = "editItemAction()"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2671,7 +2671,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "418"
             startingLineNumber = "418"
             endingLineNumber = "418"
             endingLineNumber = "418"
-            landmarkName = "addOutlineToIndex(index:pageIndex:destination:lable:parent:)"
+            landmarkName = "renameOutlineWithRow(row:)"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -2687,7 +2687,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "306"
             startingLineNumber = "306"
             endingLineNumber = "306"
             endingLineNumber = "306"
-            landmarkName = "changeItemAction()"
+            landmarkName = "editItemAction()"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -3002,7 +3002,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "104"
             startingLineNumber = "104"
             endingLineNumber = "104"
             endingLineNumber = "104"
-            landmarkName = "-observeValueForKeyPath:ofObject:change:context:"
+            landmarkName = "-windowDidLoad"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -3130,7 +3130,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "89"
             startingLineNumber = "89"
             endingLineNumber = "89"
             endingLineNumber = "89"
-            landmarkName = "-buttonItemClick_Sure:"
+            landmarkName = "-windowDidLoad"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
@@ -3146,7 +3146,7 @@
             endingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "51"
             startingLineNumber = "51"
             endingLineNumber = "51"
             endingLineNumber = "51"
-            landmarkName = "-updateAnnotation:"
+            landmarkName = "+sharedInstance"
             landmarkType = "7">
             landmarkType = "7">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>

+ 7 - 8
PDF Office/PDF Office/Base.lproj/Main.storyboard

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <scenes>
     <scenes>
@@ -16,7 +15,7 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="PDF Office" systemMenu="apple" id="uQy-DD-JDr">
                                 <menu key="submenu" title="PDF Office" systemMenu="apple" id="uQy-DD-JDr">
                                     <items>
                                     <items>
-                                        <menuItem title="About PDF Office" id="5kV-Vb-QxS">
+                                        <menuItem title="About PDF Master" id="5kV-Vb-QxS">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                             <connections>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
                                                 <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@@ -41,7 +40,7 @@
                                                 <action selector="loginMenuItemAction:" target="Voe-Tx-rLC" id="Qbe-Sg-Ydf"/>
                                                 <action selector="loginMenuItemAction:" target="Voe-Tx-rLC" id="Qbe-Sg-Ydf"/>
                                             </connections>
                                             </connections>
                                         </menuItem>
                                         </menuItem>
-                                        <menuItem title="Check My Account" tag="13" id="nq4-M6-pi1" userLabel="Login">
+                                        <menuItem title="Check Account" tag="13" id="nq4-M6-pi1" userLabel="Login">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                             <connections>
                                                 <action selector="manageAcctounMenuAction:" target="Voe-Tx-rLC" id="Xf5-Nw-xkh"/>
                                                 <action selector="manageAcctounMenuAction:" target="Voe-Tx-rLC" id="Xf5-Nw-xkh"/>
@@ -421,13 +420,13 @@ CA
                                                             <action selector="menuItemAction_rotateRight:" target="Ady-hI-5gd" id="QLa-bA-ofq"/>
                                                             <action selector="menuItemAction_rotateRight:" target="Ady-hI-5gd" id="QLa-bA-ofq"/>
                                                         </connections>
                                                         </connections>
                                                     </menuItem>
                                                     </menuItem>
-                                                    <menuItem title="Rotate All Page Left" keyEquivalent="l" id="Tc0-dN-hhQ">
+                                                    <menuItem title="Rotate All Pages to Left" keyEquivalent="l" id="Tc0-dN-hhQ">
                                                         <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateAllPageLeft:" target="Ady-hI-5gd" id="WCU-wG-vXs"/>
                                                             <action selector="menuItemAction_rotateAllPageLeft:" target="Ady-hI-5gd" id="WCU-wG-vXs"/>
                                                         </connections>
                                                         </connections>
                                                     </menuItem>
                                                     </menuItem>
-                                                    <menuItem title="Rotate All Page Right" keyEquivalent="r" id="N4r-93-ANT">
+                                                    <menuItem title="Rotate All Pages to Right" keyEquivalent="r" id="N4r-93-ANT">
                                                         <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                                         <connections>
                                                         <connections>
                                                             <action selector="menuItemAction_rotateAllPageRight:" target="Ady-hI-5gd" id="Je3-vd-JMY"/>
                                                             <action selector="menuItemAction_rotateAllPageRight:" target="Ady-hI-5gd" id="Je3-vd-JMY"/>
@@ -717,7 +716,7 @@ CA
                                                 <action selector="menuItemAction_mergeAllWindow:" target="Ady-hI-5gd" id="V3i-nt-dmD"/>
                                                 <action selector="menuItemAction_mergeAllWindow:" target="Ady-hI-5gd" id="V3i-nt-dmD"/>
                                             </connections>
                                             </connections>
                                         </menuItem>
                                         </menuItem>
-                                        <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+                                        <menuItem title="Front All Windows" id="LE2-aR-0XJ">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                             <connections>
                                                 <action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
                                                 <action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>

+ 2 - 3
PDF Office/PDF Office/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <objects>
     <objects>

+ 8 - 8
PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift

@@ -209,14 +209,14 @@ class KMVerificationCodeView: KMBaseXibView {
             item?.isEnabled = !self.isNetworking
             item?.isEnabled = !self.isNetworking
         }
         }
         
         
-//        if self.verificationCode.count == 6 &&
-////            self.time != -1 &&
-//            self.codeIsTrue {
-//            self.cancellationButtonVC.enabled = true
-//        } else {
-//            self.cancellationButtonVC.enabled = false
-//            self.showAlert(result: Result(code: 0))
-//        }
+        if self.verificationCode.count == 6 &&
+//            self.time != -1 &&
+            self.codeIsTrue {
+            self.cancellationButtonVC.enabled = true
+        } else {
+            self.cancellationButtonVC.enabled = false
+            self.showAlert(result: Result(code: 0))
+        }
     }
     }
     
     
     override func updateLanguage() {
     override func updateLanguage() {

+ 2 - 2
PDF Office/PDF Office/Class/Merge/OCPart/KMPDFEditAppendWindow.m

@@ -1302,7 +1302,7 @@ static KMPDFEditAppendWindow *windowController = nil;
     NSOpenPanel *openPanel = [[NSOpenPanel alloc] init];
     NSOpenPanel *openPanel = [[NSOpenPanel alloc] init];
     [openPanel setAllowedFileTypes:[KMImageAccessoryController supportedImageTypes]];
     [openPanel setAllowedFileTypes:[KMImageAccessoryController supportedImageTypes]];
     [openPanel setAllowsMultipleSelection:YES];
     [openPanel setAllowsMultipleSelection:YES];
-    openPanel.message = NSLocalizedString(@"Select multiple files on the key disk ⌘/⇧", nil);
+    openPanel.message = NSLocalizedString(@"Press ⌘/⇧ to select multiple files", nil);
     [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result){
     [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result){
         
         
         if (result == NSModalResponseOK) {
         if (result == NSModalResponseOK) {
@@ -1332,7 +1332,7 @@ static KMPDFEditAppendWindow *windowController = nil;
     [openPanel setAllowsMultipleSelection:YES];
     [openPanel setAllowsMultipleSelection:YES];
     openPanel.canChooseFiles = NO;
     openPanel.canChooseFiles = NO;
     openPanel.canChooseDirectories = YES;
     openPanel.canChooseDirectories = YES;
-    openPanel.message = NSLocalizedString(@"Select multiple files on the key disk ⌘/⇧", nil);
+    openPanel.message = NSLocalizedString(@"Press ⌘/⇧ to select multiple files", nil);
     [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result){
     [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result){
         
         
         if (result == NSModalResponseOK) {
         if (result == NSModalResponseOK) {

+ 2 - 3
PDF Office/PDF Office/Class/PDFTools/Batch/View/Choose/ConvertPDF/Views/TextRecognition/KMBatchTextRecognitionView.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <objects>
     <objects>

+ 1 - 1
PDF Office/PDF Office/Class/PDFTools/Convert/Controller/KMConvertCSVWindowController.swift

@@ -21,7 +21,7 @@ class KMConvertCSVWindowController: KMConvertBaseWindowController {
     override func windowDidLoad() {
     override func windowDidLoad() {
         super.windowDidLoad()
         super.windowDidLoad()
 
 
-        titleLabel.stringValue = NSLocalizedString("Save as CSV Settings", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         let view = KMConvertCSVSettingView.createFromNib()
         let view = KMConvertCSVSettingView.createFromNib()
         view?.frame = rightScrollView.bounds
         view?.frame = rightScrollView.bounds
         view?.autoresizingMask = NSView.AutoresizingMask(rawValue: 18)
         view?.autoresizingMask = NSView.AutoresizingMask(rawValue: 18)

+ 1 - 1
PDF Office/PDF Office/Class/PDFTools/Convert/Controller/KMConvertImageWindowController.swift

@@ -34,7 +34,7 @@ class KMConvertImageWindowController: KMConvertBaseWindowController {
     override func windowDidLoad() {
     override func windowDidLoad() {
         super.windowDidLoad()
         super.windowDidLoad()
 
 
-        titleLabel.stringValue = NSLocalizedString("Save as Image Settings", comment: "")
+        titleLabel.stringValue = NSLocalizedString("Settings", comment: "")
         let view = KMConvertImageSettingView.createFromNib()
         let view = KMConvertImageSettingView.createFromNib()
         view?.frame = rightScrollView.bounds
         view?.frame = rightScrollView.bounds
         view?.autoresizingMask = NSView.AutoresizingMask(rawValue: 18)
         view?.autoresizingMask = NSView.AutoresizingMask(rawValue: 18)

+ 1 - 1
PDF Office/PDF Office/Class/PDFTools/PageEdit/View/KMPageEditSplitSettingView.swift

@@ -71,7 +71,7 @@ class KMPageEditSplitSettingView: KMPageEditSettingBaseView {
         
         
         self.pageRangeRadio.title = NSLocalizedString("Split by page atmosphere", comment: "")
         self.pageRangeRadio.title = NSLocalizedString("Split by page atmosphere", comment: "")
         self.pageRangeComboBox.removeAllItems()
         self.pageRangeComboBox.removeAllItems()
-        self.pageRangeComboBox.addItems(withObjectValues: ["Old pages","Even pages","Custom"])
+        self.pageRangeComboBox.addItems(withObjectValues: ["Odd Pages","Even Pages","Customize"])
         self.pageRangeComboBox.placeholderString = "e.g. 1,3-5,10"
         self.pageRangeComboBox.placeholderString = "e.g. 1,3-5,10"
         self.pageRangeComboBox.selectItem(at: 0)
         self.pageRangeComboBox.selectItem(at: 0)
         self.pageRangeComboBox.isEditable = false
         self.pageRangeComboBox.isEditable = false

+ 1 - 1
PDF Office/PDF Office/Class/PDFTools/Secure/Window/KMPasswordInputWindow.swift

@@ -186,7 +186,7 @@ private var passwordInputWindow_private: KMPasswordInputWindow?
         }
         }
         
         
         if passwordErrorLabel != nil {
         if passwordErrorLabel != nil {
-            passwordErrorLabel.stringValue = NSLocalizedString("Tips Text", comment: "")
+            passwordErrorLabel.stringValue = NSLocalizedString("Password error", comment: "")
             passwordErrorLabel.font = NSFont.systemFont(ofSize: 12)
             passwordErrorLabel.font = NSFont.systemFont(ofSize: 12)
             passwordErrorLabel.wantsLayer = true
             passwordErrorLabel.wantsLayer = true
             passwordErrorLabel.textColor = NSColor(hex: "#F3465B")
             passwordErrorLabel.textColor = NSColor(hex: "#F3465B")

+ 2 - 2
PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift

@@ -95,7 +95,7 @@ class KMAnnotationViewController: KMSideViewController {
         
         
 
 
         if self.annotationShowState == .none {
         if self.annotationShowState == .none {
-            self.bigTipLabel.stringValue = NSLocalizedString("No markup found", comment: "")
+            self.bigTipLabel.stringValue = NSLocalizedString("No Annotations", comment: "")
             
             
             let title = NSLocalizedString("All annotations will be displayed here.", comment: "")
             let title = NSLocalizedString("All annotations will be displayed here.", comment: "")
             let paragraphStyle = NSMutableParagraphStyle()
             let paragraphStyle = NSMutableParagraphStyle()
@@ -103,7 +103,7 @@ class KMAnnotationViewController: KMSideViewController {
             paragraphStyle.alignment = .center
             paragraphStyle.alignment = .center
             self.tipLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegular(12)])
             self.tipLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C"), NSAttributedString.Key.font: NSFont.SFProTextRegular(12)])
         } else {
         } else {
-            self.bigTipLabel.stringValue = NSLocalizedString("No markup found", comment: "")
+            self.bigTipLabel.stringValue = NSLocalizedString("No Annotations", comment: "")
             self.tipLabel.stringValue = ""
             self.tipLabel.stringValue = ""
         }
         }
     }
     }

+ 2 - 2
PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/BookMarks/KMBookMarkViewController.swift

@@ -75,9 +75,9 @@ class KMBookMarkViewController: NSViewController, NSTextFieldDelegate {
         
         
         self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
         self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
         self.bigTipLabel.textColor = NSColor(hex: "#616469")
         self.bigTipLabel.textColor = NSColor(hex: "#616469")
-        self.bigTipLabel.stringValue = NSLocalizedString("No Outlines", comment: "")
+        self.bigTipLabel.stringValue = NSLocalizedString("No Bookmarks", comment: "")
         
         
-        let title = NSLocalizedString("Please right-click on the selected page and select Add Bookmark, or click the Add button on the upper right to create a bookmark.", comment: "")
+        let title = NSLocalizedString("To create a bookmark, please right-click on the selected page and choose \"Add Bookmark\", or click \"Add\" button in the upper right corner.", comment: "")
         let paragraphStyle = NSMutableParagraphStyle()
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .center
         paragraphStyle.alignment = .center

+ 1 - 1
PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Outline/KMOutlineViewController.swift

@@ -78,7 +78,7 @@ class KMOutlineViewController: NSViewController {
         self.lineView.backgroundColor(NSColor(hex: "#EDEEF0"))
         self.lineView.backgroundColor(NSColor(hex: "#EDEEF0"))
         
         
         
         
-        let title = NSLocalizedString("Please right-click on the selected page and select Add Outline, or click the Add button on the upper right to create a outline.", comment: "")
+        let title = NSLocalizedString("To create an outline, please right-click on the selected page and choose \"Add Outline\", or click \"Add\" in the upper right corner.", comment: "")
         let paragraphStyle = NSMutableParagraphStyle()
         let paragraphStyle = NSMutableParagraphStyle()
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.lineHeightMultiple = 1.32
         paragraphStyle.alignment = .center
         paragraphStyle.alignment = .center

+ 1 - 1
PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/ViewPanel/KMPDFViewPanelSetViewController.swift

@@ -75,7 +75,7 @@ class KMPDFViewPanelSetViewController: NSViewController {
         self.mainTitleLabel.stringValue = NSLocalizedString("View", comment: "")
         self.mainTitleLabel.stringValue = NSLocalizedString("View", comment: "")
         self.slideLabel.stringValue = NSLocalizedString("Read Mode", comment: "")
         self.slideLabel.stringValue = NSLocalizedString("Read Mode", comment: "")
         self.bookLabel.stringValue = NSLocalizedString("Book Mode", comment: "")
         self.bookLabel.stringValue = NSLocalizedString("Book Mode", comment: "")
-        self.doublePageLabel.stringValue = NSLocalizedString("Two Page", comment: "")
+        self.doublePageLabel.stringValue = NSLocalizedString("Two Pages", comment: "")
         self.singlePageLabel.stringValue = NSLocalizedString("Single Page", comment: "")
         self.singlePageLabel.stringValue = NSLocalizedString("Single Page", comment: "")
         self.readLabel.stringValue = NSLocalizedString("PPT", comment: "")
         self.readLabel.stringValue = NSLocalizedString("PPT", comment: "")
         self.rotationLabel.stringValue = NSLocalizedString("Rotate", comment: "")
         self.rotationLabel.stringValue = NSLocalizedString("Rotate", comment: "")

+ 1 - 1
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.m

@@ -446,7 +446,7 @@
     else
     else
         title = @"";
         title = @"";
     if(_annotations.count > 1) {
     if(_annotations.count > 1) {
-        title = NSLocalizedString(@"General Properties", nil);
+        title = NSLocalizedString(@"Properties", nil);
     }
     }
     self.titleLabel.stringValue = title;
     self.titleLabel.stringValue = title;
     self.titleViewHeightConstraint.constant = 40;
     self.titleViewHeightConstraint.constant = 40;

+ 2 - 3
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMAnnotationPropertiesViewController.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <objects>
     <objects>

+ 2 - 3
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

+ 4 - 4
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m

@@ -60,8 +60,8 @@ KMSigntureViewItemDelegate>
 
 
 - (void)updateLanguage {
 - (void)updateLanguage {
     self.signatureLabel.stringValue = NSLocalizedString(@"Signature", nil);
     self.signatureLabel.stringValue = NSLocalizedString(@"Signature", nil);
-    self.emptyTipLabel.stringValue = NSLocalizedString(@"No signature created", nil);
-    self.emptyMinTipLabel.stringValue = NSLocalizedString(@"Click the Add button in the upper right corner to create a new signature.", nil);
+    self.emptyTipLabel.stringValue = NSLocalizedString(@"No Signatures", nil);
+    self.emptyMinTipLabel.stringValue = NSLocalizedString(@"Click \"Add\" in the upper right corner to create a new signature.", nil);
     
     
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
     paragraphStyle.lineHeightMultiple = 1.32;
     paragraphStyle.lineHeightMultiple = 1.32;
@@ -255,8 +255,8 @@ KMSigntureViewItemDelegate>
 
 
 - (void)deleteAllCustomizeStamp {
 - (void)deleteAllCustomizeStamp {
     NSAlert *alert = [[NSAlert alloc] init];
     NSAlert *alert = [[NSAlert alloc] init];
-    alert.messageText = NSLocalizedString(@"Are you sure you want to delete all signatures?", nil);
-    alert.informativeText = NSLocalizedString(@"All signatures will disappear from the list.", nil);
+    alert.messageText = NSLocalizedString(@"All signatures will disappear from the list", nil);
+    alert.informativeText = NSLocalizedString(@"All signatures will disappear from the list", nil);
     [alert addButtonWithTitle:NSLocalizedString(@"Delete", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Delete", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
     if ([alert runModal] != NSAlertFirstButtonReturn) { /// 取消
     if ([alert runModal] != NSAlertFirstButtonReturn) { /// 取消

+ 4 - 5
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     </dependencies>
     <objects>
     <objects>
@@ -103,8 +102,8 @@
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="nosign" id="rfd-We-aPr"/>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="nosign" id="rfd-We-aPr"/>
                                             </imageView>
                                             </imageView>
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tbj-Oa-HOw">
                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tbj-Oa-HOw">
-                                                <rect key="frame" x="18" y="68" width="131" height="16"/>
-                                                <textFieldCell key="cell" lineBreakMode="clipping" title="No signature created" id="K2k-0V-W78">
+                                                <rect key="frame" x="39" y="68" width="90" height="16"/>
+                                                <textFieldCell key="cell" lineBreakMode="clipping" title="No Signatures" id="K2k-0V-W78">
                                                     <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="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

+ 1 - 1
PDF Office/PDF Office/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.m

@@ -515,7 +515,7 @@ static KMSignatureWindowController *windowController_signature;
     
     
     self.drawTipView.wantsLayer = YES;
     self.drawTipView.wantsLayer = YES;
     self.drawTipView.layer.backgroundColor = [NSColor colorWithRed:189/255.f green:223/255.f blue:253/255.f alpha:1.f].CGColor;
     self.drawTipView.layer.backgroundColor = [NSColor colorWithRed:189/255.f green:223/255.f blue:253/255.f alpha:1.f].CGColor;
-    self.drawTipLabel.stringValue = NSLocalizedString(@"Press any key to disabled the touchpad.", nil);
+    self.drawTipLabel.stringValue = NSLocalizedString(@"Press any key to disable the touchpad", nil);
     self.drawTipLabel.textColor = [NSColor colorWithRed:37/255.f green:38/255.f blue:41/255.f alpha:1.f];
     self.drawTipLabel.textColor = [NSColor colorWithRed:37/255.f green:38/255.f blue:41/255.f alpha:1.f];
     self.drawTipLabel.font = [NSFont fontWithName:@"SFProText-Regular" size:14];
     self.drawTipLabel.font = [NSFont fontWithName:@"SFProText-Regular" size:14];
     
     

+ 1 - 1
PDF Office/PDF Office/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -833,7 +833,7 @@ import Cocoa
     
     
     internal func saveDocumentWithProgressAlert(callback:@escaping KMCommonBlock) {
     internal func saveDocumentWithProgressAlert(callback:@escaping KMCommonBlock) {
         // 显示进度
         // 显示进度
-        self.showProgressWindow(message: NSLocalizedString("Saving PDF...", comment: ""))
+        self.showProgressWindow(message: NSLocalizedString("Save PDF", comment: ""))
         self.progressController?.maxValue = 3.0
         self.progressController?.maxValue = 3.0
         self.progressController?.increment(by: 1.0)
         self.progressController?.increment(by: 1.0)
         // 保存文档
         // 保存文档

+ 1 - 1
PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceDisplayController.swift

@@ -90,7 +90,7 @@ class KMPreferenceDisplayController: NSViewController {
         self.defaultDisplayLabel.stringValue = NSLocalizedString("Default display:", comment: "")
         self.defaultDisplayLabel.stringValue = NSLocalizedString("Default display:", comment: "")
         self.putAwayRadio.title = NSLocalizedString("Hide when opening a file", comment: "")
         self.putAwayRadio.title = NSLocalizedString("Hide when opening a file", comment: "")
         self.rememberLastSelectionRadio.title = NSLocalizedString("Remember the last selection when launching.", comment: "")
         self.rememberLastSelectionRadio.title = NSLocalizedString("Remember the last selection when launching.", comment: "")
-        self.showOutlineCheck.title = NSLocalizedString("Show outline list by default when outline is available", comment: "")
+        self.showOutlineCheck.title = NSLocalizedString("Show outline list by default when outline is available.", comment: "")
         
         
         self.leftSidePanel2Label.stringValue = NSLocalizedString("Left Side Panel", comment: "")
         self.leftSidePanel2Label.stringValue = NSLocalizedString("Left Side Panel", comment: "")
         self.displayLabel.stringValue = NSLocalizedString("Default display:", comment: "")
         self.displayLabel.stringValue = NSLocalizedString("Default display:", comment: "")

+ 1 - 1
PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceGeneralController.swift

@@ -135,7 +135,7 @@ class KMPreferenceGeneralController: NSViewController {
         self.authorLabel.textColor = NSColor(hex: "#000000D9")
         self.authorLabel.textColor = NSColor(hex: "#000000D9")
         
         
         self.maxDisplayNumberDespLabel.textColor = NSColor(white: 0, alpha: 0.5)
         self.maxDisplayNumberDespLabel.textColor = NSColor(white: 0, alpha: 0.5)
-        let string = "\(NSLocalizedString("minute", comment: ""))   "
+        let string = "\(NSLocalizedString("minutes", comment: ""))   "
         let attriText = NSMutableAttributedString(attributedString: NSAttributedString(string: string,attributes: [.foregroundColor : NSColor(white: 0, alpha: 0.85)]))
         let attriText = NSMutableAttributedString(attributedString: NSAttributedString(string: string,attributes: [.foregroundColor : NSColor(white: 0, alpha: 0.85)]))
         attriText.append(NSAttributedString(string: NSLocalizedString("(5 to 99)", comment: ""),attributes: [.foregroundColor : NSColor(white: 0, alpha: 0.5)]))
         attriText.append(NSAttributedString(string: NSLocalizedString("(5 to 99)", comment: ""),attributes: [.foregroundColor : NSColor(white: 0, alpha: 0.5)]))
         self.saveFilesDespLabl.attributedStringValue = attriText
         self.saveFilesDespLabl.attributedStringValue = attriText

+ 50 - 6
PDF Office/PDF Office/Strings/en.lproj/Localizable.strings

@@ -127,7 +127,7 @@
 "Style" = "Style";
 "Style" = "Style";
 //MARK: 签名
 //MARK: 签名
 "No Signatures" = "No Signatures";
 "No Signatures" = "No Signatures";
-"Click “Add” in the upper right corner to create a new signature." = "Click “Add” in the upper right corner to create a new signature.";
+"Click \"Add\" in the upper right corner to create a new signature." = "Click \"Add\" in the upper right corner to create a new signature.";
 "Create Signature" = "Create Signature";
 "Create Signature" = "Create Signature";
 "Keyboard" = "Keyboard";
 "Keyboard" = "Keyboard";
 "Trackpad" = "Trackpad";
 "Trackpad" = "Trackpad";
@@ -261,7 +261,7 @@
 // MARK: 菜单栏
 // MARK: 菜单栏
 
 
 // 工具栏
 // 工具栏
-"About PDF Office" = "About PDF Office";
+"About PDF Master" = "About PDF Master";
 "Preference Settings" = "Preference Settings";
 "Preference Settings" = "Preference Settings";
 "Manage Account" = "Manage Account";
 "Manage Account" = "Manage Account";
 "Check Account" = "Check Account";
 "Check Account" = "Check Account";
@@ -276,6 +276,9 @@
 "Hide Left Side Panel" = "Hide Left Side Panel";
 "Hide Left Side Panel" = "Hide Left Side Panel";
 "Hide Right Side Panel" = "Hide Right Side Panel";
 "Hide Right Side Panel" = "Hide Right Side Panel";
 "Hide Page Indicator" = "Hide Page Indicator";
 "Hide Page Indicator" = "Hide Page Indicator";
+
+"Rotate All Pages to Left" = "Rotate All Pages to Left";
+"Rotate All Pages to Right" = "Rotate All Pages to Right";
 // 帮助
 // 帮助
 "Free PDF Template" = "Free PDF Template";
 "Free PDF Template" = "Free PDF Template";
 "Subscribe Us" = "Subscribe Us";
 "Subscribe Us" = "Subscribe Us";
@@ -296,6 +299,9 @@
 "Settings" = "Settings";
 "Settings" = "Settings";
 "Text Recognition Settings" = "Text Recognition Settings";
 "Text Recognition Settings" = "Text Recognition Settings";
 "Recognize text if needed" = "Recognize text if needed";
 "Recognize text if needed" = "Recognize text if needed";
+"Odd Pages" = "Odd Pages";
+"Even Pages" = "Even Pages";
+"Customize" = "Customize";
 // excel
 // excel
 "Excel Worksheet Settings" = "Excel Worksheet Settings";
 "Excel Worksheet Settings" = "Excel Worksheet Settings";
 "All Content" = "All Content";
 "All Content" = "All Content";
@@ -333,7 +339,12 @@
 // MARK: - 压缩
 // MARK: - 压缩
 "Standard File Size" = "Standard File Size";
 "Standard File Size" = "Standard File Size";
 "Compressing..." = "Compressing...";
 "Compressing..." = "Compressing...";
+"Large File Size" = "Large File Size";
+"Small File Size" = "Small File Size";
+"Minimum File Size" = "Minimum File Size";
 
 
+//MARK: - 合并
+"Press ⌘/⇧ to select multiple files" = "Press ⌘/⇧ to select multiple files";
 // MARK: - 安全
 // MARK: - 安全
 "Document Open Password" = "Document Open Password";
 "Document Open Password" = "Document Open Password";
 "Open Password" = "Open Password";
 "Open Password" = "Open Password";
@@ -376,7 +387,7 @@
 // MARK: - 大纲
 // MARK: - 大纲
 "Are you sure you want to set the target location of the selected outline to the current page?" = "Are you sure you want to set the target location of the selected outline to the current page?";
 "Are you sure you want to set the target location of the selected outline to the current page?" = "Are you sure you want to set the target location of the selected outline to the current page?";
 "No Outlines" = "No Outlines";
 "No Outlines" = "No Outlines";
-"Please right-click on the selected page and select Add Outline, or click the Add button on the upper right to create a outline." = "Please right-click on the selected page and select Add Outline, or click the Add button on the upper right to create a outline.";
+"To create an outline, please right-click on the selected page and choose \"Add Outline\", or click \"Add\" in the upper right corner." = "To create an outline, please right-click on the selected page and choose \"Add Outline\", or click \"Add\" in the upper right corner.";
 
 
 // MARK: - 书签
 // MARK: - 书签
 
 
@@ -384,7 +395,6 @@
 "Change Destination" = "Change Destination";
 "Change Destination" = "Change Destination";
 "No Bookmarks" = "No Bookmarks";
 "No Bookmarks" = "No Bookmarks";
 "To create a bookmark, please right-click on the selected page and choose \"Add Bookmark\", or click \"Add\" button in the upper right corner." = "To create a bookmark, please right-click on the selected page and choose \"Add Bookmark\", or click \"Add\" button in the upper right corner.";
 "To create a bookmark, please right-click on the selected page and choose \"Add Bookmark\", or click \"Add\" button in the upper right corner." = "To create a bookmark, please right-click on the selected page and choose \"Add Bookmark\", or click \"Add\" button in the upper right corner.";
-"Please right-click on the selected page and select Add Bookmark, or click the Add button on the upper right to create a bookmark." = "Please right-click on the selected page and select Add Bookmark, or click the Add button on the upper right to create a bookmark.";
 
 
 // MARK: - 注释
 // MARK: - 注释
 
 
@@ -398,17 +408,22 @@
 
 
 // MARK: - 视图
 // MARK: - 视图
 
 
-"Two Page" = "Two Page";
+"Two Pages" = "Two Pages";
 "PPT" = "PPT";
 "PPT" = "PPT";
 "Read mode on, you can press ESC to exit." = "Read mode on, you can press ESC to exit.";
 "Read mode on, you can press ESC to exit." = "Read mode on, you can press ESC to exit.";
 "Read Mode Off" = "Read Mode Off";
 "Read Mode Off" = "Read Mode Off";
 "Read Mode On" = "Read Mode On";
 "Read Mode On" = "Read Mode On";
 // MARK: - 偏好设置
 // MARK: - 偏好设置
 
 
+"Annotation" = "Annotation";
+"minutes" = "minutes";
+"Open the last unclosed document when the APP starts" = "Open the last unclosed document when the APP starts";
+"Close File" = "Close File";
+"Book Continuous" = "Book Continuous";
 "Reopen last open files at startup" = "Reopen last open files at startup";
 "Reopen last open files at startup" = "Reopen last open files at startup";
 "Maximum number of documents displayed in recently opened files" = "Maximum number of documents displayed in recently opened files";
 "Maximum number of documents displayed in recently opened files" = "Maximum number of documents displayed in recently opened files";
 "Save files automatically, every" = "Save files automatically, every";
 "Save files automatically, every" = "Save files automatically, every";
-"minute" = "minute";
+"minutes" = "minutes";
 "Prompt to \"save/don't save\"" = "Prompt to \"save/don't save\"";
 "Prompt to \"save/don't save\"" = "Prompt to \"save/don't save\"";
 "No prompt, save directly" = "No prompt, save directly";
 "No prompt, save directly" = "No prompt, save directly";
 "Open Image File" = "Open Image File";
 "Open Image File" = "Open Image File";
@@ -530,6 +545,35 @@
 "Network error" = "Network error";
 "Network error" = "Network error";
 
 
 //MARK: - 补充多语
 //MARK: - 补充多语
+"Remember Password?" = "Remember Password?";
+"Do you want to save this password in your Keychain?" = "Do you want to save this password in your Keychain?";
+
+"Arrow" = "Arrow";
+"Clear background" = "Clear background";
+"Reselect" = "Reselect";
+"Remove white background from images" = "Remove white background from images";
+"Are you sure you want to delete all signatures?" = "Are you sure you want to delete all signatures?";
+"All signatures will disappear from the list" = "All signatures will disappear from the list";
+"Press any key to disable the touchpad" = "Press any key to disable the touchpad";
+"Password error" = "Password error";
+
+
+
+"The Brand New PDF Master" = "The Brand New PDF Master";
+"Enjoy All Advanced Features for Free for XX Days! View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity." = "Enjoy All Advanced Features for Free for XX Days! View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.";
+"Comment PDFs with Rich Annotation Tools" = "Comment PDFs with Rich Annotation Tools";
+"Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!" = "Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!";
+"Convert PDF to Office Fast and Easily" = "Convert PDF to Office Fast and Easily";
+"Convert PDF to editable Word, Excel, PPT, Text and image with all your fonts and formatting preserved." = "Convert PDF to editable Word, Excel, PPT, Text and image with all your fonts and formatting preserved.";
+"Fill out Form & Sign Documents" = "Fill out Form & Sign Documents";
+"Fill out forms effortlessly and add text, image or handwritten signatures to PDFs." = "Fill out forms effortlessly and add text, image or handwritten signatures to PDFs.";
+"Sign up to Unlock Premium Features" = "Sign up to Unlock Premium Features";
+"All advanced features in PDF Master can be used after registration, including converting PDFs without limitation." = "All advanced features in PDF Master can be used after registration, including converting PDFs without limitation.";
+"Remind Me Later" = "Remind Me Later";
+
+"Save PDF" = "Save PDF";
+"Please add notes" = "Please add notes";
+
 "The target page is invalid, please relocate it." = "The target page is invalid, please relocate it.";
 "The target page is invalid, please relocate it." = "The target page is invalid, please relocate it.";
 "Cancellation Submitted" = "Cancellation Submitted";
 "Cancellation Submitted" = "Cancellation Submitted";
 "Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again" = "Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again";
 "Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again" = "Your account will be canceled within 3 working days and there is no need to submit the application for cancellation again";