文案-临时调整首页、偏好设置等部分模块文案

PDF Office/Helper/PDFToolsHelper.cs

@@ -170,27 +170,27 @@ namespace PDF_Master.Helper
             var convertPDF = new PDFToolsInit();
             convertPDF.SetFnType(PDFFnType.ConvertPDF);
             convertPDF.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/convert.png");
-            convertPDF.SetContent("转档PDF", "Batch convert, compress, secure, watermark PDFs.");
+            convertPDF.SetContent("转档PDF", "Convert PDFs to Word/Excel/PPT/HTML/Text/RTF/CSV/Image files");
             //图片转PDF
             var imageToPDF = new PDFToolsInit();
             imageToPDF.SetFnType(PDFFnType.ImageToPDF);
             imageToPDF.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/image.png");
-            imageToPDF.SetContent("Image To PDF", "Batch convert, compress, secure, watermark PDFs.");
+            imageToPDF.SetContent("Image To PDF", "Convert JPEG/JPG/PNG/TIFF/BMP files to PDF");
             //合并
             var merge = new PDFToolsInit();
             merge.SetFnType(PDFFnType.Merge);
             merge.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/merge.png");
-            merge.SetContent("Merge", "Batch convert, compress, secure, watermark PDFs.");
+            merge.SetContent("Merge", "Combine multiple documents into a new PDF file");
             //压缩
             var compress = new PDFToolsInit();
             compress.SetFnType(PDFFnType.Compress);
             compress.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/compress.png");
-            compress.SetContent("Compress", "Batch convert, compress, secure, watermark PDFs.");
+            compress.SetContent("Compress", "Reduce files size to make sure you can easily send them by mail");
             //安全
             var security = new PDFToolsInit();
             security.SetFnType(PDFFnType.Security);
             security.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/security.png");
-            security.SetContent("Security", "Batch convert, compress, secure, watermark PDFs.");
+            security.SetContent("Security", "Easily batch encrypt PDFs or decrypt the protected files");
             //文件对比
             var compareDoc = new PDFToolsInit();
             compareDoc.SetFnType(PDFFnType.CompareDoc);
@@ -200,22 +200,22 @@ namespace PDF_Master.Helper
             var pDFToPPT = new PDFToolsInit();
             pDFToPPT.SetFnType(PDFFnType.PDFToPPT);
             pDFToPPT.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-ppt.png");
