Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/Model/PropertyPanel/AnnotPanel/FontStyleItem.cs

@@ -136,7 +136,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
             List<PresetFontItem> fontStyleList = new List<PresetFontItem>();
             PresetFontItem custom = new PresetFontItem();
             custom.mTag = "Custom";
-            custom.mTagContent = "自定义";
+            custom.mTagContent =  App.MainPageLoader.GetString("PresetTextStyle_Customize");
 
             custom.mFontSize = 24;
             custom.mFontFamily = new FontFamily("Helvetica");
@@ -145,7 +145,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem h1 = new PresetFontItem();
             h1.mTag = "H1";
-            h1.mTagContent = "H1大标题";
+            h1.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_H1Title"); 
 
             h1.mFontSize = 36;
             h1.mFontFamily = new FontFamily("Helvetica");
@@ -154,8 +154,8 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem h2 = new PresetFontItem();
             h2.mTag = "H2";
-            h2.mTagContent = "H2（标准）";
-
+            h2.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_H2Title");
+
             h2.mFontSize = 24;
             h2.mFontFamily = new FontFamily("Helvetica");
             h2.mFontStyle = FontStyles.Normal;
@@ -163,7 +163,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem h3 = new PresetFontItem();
             h3.mTag = "H3";
-            h3.mTagContent = "H3小标题";
+            h3.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_H3Title");
 
             h3.mFontSize = 18;
             h3.mFontFamily = new FontFamily("Helvetica");
@@ -172,7 +172,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem b1 = new PresetFontItem();
             b1.mTag = "B1";
-            b1.mTagContent = "B1标题";
+            b1.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_B1NormalTextStandard");
 
             b1.mFontSize = 14;
             b1.mFontFamily = new FontFamily("Helvetica");
@@ -181,7 +181,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem b2 = new PresetFontItem();
             b2.mTag = "B2";
-            b2.mTagContent = "B2标题";
+            b2.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_B2NormalTextSmall");
 
             b2.mFontSize = 12;
             b2.mFontFamily = new FontFamily("Helvetica");
@@ -190,7 +190,7 @@ namespace PDF_Master.Model.PropertyPanel.AnnotPanel
 
             PresetFontItem b3 = new PresetFontItem();
             b3.mTag = "B3";
-            b3.mTagContent = "B3标题";
+            b3.mTagContent = App.MainPageLoader.GetString("PresetTextStyle_B3Description");
 
             b3.mFontSize = 11;
             b3.mFontFamily = new FontFamily("Helvetica");

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -2596,6 +2596,34 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Operation failed, try again please</source>
           <target state="new">Operation failed, try again please</target>
         </trans-unit>
+        <trans-unit id="PresetTextStyle_B1NormalTextStandard" translate="yes" xml:space="preserve">
+          <source>B1 Normal Text (Standard)</source>
+          <target state="new">B1 Normal Text (Standard)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B2NormalTextSmall" translate="yes" xml:space="preserve">
+          <source>B2 Normal Text (Small)</source>
+          <target state="new">B2 Normal Text (Small)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B3Description" translate="yes" xml:space="preserve">
+          <source>B3 Description</source>
+          <target state="new">B3 Description</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_Customize" translate="yes" xml:space="preserve">
+          <source>Customize</source>
+          <target state="new">Customize</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H1Title" translate="yes" xml:space="preserve">
+          <source>H1 Title</source>
+          <target state="new">H1 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H2Title" translate="yes" xml:space="preserve">
+          <source>H2 Title</source>
+          <target state="new">H2 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H3Title" translate="yes" xml:space="preserve">
+          <source>H3 Title</source>
+          <target state="new">H3 Title</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -2596,6 +2596,34 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Operation failed, try again please</source>
           <target state="new">Operation failed, try again please</target>
         </trans-unit>
