文案-调整大纲、书签标题等部分文案

PDF Office/Helper/PDFToolsHelper.cs

@@ -215,7 +215,7 @@ namespace PDF_Master.Helper
             var pDFToImage = new PDFToolsInit();
             pDFToImage.SetFnType(PDFFnType.PDFToImage);
             pDFToImage.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-image.png");
-            pDFToImage.SetContent("To Image", "Convert PDF to image, such as JPEG, JPG, PNG, GIF, TIFF, TAG,BMP.");
+            pDFToImage.SetContent("To Image", "Convert PDF to image, such as JPEG, JPG, PNG, GIF, TIFF, TGA,BMP.");
             //水印
             var waterMark = new PDFToolsInit();
             waterMark.SetFnType(PDFFnType.WaterMark);

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -520,10 +520,10 @@
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
           <source>Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
           <target state="new">Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>
         <trans-unit id="GuidContentP2" translate="yes" xml:space="preserve">
           <source>Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!</source>
@@ -719,8 +719,8 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
           <target state="new">Crop</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Output" translate="yes" xml:space="preserve">
-          <source>Output</source>
-          <target state="new">Output</target>
+          <source>Export</source>
+          <target state="new">Export</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
@@ -902,11 +902,11 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
         </trans-unit>
         <trans-unit id="Merge_Hint" translate="yes" xml:space="preserve">
           <source>Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</source>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</source>
           <target state="new">Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</target>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</target>
         </trans-unit>
         <trans-unit id="Merge_ItemPages" translate="yes" xml:space="preserve">
           <source>Pages</source>

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

@@ -520,10 +520,10 @@
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
           <source>Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
           <target state="new">Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>
         <trans-unit id="GuidContentP2" translate="yes" xml:space="preserve">
           <source>Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!</source>
@@ -719,8 +719,8 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
           <target state="new">Crop</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Output" translate="yes" xml:space="preserve">
-          <source>Output</source>
-          <target state="new">Output</target>
+          <source>Export</source>
+          <target state="new">Export</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
@@ -902,11 +902,11 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
         </trans-unit>
         <trans-unit id="Merge_Hint" translate="yes" xml:space="preserve">
           <source>Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</source>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</source>
           <target state="new">Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</target>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</target>
         </trans-unit>
         <trans-unit id="Merge_ItemPages" translate="yes" xml:space="preserve">
           <source>Pages</source>

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

@@ -520,10 +520,10 @@
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
           <source>Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
           <target state="new">Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>
         <trans-unit id="GuidContentP2" translate="yes" xml:space="preserve">
           <source>Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!</source>
@@ -719,8 +719,8 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
           <target state="new">Crop</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Output" translate="yes" xml:space="preserve">
-          <source>Output</source>
-          <target state="new">Output</target>
+          <source>Export</source>
+          <target state="new">Export</target>
         </trans-unit>
         <trans-unit id="ContentSelection_Print" translate="yes" xml:space="preserve">
           <source>Print</source>
@@ -902,11 +902,11 @@ View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity
         </trans-unit>
         <trans-unit id="Merge_Hint" translate="yes" xml:space="preserve">
           <source>Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</source>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</source>
           <target state="new">Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</target>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</target>
         </trans-unit>
         <trans-unit id="Merge_ItemPages" translate="yes" xml:space="preserve">
           <source>Pages</source>

PDF Office/Strings/HomePage/HomePage.Designer.cs

