【2025】【综合】

1、多语修改
2、水印，背景模板列表完善

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Background/Views/KMBGTemplateController.swift

@@ -267,21 +267,19 @@ extension KMBGTemplateController: NSCollectionViewDelegate, NSCollectionViewData
     public func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
         return KMBackgroundManager.defaultManager.datas.count
     }
-     
+    
     public func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
-        if indexPath.item >= KMBackgroundManager.defaultManager.datas.count {
-            return NSCollectionViewItem()
-        }
-        
         let item: KMBGTemplateItem = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMBGTemplateItem"), for: indexPath) as! KMBGTemplateItem
-        item.delegate = self
-        item.backgroundModel = KMBackgroundManager.defaultManager.datas[indexPath.item]
-        if let selData = selectedBackground {
-            if item.backgroundModel == selData {
-                item.isSelected = true
+        if indexPath.item >= KMBackgroundManager.defaultManager.datas.count {
+            item.delegate = self
+            item.backgroundModel = KMBackgroundManager.defaultManager.datas[indexPath.item]
+            if let selData = selectedBackground {
+                if item.backgroundModel == selData {
+                    item.isSelected = true
+                }
             }
+            item.reloadData()
         }
-        item.reloadData()
         return item
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/EditTool/Watermark/Views/Templates/KMNWatermarkTemplateController.swift

@@ -271,15 +271,12 @@ extension KMNWatermarkTemplateController: NSCollectionViewDelegate, NSCollection
     }
     
     public func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
-        if indexPath.item >= KMWatermarkManager.defaultManager.watermarks.count {
-            return NSCollectionViewItem()
-        }
-        
         let item: KMNWatermarkTemplateItem = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMNWatermarkTemplateItem"), for: indexPath) as! KMNWatermarkTemplateItem
-        item.delegate = self
-        item.watermark = KMWatermarkManager.defaultManager.watermarks[indexPath.item]
-        item.reloadData()
-        
+        if indexPath.item < KMWatermarkManager.defaultManager.watermarks.count {
+            item.delegate = self
+            item.watermark = KMWatermarkManager.defaultManager.watermarks[indexPath.item]
+            item.reloadData()
+        }
         return item
     }
     

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -9810,7 +9810,7 @@ extension KMMainViewController {
             textFieldSheet.close()
         }
         
