轻会员-高保真调整

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -447,8 +447,8 @@
           <target state="new">AI assitant</target>
         </trans-unit>
         <trans-unit id="TextAIrobot" translate="yes" xml:space="preserve">
-          <source>AI robot</source>
-          <target state="new">AI robot</target>
+          <source>Unlimited Convert</source>
+          <target state="new">Unlimited Convert</target>
         </trans-unit>
         <trans-unit id="TextAutorenewal" translate="yes" xml:space="preserve">
           <source>Auto-renewal</source>
@@ -575,8 +575,8 @@
           <target state="new">Trial Expired</target>
         </trans-unit>
         <trans-unit id="TextUnlimited" translate="yes" xml:space="preserve">
-          <source>Unlimited conversion</source>
-          <target state="new">Unlimited conversion</target>
+          <source>Unlimited Merge</source>
+          <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
           <source>Unlock all Features for Free</source>
@@ -642,6 +642,18 @@
           <source>Convert the First 10 Pages</source>
           <target state="new">Convert the First 10 Pages</target>
         </trans-unit>
+        <trans-unit id="TextBatch" translate="yes" xml:space="preserve">
+          <source>Batch Processing</source>
+          <target state="new">Batch Processing</target>
+        </trans-unit>
+        <trans-unit id="TextBatchProcessing" translate="yes" xml:space="preserve">
+          <source>The trial version can merge only 2 files at a time in batch processing</source>
+          <target state="new">The trial version can merge only 2 files at a time in batch processing</target>
+        </trans-unit>
+        <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
+          <source>No Watermark</source>
+          <target state="new">No Watermark</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -447,8 +447,8 @@
           <target state="new">AI assitant</target>
         </trans-unit>
         <trans-unit id="TextAIrobot" translate="yes" xml:space="preserve">
-          <source>AI robot</source>
-          <target state="new">AI robot</target>
+          <source>Unlimited Convert</source>
+          <target state="new">Unlimited Convert</target>
         </trans-unit>
         <trans-unit id="TextAutorenewal" translate="yes" xml:space="preserve">
           <source>Auto-renewal</source>
@@ -575,8 +575,8 @@
           <target state="new">Trial Expired</target>
         </trans-unit>
         <trans-unit id="TextUnlimited" translate="yes" xml:space="preserve">
-          <source>Unlimited conversion</source>
-          <target state="new">Unlimited conversion</target>
+          <source>Unlimited Merge</source>
+          <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
           <source>Unlock all Features for Free</source>
@@ -642,6 +642,18 @@
           <source>Convert the First 10 Pages</source>
           <target state="new">Convert the First 10 Pages</target>
         </trans-unit>
+        <trans-unit id="TextBatch" translate="yes" xml:space="preserve">
+          <source>Batch Processing</source>
+          <target state="new">Batch Processing</target>
+        </trans-unit>
+        <trans-unit id="TextBatchProcessing" translate="yes" xml:space="preserve">
+          <source>The trial version can merge only 2 files at a time in batch processing</source>
+          <target state="new">The trial version can merge only 2 files at a time in batch processing</target>
+        </trans-unit>
+        <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
+          <source>No Watermark</source>
+          <target state="new">No Watermark</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -447,8 +447,8 @@
           <target state="new">AI assitant</target>
         </trans-unit>
         <trans-unit id="TextAIrobot" translate="yes" xml:space="preserve">
-          <source>AI robot</source>
-          <target state="new">AI robot</target>
+          <source>Unlimited Convert</source>
+          <target state="new">Unlimited Convert</target>
         </trans-unit>
         <trans-unit id="TextAutorenewal" translate="yes" xml:space="preserve">
           <source>Auto-renewal</source>
@@ -575,8 +575,8 @@
           <target state="new">Trial Expired</target>
         </trans-unit>
         <trans-unit id="TextUnlimited" translate="yes" xml:space="preserve">
-          <source>Unlimited conversion</source>
-          <target state="new">Unlimited conversion</target>
+          <source>Unlimited Merge</source>
+          <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
           <source>Unlock all Features for Free</source>