+        <trans-unit id="PresetTextStyle_B1NormalTextStandard" translate="yes" xml:space="preserve">
+          <source>B1 Normal Text (Standard)</source>
+          <target state="new">B1 Normal Text (Standard)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B2NormalTextSmall" translate="yes" xml:space="preserve">
+          <source>B2 Normal Text (Small)</source>
+          <target state="new">B2 Normal Text (Small)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B3Description" translate="yes" xml:space="preserve">
+          <source>B3 Description</source>
+          <target state="new">B3 Description</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_Customize" translate="yes" xml:space="preserve">
+          <source>Customize</source>
+          <target state="new">Customize</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H1Title" translate="yes" xml:space="preserve">
+          <source>H1 Title</source>
+          <target state="new">H1 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H2Title" translate="yes" xml:space="preserve">
+          <source>H2 Title</source>
+          <target state="new">H2 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H3Title" translate="yes" xml:space="preserve">
+          <source>H3 Title</source>
+          <target state="new">H3 Title</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -2596,6 +2596,34 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Operation failed, try again please</source>
           <target state="new">Operation failed, try again please</target>
         </trans-unit>
+        <trans-unit id="PresetTextStyle_B1NormalTextStandard" translate="yes" xml:space="preserve">
+          <source>B1 Normal Text (Standard)</source>
+          <target state="new">B1 Normal Text (Standard)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B2NormalTextSmall" translate="yes" xml:space="preserve">
+          <source>B2 Normal Text (Small)</source>
+          <target state="new">B2 Normal Text (Small)</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_B3Description" translate="yes" xml:space="preserve">
+          <source>B3 Description</source>
+          <target state="new">B3 Description</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_Customize" translate="yes" xml:space="preserve">
+          <source>Customize</source>
+          <target state="new">Customize</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H1Title" translate="yes" xml:space="preserve">
+          <source>H1 Title</source>
+          <target state="new">H1 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H2Title" translate="yes" xml:space="preserve">
+          <source>H2 Title</source>
+          <target state="new">H2 Title</target>
+        </trans-unit>
+        <trans-unit id="PresetTextStyle_H3Title" translate="yes" xml:space="preserve">
+          <source>H3 Title</source>
+          <target state="new">H3 Title</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/Strings/MainPage/MainPage.Designer.cs

@@ -19,7 +19,7 @@ namespace PDF_Master.Strings.MainPage {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class MainPage {
@@ -1678,6 +1678,69 @@ namespace PDF_Master.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 B1 Normal Text (Standard) 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_B1NormalTextStandard {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_B1NormalTextStandard", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 B2 Normal Text (Small) 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_B2NormalTextSmall {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_B2NormalTextSmall", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 B3 Description 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_B3Description {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_B3Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Customize 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_Customize {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_Customize", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 H1 Title 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_H1Title {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_H1Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 H2 Title 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_H2Title {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_H2Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 H3 Title 的本地化字符串。
+        /// </summary>
+        public static string PresetTextStyle_H3Title {
+            get {
+                return ResourceManager.GetString("PresetTextStyle_H3Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Black and white 的本地化字符串。
         /// </summary>

PDF Office/Strings/MainPage/MainPage.resx

@@ -708,6 +708,27 @@ Drag files to reorder as you need.</value>
     <value>Recently Used</value>
     <comment>调色板-最近使用的颜色</comment>
   </data>
+  <data name="PresetTextStyle_B1NormalTextStandard" xml:space="preserve">
+    <value>B1 Normal Text (Standard)</value>
+  </data>
+  <data name="PresetTextStyle_B2NormalTextSmall" xml:space="preserve">
+    <value>B2 Normal Text (Small)</value>
+  </data>
+  <data name="PresetTextStyle_B3Description" xml:space="preserve">
+    <value>B3 Description</value>
+  </data>
+  <data name="PresetTextStyle_Customize" xml:space="preserve">
+    <value>Customize</value>
+  </data>
+  <data name="PresetTextStyle_H1Title" xml:space="preserve">
+    <value>H1 Title</value>
+  </data>
+  <data name="PresetTextStyle_H2Title" xml:space="preserve">
+    <value>H2 Title</value>
+  </data>
+  <data name="PresetTextStyle_H3Title" xml:space="preserve">
+    <value>H3 Title</value>
+  </data>
   <data name="PrintContents_Document" xml:space="preserve">
     <value>Document</value>
     <comment>【打印内容-下拉菜单】仅打印文档本身</comment>