@@ -99,7 +99,7 @@ namespace PDF_Master.Strings.HomePage {
         /// <summary>
         ///   查找类似 Enjoy All Advanced Features!
         ///
-        ///View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity. 的本地化字符串。
+        ///View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity. 的本地化字符串。
         /// </summary>
         public static string GuidContentP1 {
             get {

PDF Office/Strings/HomePage/HomePage.resx

@@ -126,7 +126,7 @@
   <data name="GuidContentP1" xml:space="preserve">
     <value>Enjoy All Advanced Features!
 
-View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</value>
+View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</value>
   </data>
   <data name="GuidContentP2" xml:space="preserve">
     <value>Add highlights, freehand, text, stamps, links, shapes, and notes to your documents. Easily mark up your PDFs anytime!</value>

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

@@ -439,7 +439,7 @@ namespace PDF_Master.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Output 的本地化字符串。
+        ///   查找类似 Export 的本地化字符串。
         /// </summary>
         public static string ContentSelection_Output {
             get {
@@ -1264,8 +1264,8 @@ namespace PDF_Master.Strings.MainPage {
         
         /// <summary>
         ///   查找类似 Selected files
-        ///Drop files here or Click “Add Files” at bottom right button. 
-        ///Drag files to reorder as you need. 的本地化字符串。
+        ///Drop files here or Click “+”. Drag files to reorder as you need.
+        ///You can also add files or folders via the lower left button. 的本地化字符串。
         /// </summary>
         public static string Merge_Hint {
             get {

PDF Office/Strings/MainPage/MainPage.resx

@@ -250,7 +250,7 @@
     <value>Crop</value>
   </data>
   <data name="ContentSelection_Output" xml:space="preserve">
-    <value>Output</value>
+    <value>Export</value>
   </data>
   <data name="ContentSelection_Print" xml:space="preserve">
     <value>Print</value>
@@ -555,8 +555,8 @@ The file format you selected is not supported by this feature, please select the
   </data>
   <data name="Merge_Hint" xml:space="preserve">
     <value>Selected files
-Drop files here or Click “Add Files” at bottom right button. 
-Drag files to reorder as you need.</value>
+Drop files here or Click “+”. Drag files to reorder as you need.
+You can also add files or folders via the lower left button.</value>
   </data>
   <data name="Merge_ItemPages" xml:space="preserve">
     <value>Pages</value>

PDF Office/ViewModels/Dialog/ServiceDialog/IAPCompareDialogViewModel.cs

@@ -354,7 +354,6 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public DelegateCommand GoRegisterCommand { get; set; }
 
 
-
        public IAPCompareDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
            
@@ -363,17 +362,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             GoRegisterCommand = new DelegateCommand(GoRegisterd);
             InitString();
 
-            
-
-            
-
             Items.Add(new User() { Use = Text_CreatePDFfrom, UnRe = true, Re=true, UseType = UseType.CreatePDF });
             Items.Add(new User() { Use = Text_CreatePDFfromscanner, UnRe = true, Re = true, UseType = UseType.CreatePDF });
             Items.Add(new User() { Use = Text_ConvertPDFtoMicrosoft, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
             Items.Add(new User() { Use = Text_TurnPDF, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
             Items.Add(new User() { Use = Text_Compress, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
             Items.Add(new User() { Use = Text_Merge, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Fill, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
+            //初版先不显示填写与签名
+            //Items.Add(new User() { Use = Text_Fill, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
             Items.Add(new User() { Use = Text_Crop, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
             Items.Add(new User() { Use = Text_Rotate, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
             Items.Add(new User() { Use = Text_Basic, UnRe = true, Re = true, UseType = UseType.AnnotatePDF });
@@ -388,21 +384,14 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             IAPConvert iAPConverter = new IAPConvert();
             PropertyGroupDescription groupDescription = new PropertyGroupDescription("UseType", iAPConverter);
             view.GroupDescriptions.Add(groupDescription);
-           
-
         }
 
-
-
-
         private void GoRegisterd()
         {
 
             RequestClose?.Invoke(new Prism.Services.Dialogs.DialogResult(ButtonResult.Cancel));
             App.mainWindowViewModel.OpenRegister();
         }
-
-
         private void GoLogin()
         {
 
@@ -411,9 +400,5 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             App.mainWindowViewModel.OpenLogin();
 
         }
-
-
-
-      
     }
 }

PDF Office/Views/BOTA/BookmarkContent.xaml

@@ -46,11 +46,11 @@
                         Height="16"
                         Source="pack://application:,,,/Resources/BOTA/empty_bookmark.png" />-->
                         <Path
-                            VerticalAlignment="Top"
                             Grid.Column="0"
                             Width="16"
-                            Margin="0 9 0 0"
                             Height="16"
+                            Margin="0,9,0,0"
+                            VerticalAlignment="Top"
                             Data="M3 3.47368C3 2.65979 3.65979 2 4.47368 2H11.5263C12.3402 2 13 2.65979 13 3.47368V14.3044C13 14.9486 12.2314 15.2826 11.7604 14.843L8.50276 11.8026C8.21966 11.5384 7.78034 11.5384 7.49724 11.8026L4.2396 14.843C3.7686 15.2826 3 14.9486 3 14.3044V3.47368Z"
                             Fill="#94989C">
                             <Path.RenderTransform>
@@ -83,8 +83,8 @@
                             Padding="5"
                             Background="Transparent"
                             FontSize="14"
-                            TextWrapping="Wrap"
                             Text="{Binding Title}"
+                            TextWrapping="Wrap"
                             Visibility="Visible" />
                     </Grid>
                 </StackPanel>
@@ -121,7 +121,7 @@
                     FontSize="14"
                     FontWeight="SemiBold"
                     Foreground="{StaticResource color.sys.text.neutral.lv1}"
-                    Text="Bookmarks" />
+                    Text="Bookmark" />
                 <Button
                     Name="BtnAddBookmark"
                     Width="40"

PDF Office/Views/BOTA/OutLineControl.xaml

@@ -9,6 +9,7 @@
     xmlns:mainPageLoader="clr-namespace:PDF_Master.Strings.MainPage"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:model="clr-namespace:PDF_Master.Model.BOTA"
+    Width="400"
     d:DataContext="{d:DesignInstance Type=bota:OutLineControlViewModel}"
     KeyDown="UserControl_KeyDown"
     mc:Ignorable="d">
@@ -203,7 +204,7 @@
                     FontFamily="Segoe UI"
                     FontSize="12"
                     Foreground="#94989C"
-                    Text="Please right-click on the selected page and select 'Add Outline', or click the 'Add' button on the upper right to create a outline."
+                    Text="No Outlines Please right-click on the selected text or click the 'Add' button on the upper right to create an outline."
                     TextWrapping="Wrap" />
             </StackPanel>
             <TreeView