@@ -642,6 +642,18 @@
           <source>Convert the First 10 Pages</source>
           <target state="new">Convert the First 10 Pages</target>
         </trans-unit>
+        <trans-unit id="TextBatch" translate="yes" xml:space="preserve">
+          <source>Batch Processing</source>
+          <target state="new">Batch Processing</target>
+        </trans-unit>
+        <trans-unit id="TextBatchProcessing" translate="yes" xml:space="preserve">
+          <source>The trial version can merge only 2 files at a time in batch processing</source>
+          <target state="new">The trial version can merge only 2 files at a time in batch processing</target>
+        </trans-unit>
+        <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
+          <source>No Watermark</source>
+          <target state="new">No Watermark</target>
+        </trans-unit>
       </group>
     </body>
   </file>

PDF Office/PDF Master.csproj

@@ -2376,6 +2376,7 @@
     <Resource Include="Resources\Service\NOai.png" />
     <Resource Include="Resources\Service\Noconvert.png" />
     <Resource Include="Resources\Service\Upgrade.png" />
+    <Resource Include="Resources\Service\merging.png" />
     <Content Include="source\models\OCR.model">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

PDF Office/Strings/Service/Service.Designer.cs

@@ -1096,7 +1096,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 AI robot 的本地化字符串。
+        ///   查找类似 Unlimited Convert 的本地化字符串。
         /// </summary>
         public static string TextAIrobot {
             get {
@@ -1113,6 +1113,24 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Batch Processing 的本地化字符串。
+        /// </summary>
+        public static string TextBatch {
+            get {
+                return ResourceManager.GetString("TextBatch", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 The trial version can merge only 2 files at a time in batch processing 的本地化字符串。
+        /// </summary>
+        public static string TextBatchProcessing {
+            get {
+                return ResourceManager.GetString("TextBatchProcessing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Cancellation failed, please apply for cancellation when the subscription ends 的本地化字符串。
         /// </summary>
@@ -1311,6 +1329,15 @@ namespace PDF_Master.Strings.Service {
             }
         }
         
+        /// <summary>
+        ///   查找类似 No Watermark 的本地化字符串。
+        /// </summary>
+        public static string TextSaveNoWatermark {
+            get {
+                return ResourceManager.GetString("TextSaveNoWatermark", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Save without watermark 的本地化字符串。
         /// </summary>
@@ -1438,7 +1465,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Unlimited conversion 的本地化字符串。
+        ///   查找类似 Unlimited Merge 的本地化字符串。
         /// </summary>
         public static string TextUnlimited {
             get {

PDF Office/Strings/Service/Service.resx

@@ -274,11 +274,17 @@
     <value>AI assitant</value>
   </data>
   <data name="TextAIrobot" xml:space="preserve">
-    <value>AI robot</value>
+    <value>Unlimited Convert</value>
   </data>
   <data name="TextAutorenewal" xml:space="preserve">
     <value>Auto-renewal</value>
   </data>
+  <data name="TextBatch" xml:space="preserve">
+    <value>Batch Processing</value>
+  </data>
+  <data name="TextBatchProcessing" xml:space="preserve">
+    <value>The trial version can merge only 2 files at a time in batch processing</value>
+  </data>
   <data name="TextCancellation" xml:space="preserve">
     <value>Cancellation failed, please apply for cancellation when the subscription ends</value>
   </data>
@@ -345,6 +351,9 @@
   <data name="TextRegisteras" xml:space="preserve">
     <value>Login to access all premium features</value>
   </data>
+  <data name="TextSaveNoWatermark" xml:space="preserve">
+    <value>No Watermark</value>
+  </data>
   <data name="TextSavewithout" xml:space="preserve">
     <value>Save without watermark</value>
   </data>
@@ -388,7 +397,7 @@
     <value>Trial Expired</value>
   </data>
   <data name="TextUnlimited" xml:space="preserve">
-    <value>Unlimited conversion</value>
+    <value>Unlimited Merge</value>
   </data>
   <data name="TextUnlock" xml:space="preserve">
     <value>Unlock all Features for Free</value>

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

@@ -75,11 +75,11 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             set { _TextUnlimited = value; }
         }
 
-        private string _TextSavewithout;
-        public string TextSavewithout
+        private string _TextSaveNoWatermark;
+        public string TextSaveNoWatermark
         {
-            get { return _TextSavewithout; }
-            set { _TextSavewithout = value; }
+            get { return _TextSaveNoWatermark; }
+            set { _TextSaveNoWatermark = value; }
         }
 
         private string _BtnTextSubscribe;
@@ -101,7 +101,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             TextOrsubscribe = App.ServiceLoader.GetString("TextOrsubscribe");
             TextAIrobot = App.ServiceLoader.GetString("TextAIrobot");
             TextUnlimited = App.ServiceLoader.GetString("TextUnlimited");
-            TextSavewithout = App.ServiceLoader.GetString("TextSavewithout");
+            TextSaveNoWatermark = App.ServiceLoader.GetString("TextSaveNoWatermark");
             BtnTextSubscribe = App.ServiceLoader.GetString("BtnTextSubscribe");
         }
 

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

@@ -157,6 +157,18 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             set { SetProperty(ref _Textoff, value); }
         }
 
+        private string _TextBatchProcessing;
+        public string TextBatchProcessing
+        {
+            get { return _TextBatchProcessing; }
+            set { _TextBatchProcessing = value; }
+        }
+        private string _TextBatch;
+        public string TextBatch
+        {
+            get { return _TextBatch; }
+            set { _TextBatch = value; }
+        }
 
         private string _BtnTextSubscribe;
         public string BtnTextSubscribe
@@ -195,6 +207,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             TextSupportAI = App.ServiceLoader.GetString("TextSupportAI");
             Textoff = App.ServiceLoader.GetString("Textoff");
             BtnTextSubscribe = App.ServiceLoader.GetString("BtnTextSubscribe");
+            TextBatch = App.ServiceLoader.GetString("TextBatch");
+            TextBatchProcessing = App.ServiceLoader.GetString("TextBatchProcessing");
         }
 
 

PDF Office/Views/Dialog/ServiceDialog/RegisterOKRegion.xaml

@@ -141,7 +141,7 @@
                             FontSize="12"
                             Foreground="#252629"
                             LineHeight="20"
-                            Text="{Binding TextSavewithout}" />
+                            Text="{Binding TextSaveNoWatermark}" />
                     </StackPanel>
                 </StackPanel>
                 <Button

PDF Office/Views/Dialog/ServiceDialog/SubscriptionDialog.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     Width="450"
-    Height="394"
+    Height="468"
     prism:Dialog.WindowStyle="{StaticResource DialogWindowStyle}"
     prism:ViewModelLocator.AutoWireViewModel="True"
     mc:Ignorable="d">
@@ -96,6 +96,34 @@
                         TextWrapping="Wrap" />
                     </StackPanel>
                 </StackPanel>
+                <StackPanel
+                Width="384"
+                Margin="0,20,0,0"
+                Orientation="Horizontal">
+                    <Image
+                    Width="36"
+                    Height="36"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Source="pack://application:,,,/PDF Master;component/Resources/Service/merging.png" />
+                    <StackPanel Width="340" Margin="8,0,0,0">
+                        <TextBlock
+                        FontFamily="Segoe UI"
+                        FontSize="14"
+                        FontWeight="SemiBold"
+                        Text="{Binding TextBatch}" />
+                        <TextBlock
+                        Margin="0,4,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        FontFamily="Segoe UI"
+                        FontSize="12"
+                        Foreground="#616469"
+                        LineHeight="20"
+                        Text="{Binding TextBatchProcessing}"
+                        TextWrapping="Wrap" />
+                    </StackPanel>
+                </StackPanel>
                 <!--<StackPanel
                 Width="384"
                 Margin="0,20,0,0"