-        if NSColorPanel.shared.isVisible == true {
+        if NSColorPanel.sharedColorPanelExists == true {
             NSColorPanel.shared.close()
         }
         

PDF Office/PDF Master/KMClass/KMPDFViewController/Toolbar/KMPDFSecToolbarController.swift

@@ -148,7 +148,7 @@ class KMPDFSecToolbarController: KMNBaseViewController {
                 } else if buttonProperty.identifier == KMPDFToolbar_sign_Identifier {
                     button.toolTip = KMLocalizedString("Sign document by typing or drawing a signature", comment: "")
                 } else if buttonProperty.identifier == KMPDFToolbar_measure_Identifier {
-                    button.toolTip = KMLocalizedString("Measuring distances, perimeters and areas of objects.", comment: "")
+                    button.toolTip = KMLocalizedString("Measuring distances, perimeters and areas of objects", comment: "")
                 } else if buttonProperty.identifier == KMPDFToolbar_eye_Identifier {
                     button.toolTip = KMLocalizedString("Hide", comment: "")
                     if self.pdfView?.hideNotes == true {

PDF Office/PDF Master/Strings/ar.lproj/Localizable.strings

@@ -5073,7 +5073,7 @@
 "This page has already been bookmarked." = "تم بالفعل وضع إشارة مرجعية على هذه الصفحة.";
 "Are you sure you want to apply edits to this outline?" = "هل أنت متأكد أنك تريد تطبيق التعديلات على هذا المخطط؟";
 "Display Field Name" = "عرض اسم الحقل";
-"Measuring distances, perimeters and areas of objects." = "قياس المسافات والمحيطات ومساحات الأشياء.";
+"Measuring distances, perimeters and areas of objects" = "قياس المسافات والمحيطات ومساحات الأشياء.";
 "Display Label" = "تسمية العرض";
 "Dynamic Stamp Setting" = "إعداد الطوابع الديناميكية";
 "Click + button at the upper right corner to add a new signature." = "انقر فوق الزر + في الزاوية اليمنى العليا لإضافة توقيع جديد.";
@@ -5084,7 +5084,6 @@
 "Click ESC to exit touchpad mode." = "انقر فوق ESC للخروج من وضع لوحة اللمس.";
 "Crop" = "اقتصاص";
 "Rotate & Flip" = "تدوير والوجه";
-"Measuring distances, perimeters and areas of objects." = "قياس المسافات والمحيطات ومساحات الأشياء.";
 "Remove Selected Files from your Recent Files?" = "هل ترغب في إزالة الملفات المحددة من ملفاتك الحديثة؟";
 "The file will disappear from the recent list." = "سيختفي الملف من القائمة الأخيرة.";
 "Remove Files from your Recent Files?" = "هل ترغب في إزالة الملفات من ملفاتك الحديثة؟";

PDF Office/PDF Master/Strings/de.lproj/Localizable.strings

@@ -3518,7 +3518,7 @@
 "This page has already been bookmarked." = "Diese Seite wurde bereits mit einem Lesezeichen versehen.";
 "Are you sure you want to apply edits to this outline?" = "Sind Sie sicher, dass Sie Änderungen an dieser Gliederung vornehmen möchten?";
 "Display Field Name" = "Feldname anzeigen";
-"Measuring distances, perimeters and areas of objects." = "Messen von Entfernungen, Umfängen und Flächen von Objekten.";
+"Measuring distances, perimeters and areas of objects" = "Messen von Entfernungen, Umfängen und Flächen von Objekten";
 "Display Label" = "Beschriftung anzeigen";
 "Dynamic Stamp Setting" = "Dynamische Stempeleinstellung";
 "Click + button at the upper right corner to add a new signature." = "Klicken Sie oben rechts auf die Schaltfläche „+“, um eine neue Signatur hinzuzufügen.";
@@ -3529,7 +3529,6 @@
 "Click ESC to exit touchpad mode." = "Klicken Sie auf ESC, um den Touchpad-Modus zu verlassen.";
 "Crop" = "Ernte";
 "Rotate & Flip" = "Drehen und spiegeln";
-"Measuring distances, perimeters and areas of objects." = "Messen von Entfernungen, Umfängen und Flächen von Objekten.";
 "Remove Selected Files from your Recent Files?" = "Ausgewählte Dateien aus Ihren zuletzt verwendeten Dateien entfernen?";
 "The file will disappear from the recent list." = "Die Datei verschwindet aus der Liste „Letzte Dateien“.";
 "Remove Files from your Recent Files?" = "Dateien aus Ihren zuletzt verwendeten Dateien entfernen?";

PDF Office/PDF Master/Strings/es.lproj/Localizable.strings

@@ -3440,7 +3440,7 @@
 "This page has already been bookmarked." = "Esta página ya ha sido marcada como favorita.";
 "Are you sure you want to apply edits to this outline?" = "¿Está seguro de que desea aplicar modificaciones a este esquema?";
 "Display Field Name" = "Nombre del campo mostrado";
-"Measuring distances, perimeters and areas of objects." = "Medición de distancias, perímetros y áreas de objetos.";
+"Measuring distances, perimeters and areas of objects" = "Medición de distancias, perímetros y áreas de objetos";
 "Display Label" = "Etiqueta de visualización";
 "Dynamic Stamp Setting" = "Configuración de sello dinámico";
 "Click + button at the upper right corner to add a new signature." = "Haga clic en el botón + en la esquina superior derecha para agregar una nueva firma.";
@@ -3451,7 +3451,6 @@
 "Click ESC to exit touchpad mode." = "Haga clic en ESC para salir del modo de panel táctil.";
 "Crop" = "Cultivo";
 "Rotate & Flip" = "Girar y voltear";
-"Measuring distances, perimeters and areas of objects." = "Medición de distancias, perímetros y áreas de objetos.";
 "Remove Selected Files from your Recent Files?" = "¿Eliminar archivos seleccionados de sus archivos recientes?";
 "The file will disappear from the recent list." = "El archivo desaparecerá de la lista reciente.";
 "Remove Files from your Recent Files?" = "¿Eliminar archivos de sus archivos recientes?";

PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings

@@ -3470,7 +3470,7 @@
 "This page has already been bookmarked." = "Cette page a déjà été ajoutée à vos favoris.";
 "Are you sure you want to apply edits to this outline?" = "Êtes-vous sûr de vouloir appliquer les modifications à ce plan ?";
 "Display Field Name" = "Afficher le nom du champ";
-"Measuring distances, perimeters and areas of objects." = "Mesurer les distances, les périmètres et les zones d'objets.";
+"Measuring distances, perimeters and areas of objects" = "Mesurer les distances, les périmètres et les zones d'objets";
 "Display Label" = "Afficher l'étiquette";
 "Dynamic Stamp Setting" = "Paramètre de tampon dynamique";
 "Click + button at the upper right corner to add a new signature." = "Cliquez sur le bouton + dans le coin supérieur droit pour ajouter une nouvelle signature.";
@@ -3481,7 +3481,6 @@
 "Click ESC to exit touchpad mode." = "Cliquez sur ESC pour quitter le mode pavé tactile.";
 "Crop" = "Recadrer";
 "Rotate & Flip" = "Faire pivoter et retourner";
-"Measuring distances, perimeters and areas of objects." = "Mesurer les distances, les périmètres et les zones d'objets.";
 "Remove Selected Files from your Recent Files?" = "Supprimer les fichiers sélectionnés de vos fichiers récents ?";
 "The file will disappear from the recent list." = "Le fichier disparaîtra de la liste récente.";
 "Remove Files from your Recent Files?" = "Supprimer des fichiers de vos fichiers récents ?";

PDF Office/PDF Master/Strings/it.lproj/Localizable.strings

@@ -3398,7 +3398,7 @@
 "This page has already been bookmarked." = "Questa pagina è già stata aggiunta ai segnalibri.";
 "Are you sure you want to apply edits to this outline?" = "Sei sicuro di voler applicare le modifiche a questa struttura?";
 "Display Field Name" = "Visualizza nome campo";
-"Measuring distances, perimeters and areas of objects." = "Misurare distanze, perimetri e aree di oggetti.";
+"Measuring distances, perimeters and areas of objects" = "Misurare distanze, perimetri e aree di oggetti";
 "Display Label" = "Etichetta di visualizzazione";
 "Dynamic Stamp Setting" = "Impostazione timbro dinamico";
 "Click + button at the upper right corner to add a new signature." = "Fare clic sul pulsante + nell'angolo in alto a destra per aggiungere una nuova firma.";
@@ -3409,7 +3409,6 @@
 "Click ESC to exit touchpad mode." = "Fare clic su ESC per uscire dalla modalità touchpad.";
 "Crop" = "Raccolto";
 "Rotate & Flip" = "Ruota e capovolgi";
-"Measuring distances, perimeters and areas of objects." = "Misurare distanze, perimetri e aree di oggetti.";
 "Remove Selected Files from your Recent Files?" = "Rimuovere i file selezionati dai file recenti?";
 "The file will disappear from the recent list." = "Il file scomparirà dall'elenco recente.";
 "Remove Files from your Recent Files?" = "Rimuovere file dai file recenti?";

PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -3677,7 +3677,7 @@
 "This page has already been bookmarked." = "このページはすでにブックマークされています。";
 "Are you sure you want to apply edits to this outline?" = "このアウトラインに編集を適用してもよろしいですか?";
 "Display Field Name" = "表示フィールド名";
-"Measuring distances, perimeters and areas of objects." = "物体の距離、周長、面積を測定します。";
+"Measuring distances, perimeters and areas of objects" = "物体の距離、周長、面積を測定します";
 "Display Label" = "表示ラベル";
 "Dynamic Stamp Setting" = "ダイナミックスタンプ設定";
 "Click + button at the upper right corner to add a new signature." = "右上隅にある + ボタンをクリックして、新しい署名を追加します。";
@@ -3688,7 +3688,6 @@
 "Click ESC to exit touchpad mode." = "ESC をクリックしてタッチパッド モードを終了します。";
 "Crop" = "作物";
 "Rotate & Flip" = "回転と反転";
-"Measuring distances, perimeters and areas of objects." = "物体の距離、周長、面積を測定します。";
 "Remove Selected Files from your Recent Files?" = "選択したファイルを最近使ったファイルから削除しますか?";
 "The file will disappear from the recent list." = "ファイルが最近のリストから消えます。";
 "Remove Files from your Recent Files?" = "最近使ったファイルからファイルを削除しますか?";

PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings

@@ -3161,7 +3161,7 @@
 "This page has already been bookmarked." = "Deze pagina is al gemarkeerd als bladwijzer.";
 "Are you sure you want to apply edits to this outline?" = "Weet u zeker dat u bewerkingen op dit overzicht wilt toepassen?";
 "Display Field Name" = "Veldnaam weergeven";
-"Measuring distances, perimeters and areas of objects." = "Meten van afstanden, omtrekken en oppervlakken van objecten.";
+"Measuring distances, perimeters and areas of objects" = "Meten van afstanden, omtrekken en oppervlakken van objecten";
 "Display Label" = "Etiket weergeven";
 "Dynamic Stamp Setting" = "Dynamische stempelinstelling";
 "Click + button at the upper right corner to add a new signature." = "Klik op de + knop in de rechterbovenhoek om een ​​nieuwe handtekening toe te voegen.";
@@ -3172,7 +3172,6 @@
 "Click ESC to exit touchpad mode." = "Klik op ESC om de touchpad-modus te verlaten.";
 "Crop" = "Gewas";
 "Rotate & Flip" = "Draaien en spiegelen";
-"Measuring distances, perimeters and areas of objects." = "Meten van afstanden, omtrekken en oppervlakken van objecten.";
 "Remove Selected Files from your Recent Files?" = "Geselecteerde bestanden verwijderen uit uw recente bestanden?";
 "The file will disappear from the recent list." = "Het bestand verdwijnt uit de recente lijst.";
 "Remove Files from your Recent Files?" = "Bestanden verwijderen uit uw recente bestanden?";

PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings

@@ -3277,7 +3277,7 @@
 "This page has already been bookmarked." = "Ta strona została już dodana do zakładek.";
 "Are you sure you want to apply edits to this outline?" = "Czy na pewno chcesz zastosować zmiany w tym konspekcie?";
 "Display Field Name" = "Wyświetl nazwę pola";
-"Measuring distances, perimeters and areas of objects." = "Pomiar odległości, obwodów i powierzchni obiektów.";
+"Measuring distances, perimeters and areas of objects" = "Pomiar odległości, obwodów i powierzchni obiektów";
 "Display Label" = "Wyświetl etykietę";
 "Dynamic Stamp Setting" = "Dynamiczne ustawienie stempla";
 "Click + button at the upper right corner to add a new signature." = "Kliknij przycisk + w prawym górnym rogu, aby dodać nowy podpis.";
@@ -3288,7 +3288,6 @@
 "Click ESC to exit touchpad mode." = "Kliknij ESC, aby wyjść z trybu touchpada.";
 "Crop" = "Przyciąć";
 "Rotate & Flip" = "Obróć i odwróć";
-"Measuring distances, perimeters and areas of objects." = "Pomiar odległości, obwodów i powierzchni obiektów.";
 "Remove Selected Files from your Recent Files?" = "Usunąć wybrane pliki z ostatnich plików?";
 "The file will disappear from the recent list." = "Plik zniknie z listy ostatnich.";
 "Remove Files from your Recent Files?" = "Usunąć pliki z ostatnich plików?";

PDF Office/PDF Master/Strings/pt.lproj/Localizable.strings

@@ -5070,7 +5070,7 @@
 "This page has already been bookmarked." = "Esta página já foi marcada.";
 "Are you sure you want to apply edits to this outline?" = "Tem certeza de que deseja aplicar edições a este esboço?";
 "Display Field Name" = "Exibir nome do campo";
-"Measuring distances, perimeters and areas of objects." = "Medir distâncias, perímetros e áreas de objetos.";
+"Measuring distances, perimeters and areas of objects" = "Medir distâncias, perímetros e áreas de objetos";
 "Display Label" = "Etiqueta de exibição";
 "Dynamic Stamp Setting" = "Configuração de carimbo dinâmico";
 "Click + button at the upper right corner to add a new signature." = "Clique no botão + no canto superior direito para adicionar uma nova assinatura.";
@@ -5081,7 +5081,6 @@
 "Click ESC to exit touchpad mode." = "Clique em ESC para sair do modo touchpad.";
 "Crop" = "Cortar";
 "Rotate & Flip" = "Girar e virar";
-"Measuring distances, perimeters and areas of objects." = "Medir distâncias, perímetros e áreas de objetos.";
 "Remove Selected Files from your Recent Files?" = "Remover arquivos selecionados de seus arquivos recentes?";
 "The file will disappear from the recent list." = "O arquivo desaparecerá da lista recente.";
 "Remove Files from your Recent Files?" = "Remover arquivos dos seus arquivos recentes?";

PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings

@@ -3340,7 +3340,7 @@
 "This page has already been bookmarked." = "Эта страница уже добавлена ​​в закладки.";
 "Are you sure you want to apply edits to this outline?" = "Вы уверены, что хотите применить изменения к этой схеме?";
 "Display Field Name" = "Имя поля отображения";
-"Measuring distances, perimeters and areas of objects." = "Измерение расстояний, периметров и площадей объектов.";
+"Measuring distances, perimeters and areas of objects" = "Измерение расстояний, периметров и площадей объектов";
 "Display Label" = "Отображаемая этикетка";
 "Dynamic Stamp Setting" = "Динамическая настройка штампа";
 "Click + button at the upper right corner to add a new signature." = "Нажмите кнопку + в правом верхнем углу, чтобы добавить новую подпись.";
@@ -3351,7 +3351,6 @@
 "Click ESC to exit touchpad mode." = "Нажмите ESC, чтобы выйти из режима сенсорной панели.";
 "Crop" = "Обрезать";
 "Rotate & Flip" = "Поворот и переворот";
-"Measuring distances, perimeters and areas of objects." = "Измерение расстояний, периметров и площадей объектов.";
 "Remove Selected Files from your Recent Files?" = "Удалить выбранные файлы из последних файлов?";
 "The file will disappear from the recent list." = "Файл исчезнет из списка последних.";
 "Remove Files from your Recent Files?" = "Удалить файлы из последних файлов?";

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

@@ -4596,7 +4596,7 @@
 "This page has already been bookmarked." = "此页面已有书签。";
 "Are you sure you want to apply edits to this outline?" = "您确定要保存此更改吗？";
 "Display Field Name" = "显示表单域名称";
-"Measuring distances, perimeters and areas of objects." = "测量物体距离，周长和面积。";
+"Measuring distances, perimeters and areas of objects" = "测量物体距离，周长和面积";
 "Display Label" = "显示标签";
 "Dynamic Stamp Setting" = "动态图章设置";
 "Click + button at the upper right corner to add a new signature." = "点击右上角+号，创建新的签名。";
@@ -4607,7 +4607,6 @@
 "Click ESC to exit touchpad mode." = "点击ESC键，退出手绘板模式。";
 "Crop" = "裁剪";
 "Rotate & Flip" = "旋转 & 翻转";
-"Measuring distances, perimeters and areas of objects." = "测量物体距离，周长和面积。";
 "Remove Selected Files from your Recent Files?" = "您确定要从最近文件中删除选中的文档吗？";
 "The file will disappear from the recent list." = "此文档将不再显示在最近文件中。";
 "Remove Files from your Recent Files?" = "您确定要从最近文件中删除这些文档吗？";

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

@@ -4494,7 +4494,7 @@
 "This page has already been bookmarked." = "此頁面已有書籤。";
 "Are you sure you want to apply edits to this outline?" = "您確定要儲存此變更嗎？";
 "Display Field Name" = "顯示表單域名稱";
-"Measuring distances, perimeters and areas of objects." = "測量物體距離，週長和麵積。";
+"Measuring distances, perimeters and areas of objects" = "測量物體距離，週長和麵積";
 "Display Label" = "顯示標籤";
 "Dynamic Stamp Setting" = "動態圖章設定";
 "Click + button at the upper right corner to add a new signature." = "點選右上角+號，建立新的簽名。";
@@ -4505,7 +4505,6 @@
 "Click ESC to exit touchpad mode." = "點選ESC鍵，退出手繪板模式。";
 "Crop" = "裁切";
 "Rotate & Flip" = "旋轉 & 翻轉";
-"Measuring distances, perimeters and areas of objects." = "測量物體距離，週長和麵積。";
 "Remove Selected Files from your Recent Files?" = "您確定要從最近文件中刪除選取的文件嗎？";
 "The file will disappear from the recent list." = "此文件將不再顯示在最近文件中。";
 "Remove Files from your Recent Files?" = "您確定要從最近文件中刪除這些文件嗎？";