-            pDFToPPT.SetContent("To PPT", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToPPT.SetContent("To PPT", "Turn your PDF into a formatted PPT file that you can edit");
             //PDF转Excel
             var pDFToExcel = new PDFToolsInit();
             pDFToExcel.SetFnType(PDFFnType.PDFToExcel);
             pDFToExcel.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-excel.png");
-            pDFToExcel.SetContent("To Excel", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToExcel.SetContent("To Excel", "Turn PDF table into a formatted Excel file");
             //PDF转Word
             var pDFToWord = new PDFToolsInit();
             pDFToWord.SetFnType(PDFFnType.PDFToWord);
             pDFToWord.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-word.png");
-            pDFToWord.SetContent("To Word", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToWord.SetContent("To Word", "Convert PDF to Word, Fonts&formatting get converted");
             //PDF转图片
             var pDFToImage = new PDFToolsInit();
             pDFToImage.SetFnType(PDFFnType.PDFToImage);
             pDFToImage.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-image.png");
-            pDFToImage.SetContent("To Image", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToImage.SetContent("To Image", "Convert PDF to image, such as JPEG, JPG, PNG, GIF, TIFF, TAG,BMP.");
             //水印
             var waterMark = new PDFToolsInit();
             waterMark.SetFnType(PDFFnType.WaterMark);

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -1904,8 +1904,8 @@ form</target>
           <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_TextBox" translate="yes" xml:space="preserve">
-          <source>Text Box:</source>
-          <target state="new">Text Box:</target>
+          <source>Text:</source>
+          <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_Underline" translate="yes" xml:space="preserve">
           <source>Underline:</source>
@@ -2544,6 +2544,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <target state="new">View pages continuously with scrolling enabled</target>
           <note from="MultilingualBuild" annotates="source" priority="2">[阅读页]通过滚动连续浏览多个页面</note>
         </trans-unit>
+        <trans-unit id="Settings_Annotation_Annotation_Font" translate="yes" xml:space="preserve">
+          <source>Annotation Default Font</source>
+          <target state="new">Annotation Default Font</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -1904,8 +1904,8 @@ form</target>
           <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_TextBox" translate="yes" xml:space="preserve">
-          <source>Text Box:</source>
-          <target state="new">Text Box:</target>
+          <source>Text:</source>
+          <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_Underline" translate="yes" xml:space="preserve">
           <source>Underline:</source>
@@ -2544,6 +2544,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <target state="new">View pages continuously with scrolling enabled</target>
           <note from="MultilingualBuild" annotates="source" priority="2">[阅读页]通过滚动连续浏览多个页面</note>
         </trans-unit>
+        <trans-unit id="Settings_Annotation_Annotation_Font" translate="yes" xml:space="preserve">
+          <source>Annotation Default Font</source>
+          <target state="new">Annotation Default Font</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -1904,8 +1904,8 @@ form</target>
           <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_TextBox" translate="yes" xml:space="preserve">
-          <source>Text Box:</source>
-          <target state="new">Text Box:</target>
+          <source>Text:</source>
+          <target state="new">Text:</target>
         </trans-unit>
         <trans-unit id="Settings_Annotation_Underline" translate="yes" xml:space="preserve">
           <source>Underline:</source>
@@ -2544,6 +2544,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <target state="new">View pages continuously with scrolling enabled</target>
           <note from="MultilingualBuild" annotates="source" priority="2">[阅读页]通过滚动连续浏览多个页面</note>
         </trans-unit>
+        <trans-unit id="Settings_Annotation_Annotation_Font" translate="yes" xml:space="preserve">
+          <source>Annotation Default Font</source>
+          <target state="new">Annotation Default Font</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", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class MainPage {
@@ -1959,6 +1959,15 @@ namespace PDF_Master.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Annotation Default Font 的本地化字符串。
+        /// </summary>
+        public static string Settings_Annotation_Annotation_Font {
+            get {
+                return ResourceManager.GetString("Settings_Annotation_Annotation_Font", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Circle Border: 的本地化字符串。
         /// </summary>
@@ -2050,7 +2059,7 @@ namespace PDF_Master.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Text Box: 的本地化字符串。
+        ///   查找类似 Text: 的本地化字符串。
         /// </summary>
         public static string Settings_Annotation_TextBox {
             get {

PDF Office/Strings/MainPage/MainPage.resx

@@ -815,6 +815,9 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
   <data name="Settings_Annotation_Annotation" xml:space="preserve">
     <value>Annotation Default Color</value>
   </data>
+  <data name="Settings_Annotation_Annotation_Font" xml:space="preserve">
+    <value>Annotation Default Font</value>
+  </data>
   <data name="Settings_Annotation_CircleBorder" xml:space="preserve">
     <value>Circle Border:</value>
   </data>
@@ -846,7 +849,7 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
     <value>Text:</value>
   </data>
   <data name="Settings_Annotation_TextBox" xml:space="preserve">
-    <value>Text Box:</value>
+    <value>Text:</value>
   </data>
   <data name="Settings_Annotation_Underline" xml:space="preserve">
     <value>Underline:</value>

PDF Office/ViewModels/Dialog/SettingsDialogViewModel.cs

@@ -546,6 +546,18 @@ namespace PDF_Master.ViewModels.Dialog
             }
         }
 
+        private string T_settings_Annotation_Font = "";
+
+        public string T_Settings_Annotation_Font
+        {
+            get { return T_settings_Annotation_Font; }
+            set
+            {
+                SetProperty(ref T_settings_Annotation_Font, value);
+            }
+        }
+
+
         private string _Settings_ResetAll = "";
 
         public string Settings_ResetAll
@@ -634,6 +646,7 @@ namespace PDF_Master.ViewModels.Dialog
             Settings_Display_Background = App.MainPageLoader.GetString("Settings_Display_Background");
             Settings_Display_Manually = App.MainPageLoader.GetString("Settings_Display_Manually");
             Settings_Display_Full = App.MainPageLoader.GetString("Settings_Display_Full");
+            T_Settings_Annotation_Font = App.MainPageLoader.GetString("Settings_Annotation_Annotation_Font");
         }
 
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -703,7 +703,7 @@ namespace PDF_Master.ViewModels
             }
         }
 
-        private string linkAnnotTipText = "Please use the scroll bar, thumbnail tool to locate the target page, click or box the area to select the target range";
+        private string linkAnnotTipText = "Turn to the target page, then click or box area on the page to select the target page where the link will jump.";
         private bool isCreateLink = false;
         internal bool IsRightMenuSelectedTextAddLink = false;
 

PDF Office/Views/Dialog/SettingsDialog.xaml

@@ -40,6 +40,7 @@
             <Style x:Key="Label2" TargetType="Label">
                 <Setter Property="Foreground" Value="{StaticResource color.sys.text.neutral.lv1}" />
                 <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="FontFamily" Value="Segoe UI" />
                 <Setter Property="FontSize" Value="14" />
             </Style>
             <Style x:Key="RadioButtonStyle1" TargetType="{x:Type RadioButton}">
@@ -50,6 +51,7 @@
                 <Setter Property="BorderThickness" Value="1" />
                 <Setter Property="Padding" Value="8,0,0,0" />
                 <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontFamily" Value="Segoe UI" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Template">
                     <Setter.Value>
@@ -582,7 +584,7 @@
                             </Grid>
                         </Border>
 
-                        <Label Content="注释默认字体" Style="{StaticResource Label}" />
+                        <Label Content="{Binding T_Settings_Annotation_Font}" Style="{StaticResource Label}" />
                         <Border
                             Margin="0,2,0,0"
                             Background="{StaticResource color.sys.layout.mg}"

PDF Office/Views/HomePanel/PDFTools/PDFToolExpendItem.xaml

@@ -14,7 +14,7 @@
         x:Name="BorderExtend"
         Height="116"
         Background="Transparent">
-        <Grid Margin="16">
+        <Grid Margin="16 16 16 0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="36" />
                 <RowDefinition Height="*" />
@@ -43,7 +43,7 @@
             <TextBlock
                 Name="ToolInfoBlock"
                 Grid.Row="1"
-                Margin="0,8,0,0"
+                Margin="0,8,0,2"
                 VerticalAlignment="Center"
                 FontSize="12"
                 Foreground="#666666"

PDF Office/Views/PropertyPanel/AnnotPanel/LinkAnnotProperty.xaml

@@ -166,7 +166,7 @@
             X2="232"
             Y1="0"
             Y2="0" />-->
-            <StackPanel Orientation="Vertical"  Visibility="{Binding IsEmptyPanelVisibility, Converter={StaticResource UnVisivleConvert}}">
+            <StackPanel Orientation="Vertical" Visibility="{Binding IsEmptyPanelVisibility, Converter={StaticResource UnVisivleConvert}}">
                 <Grid MinWidth="260">
                     <!--<StackPanel Name="LinkPagePanel" Visibility="{Binding ElementName=BtnLinkPage, Path=IsChecked, Converter={StaticResource BoolToVisible}, Mode=OneWay}">-->
                     <StackPanel Name="LinkPagePanel">
@@ -222,7 +222,7 @@
                                         VerticalAlignment="Center"
                                         Data="M15.064 6.88052L13.5661 6.49468L9.57748 11.6857L10.2156 13.8898C10.3593 14.3863 9.74722 14.7479 9.38174 14.3824L6.59721 11.5979L0.0145727 15.9711L4.38786 9.38851L1.60356 6.60421C1.23807 6.23873 1.59967 5.62665 2.09615 5.77038L4.30107 6.40871L9.49166 2.42039L9.10576 0.92227C8.97879 0.42937 9.58359 0.0840825 9.9435 0.443993L15.5423 6.04277C15.9022 6.40268 15.5569 7.00748 15.064 6.88052Z"
                                         Fill=" #616469" />
-                                    <TextBlock Margin="10,0" Text="定位目标区域" />
+                                    <TextBlock Margin="10,0" Text="Locate Target Page" />
                                 </StackPanel>
                             </ToggleButton.Content>
                         </ToggleButton>
@@ -304,12 +304,12 @@
                 </Grid>
                 <Button
                     x:Name="BtnGOorBack"
+                    Width="80"
                     Background="Transparent"
                     BorderThickness="0"
                     Command="{Binding BtnGOorBackPageCommand}"
                     Content="{Binding BtnGOorBackContent}"
                     FontSize="16"
-                    Width="80"
                     Style="{StaticResource btn.link}"
                     Tag="GO"
                     Visibility="{Binding BtnGOorBackVisibility}">
@@ -327,8 +327,8 @@
             </StackPanel>
             <StackPanel
                 Name="EmptyPanel"
-                VerticalAlignment="Center"
                 Margin="0,180,0,0"
+                VerticalAlignment="Center"
                 Visibility="{Binding IsEmptyPanelVisibility}">
                 <Image
                     Width="128"
@@ -336,13 +336,14 @@
                     Source="pack://application:,,,/Resources/PropertyPanel/no link.png" />
                 <TextBlock
                     Name="txtEmpty"
+                    Width="168"
                     Margin="0,12,0,0"
                     FontFamily="Segoe UI"
                     FontSize="12"
-                    Width="168"
                     Foreground="{StaticResource color.sys.text.neutral.lv3}"
                     Text="{Binding T_EmptyTitle}"
-                    TextAlignment="Center" TextWrapping="Wrap" />
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
             </StackPanel>
         </StackPanel>
     </Grid>