轻会员-文案和高保真调整，Bug修复-19025，19026，19031，19032

PDF Office/App.xaml.cs

@@ -141,6 +141,8 @@ namespace PDF_Master
 
         public static bool IsBookMode = false;
 
+        public static bool UserOpen = false;
+        public static bool LoginOpen = false;
 
         /// <summary>
         /// 是否使用过高级功能

PDF Office/Helper/ConverterHelper.cs

@@ -621,7 +621,7 @@ namespace PDF_Master.Helper
         /// </summary>
         public static void convertUnlock()
         {      
-                Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master-subscription?email=" + Settings.Default.UserDate.Email));
+                Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email));
         }
 
     }

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -439,8 +439,8 @@
           <target state="new">Subscribe</target>
         </trans-unit>
         <trans-unit id="BtnTextSubscribe" translate="yes" xml:space="preserve">
-          <source>Subscribe</source>
-          <target state="new">Subscribe</target>
+          <source>Upgrade Now</source>
+          <target state="new">Upgrade Now</target>
         </trans-unit>
         <trans-unit id="TextAIassitant" translate="yes" xml:space="preserve">
           <source>AI assitant</source>
@@ -467,12 +467,12 @@
           <target state="new">Convert</target>
         </trans-unit>
         <trans-unit id="TextConvertPDF" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and more</source>
-          <target state="new">Convert PDF to Office and more</target>
+          <source>Convert the first 10 pages of a PDF, unlimited times</source>
+          <target state="new">Convert the first 10 pages of a PDF, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFto" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and image without any limitations, get converted files in high quality</source>
-          <target state="new">Convert PDF to Office and image without any limitations, get converted files in high quality</target>
+          <source>Free trial users can only convert the first 10 pages of a document.</source>
+          <target state="new">Free trial users can only convert the first 10 pages of a document.</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFwithout" translate="yes" xml:space="preserve">
           <source>Convert PDF without limitation</source>
@@ -483,8 +483,8 @@
           <target state="new">Edit PDF text and images</target>
         </trans-unit>
         <trans-unit id="TextEditPDF" translate="yes" xml:space="preserve">
-          <source>Edit PDF</source>
-          <target state="new">Edit PDF</target>
+          <source>Edit</source>
+          <target state="new">Edit</target>
         </trans-unit>
         <trans-unit id="TextEnjoy" translate="yes" xml:space="preserve">
           <source>Enjoy advanced features now!</source>
@@ -495,8 +495,8 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>AI translation, AI rewriting, AI correction.</source>
-          <target state="new">AI translation, AI rewriting, AI correction.</target>
+          <source>AI translation, AI rewriting, AI correction</source>
+          <target state="new">AI translation, AI rewriting, AI correction</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
@@ -531,8 +531,8 @@
           <target state="new">Please Log in again</target>
         </trans-unit>
         <trans-unit id="TextRegisteras" translate="yes" xml:space="preserve">
-          <source>Login to access all premium features</source>
-          <target state="new">Login to access all premium features</target>
+          <source>Register as a PDF Master member to enjoy premium features</source>
+          <target state="new">Register as a PDF Master member to enjoy premium features</target>
         </trans-unit>
         <trans-unit id="TextSavewithout" translate="yes" xml:space="preserve">
           <source>Save without watermark</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Merge two files at once, unlimited times.</source>
-          <target state="new">Merge two files at once, unlimited times.</target>
+          <source>Merge two files at once, unlimited times</source>
+          <target state="new">Merge two files at once, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>
@@ -579,8 +579,8 @@
           <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
-          <source>Unlock all Features for Free</source>
-          <target state="new">Unlock all Features for Free</target>
+          <source>Login Benefits</source>
+          <target state="new">Login Benefits</target>
         </trans-unit>
         <trans-unit id="TextUpgrade" translate="yes" xml:space="preserve">
           <source>Upgrade</source>
@@ -591,8 +591,8 @@
           <target state="new">Welcome to Join</target>
         </trans-unit>
         <trans-unit id="TextWhenyou" translate="yes" xml:space="preserve">
-          <source>When you save a document with PDF Master after editing, no watermark will be attached</source>
-          <target state="new">When you save a document with PDF Master after editing, no watermark will be attached</target>
+          <source>Free trial version will add a PDF Master official watermark to the document when saving.</source>
+          <target state="new">Free trial version will add a PDF Master official watermark to the document when saving.</target>
         </trans-unit>
         <trans-unit id="TextYouraccount" translate="yes" xml:space="preserve">
           <source>Your account has been logged into another device. If it was not done by you, please change your password as soon as possible.</source>
@@ -643,12 +643,12 @@
           <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>
+          <source>Merge PDFs without Limitation</source>
+          <target state="new">Merge PDFs without Limitation</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>
+          <source>Free trial users can only combine 2 files at once.</source>
+          <target state="new">Free trial users can only combine 2 files at once.</target>
         </trans-unit>
         <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
           <source>No Watermark</source>

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

@@ -439,8 +439,8 @@
           <target state="new">Subscribe</target>
         </trans-unit>
         <trans-unit id="BtnTextSubscribe" translate="yes" xml:space="preserve">
-          <source>Subscribe</source>
-          <target state="new">Subscribe</target>
+          <source>Upgrade Now</source>
+          <target state="new">Upgrade Now</target>
         </trans-unit>
         <trans-unit id="TextAIassitant" translate="yes" xml:space="preserve">
           <source>AI assitant</source>
@@ -467,12 +467,12 @@
           <target state="new">Convert</target>
         </trans-unit>
         <trans-unit id="TextConvertPDF" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and more</source>
-          <target state="new">Convert PDF to Office and more</target>
+          <source>Convert the first 10 pages of a PDF, unlimited times</source>
+          <target state="new">Convert the first 10 pages of a PDF, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFto" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and image without any limitations, get converted files in high quality</source>
-          <target state="new">Convert PDF to Office and image without any limitations, get converted files in high quality</target>
+          <source>Free trial users can only convert the first 10 pages of a document.</source>
+          <target state="new">Free trial users can only convert the first 10 pages of a document.</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFwithout" translate="yes" xml:space="preserve">
           <source>Convert PDF without limitation</source>
@@ -483,8 +483,8 @@
           <target state="new">Edit PDF text and images</target>
         </trans-unit>
         <trans-unit id="TextEditPDF" translate="yes" xml:space="preserve">
-          <source>Edit PDF</source>
-          <target state="new">Edit PDF</target>
+          <source>Edit</source>
+          <target state="new">Edit</target>
         </trans-unit>
         <trans-unit id="TextEnjoy" translate="yes" xml:space="preserve">
           <source>Enjoy advanced features now!</source>
@@ -495,8 +495,8 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>AI translation, AI rewriting, AI correction.</source>
-          <target state="new">AI translation, AI rewriting, AI correction.</target>
+          <source>AI translation, AI rewriting, AI correction</source>
+          <target state="new">AI translation, AI rewriting, AI correction</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
@@ -531,8 +531,8 @@
           <target state="new">Please Log in again</target>
         </trans-unit>
         <trans-unit id="TextRegisteras" translate="yes" xml:space="preserve">
-          <source>Login to access all premium features</source>
-          <target state="new">Login to access all premium features</target>
+          <source>Register as a PDF Master member to enjoy premium features</source>
+          <target state="new">Register as a PDF Master member to enjoy premium features</target>
         </trans-unit>
         <trans-unit id="TextSavewithout" translate="yes" xml:space="preserve">
           <source>Save without watermark</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Merge two files at once, unlimited times.</source>
-          <target state="new">Merge two files at once, unlimited times.</target>
+          <source>Merge two files at once, unlimited times</source>
+          <target state="new">Merge two files at once, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>
@@ -579,8 +579,8 @@
           <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
-          <source>Unlock all Features for Free</source>
-          <target state="new">Unlock all Features for Free</target>
+          <source>Login Benefits</source>
+          <target state="new">Login Benefits</target>
         </trans-unit>
         <trans-unit id="TextUpgrade" translate="yes" xml:space="preserve">
           <source>Upgrade</source>
@@ -591,8 +591,8 @@
           <target state="new">Welcome to Join</target>
         </trans-unit>
         <trans-unit id="TextWhenyou" translate="yes" xml:space="preserve">
-          <source>When you save a document with PDF Master after editing, no watermark will be attached</source>
-          <target state="new">When you save a document with PDF Master after editing, no watermark will be attached</target>
+          <source>Free trial version will add a PDF Master official watermark to the document when saving.</source>
+          <target state="new">Free trial version will add a PDF Master official watermark to the document when saving.</target>
         </trans-unit>
         <trans-unit id="TextYouraccount" translate="yes" xml:space="preserve">
           <source>Your account has been logged into another device. If it was not done by you, please change your password as soon as possible.</source>
@@ -643,12 +643,12 @@
           <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>
+          <source>Merge PDFs without Limitation</source>
+          <target state="new">Merge PDFs without Limitation</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>
+          <source>Free trial users can only combine 2 files at once.</source>
+          <target state="new">Free trial users can only combine 2 files at once.</target>
         </trans-unit>
         <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
           <source>No Watermark</source>

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

@@ -439,8 +439,8 @@
           <target state="new">Subscribe</target>
         </trans-unit>
         <trans-unit id="BtnTextSubscribe" translate="yes" xml:space="preserve">
-          <source>Subscribe</source>
-          <target state="new">Subscribe</target>
+          <source>Upgrade Now</source>
+          <target state="new">Upgrade Now</target>
         </trans-unit>
         <trans-unit id="TextAIassitant" translate="yes" xml:space="preserve">
           <source>AI assitant</source>
@@ -467,12 +467,12 @@
           <target state="new">Convert</target>
         </trans-unit>
         <trans-unit id="TextConvertPDF" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and more</source>
-          <target state="new">Convert PDF to Office and more</target>
+          <source>Convert the first 10 pages of a PDF, unlimited times</source>
+          <target state="new">Convert the first 10 pages of a PDF, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFto" translate="yes" xml:space="preserve">
-          <source>Convert PDF to Office and image without any limitations, get converted files in high quality</source>
-          <target state="new">Convert PDF to Office and image without any limitations, get converted files in high quality</target>
+          <source>Free trial users can only convert the first 10 pages of a document.</source>
+          <target state="new">Free trial users can only convert the first 10 pages of a document.</target>
         </trans-unit>
         <trans-unit id="TextConvertPDFwithout" translate="yes" xml:space="preserve">
           <source>Convert PDF without limitation</source>
@@ -483,8 +483,8 @@
           <target state="new">Edit PDF text and images</target>
         </trans-unit>
         <trans-unit id="TextEditPDF" translate="yes" xml:space="preserve">
-          <source>Edit PDF</source>
-          <target state="new">Edit PDF</target>
+          <source>Edit</source>
+          <target state="new">Edit</target>
         </trans-unit>
         <trans-unit id="TextEnjoy" translate="yes" xml:space="preserve">
           <source>Enjoy advanced features now!</source>
@@ -495,8 +495,8 @@
           <target state="new">Enjoy all advanced features now</target>
         </trans-unit>
         <trans-unit id="TextInsert" translate="yes" xml:space="preserve">
-          <source>AI translation, AI rewriting, AI correction.</source>
-          <target state="new">AI translation, AI rewriting, AI correction.</target>
+          <source>AI translation, AI rewriting, AI correction</source>
+          <target state="new">AI translation, AI rewriting, AI correction</target>
         </trans-unit>
         <trans-unit id="TextLimit10" translate="yes" xml:space="preserve">
           <source>(Limit first 10 pages)</source>
@@ -531,8 +531,8 @@
           <target state="new">Please Log in again</target>
         </trans-unit>
         <trans-unit id="TextRegisteras" translate="yes" xml:space="preserve">
-          <source>Login to access all premium features</source>
-          <target state="new">Login to access all premium features</target>
+          <source>Register as a PDF Master member to enjoy premium features</source>
+          <target state="new">Register as a PDF Master member to enjoy premium features</target>
         </trans-unit>
         <trans-unit id="TextSavewithout" translate="yes" xml:space="preserve">
           <source>Save without watermark</source>
@@ -563,8 +563,8 @@
           <target state="new">Subscription Expired</target>
         </trans-unit>
         <trans-unit id="TextSuch" translate="yes" xml:space="preserve">
-          <source>Merge two files at once, unlimited times.</source>
-          <target state="new">Merge two files at once, unlimited times.</target>
+          <source>Merge two files at once, unlimited times</source>
+          <target state="new">Merge two files at once, unlimited times</target>
         </trans-unit>
         <trans-unit id="TextSupportAI" translate="yes" xml:space="preserve">
           <source>Support AI translation, AI rewriting, AI correction</source>
@@ -579,8 +579,8 @@
           <target state="new">Unlimited Merge</target>
         </trans-unit>
         <trans-unit id="TextUnlock" translate="yes" xml:space="preserve">
-          <source>Unlock all Features for Free</source>
-          <target state="new">Unlock all Features for Free</target>
+          <source>Login Benefits</source>
+          <target state="new">Login Benefits</target>
         </trans-unit>
         <trans-unit id="TextUpgrade" translate="yes" xml:space="preserve">
           <source>Upgrade</source>
@@ -591,8 +591,8 @@
           <target state="new">Welcome to Join</target>
         </trans-unit>
         <trans-unit id="TextWhenyou" translate="yes" xml:space="preserve">
-          <source>When you save a document with PDF Master after editing, no watermark will be attached</source>
-          <target state="new">When you save a document with PDF Master after editing, no watermark will be attached</target>
+          <source>Free trial version will add a PDF Master official watermark to the document when saving.</source>
+          <target state="new">Free trial version will add a PDF Master official watermark to the document when saving.</target>
         </trans-unit>
         <trans-unit id="TextYouraccount" translate="yes" xml:space="preserve">
           <source>Your account has been logged into another device. If it was not done by you, please change your password as soon as possible.</source>
@@ -643,12 +643,12 @@
           <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>
+          <source>Merge PDFs without Limitation</source>
+          <target state="new">Merge PDFs without Limitation</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>
+          <source>Free trial users can only combine 2 files at once.</source>
+          <target state="new">Free trial users can only combine 2 files at once.</target>
         </trans-unit>
         <trans-unit id="TextSaveNoWatermark" translate="yes" xml:space="preserve">
           <source>No Watermark</source>

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

@@ -97,7 +97,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Subscribe 的本地化字符串。
+        ///   查找类似 Upgrade Now 的本地化字符串。
         /// </summary>
         public static string BtnTextSubscribe {
             get {
@@ -1114,7 +1114,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Batch Processing 的本地化字符串。
+        ///   查找类似 Merge PDFs without Limitation 的本地化字符串。
         /// </summary>
         public static string TextBatch {
             get {
@@ -1123,7 +1123,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 The trial version can merge only 2 files at a time in batch processing 的本地化字符串。
+        ///   查找类似 Free trial users can only combine 2 files at once. 的本地化字符串。
         /// </summary>
         public static string TextBatchProcessing {
             get {
@@ -1168,7 +1168,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Convert PDF to Office and more 的本地化字符串。
+        ///   查找类似 Convert the first 10 pages of a PDF, unlimited times 的本地化字符串。
         /// </summary>
         public static string TextConvertPDF {
             get {
@@ -1177,7 +1177,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Convert PDF to Office and image without any limitations, get converted files in high quality 的本地化字符串。
+        ///   查找类似 Free trial users can only convert the first 10 pages of a document. 的本地化字符串。
         /// </summary>
         public static string TextConvertPDFto {
             get {
@@ -1204,7 +1204,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Edit PDF 的本地化字符串。
+        ///   查找类似 Edit 的本地化字符串。
         /// </summary>
         public static string TextEditPDF {
             get {
@@ -1231,7 +1231,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 AI translation, AI rewriting, AI correction. 的本地化字符串。
+        ///   查找类似 AI translation, AI rewriting, AI correction 的本地化字符串。
         /// </summary>
         public static string TextInsert {
             get {
@@ -1321,7 +1321,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Login to access all premium features 的本地化字符串。
+        ///   查找类似 Register as a PDF Master member to enjoy premium features 的本地化字符串。
         /// </summary>
         public static string TextRegisteras {
             get {
@@ -1438,7 +1438,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Merge two files at once, unlimited times. 的本地化字符串。
+        ///   查找类似 Merge two files at once, unlimited times 的本地化字符串。
         /// </summary>
         public static string TextSuch {
             get {
@@ -1474,7 +1474,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 Unlock all Features for Free 的本地化字符串。
+        ///   查找类似 Login Benefits 的本地化字符串。
         /// </summary>
         public static string TextUnlock {
             get {
@@ -1501,7 +1501,7 @@ namespace PDF_Master.Strings.Service {
         }
         
         /// <summary>
-        ///   查找类似 When you save a document with PDF Master after editing, no watermark will be attached 的本地化字符串。
+        ///   查找类似 Free trial version will add a PDF Master official watermark to the document when saving. 的本地化字符串。
         /// </summary>
         public static string TextWhenyou {
             get {

PDF Office/Strings/Service/Service.resx

@@ -130,7 +130,7 @@
     <value>Subscribe</value>
   </data>
   <data name="BtnTextSubscribe" xml:space="preserve">
-    <value>Subscribe</value>
+    <value>Upgrade Now</value>
   </data>
   <data name="code300" xml:space="preserve">
     <value>Network error</value>
@@ -280,10 +280,10 @@
     <value>Auto-renewal</value>
   </data>
   <data name="TextBatch" xml:space="preserve">
-    <value>Batch Processing</value>
+    <value>Merge PDFs without Limitation</value>
   </data>
   <data name="TextBatchProcessing" xml:space="preserve">
-    <value>The trial version can merge only 2 files at a time in batch processing</value>
+    <value>Free trial users can only combine 2 files at once.</value>
   </data>
   <data name="TextCancellation" xml:space="preserve">
     <value>Cancellation failed, please apply for cancellation when the subscription ends</value>
@@ -298,10 +298,10 @@
     <value>Convert</value>
   </data>
   <data name="TextConvertPDF" xml:space="preserve">
-    <value>Convert PDF to Office and more</value>
+    <value>Convert the first 10 pages of a PDF, unlimited times</value>
   </data>
   <data name="TextConvertPDFto" xml:space="preserve">
-    <value>Convert PDF to Office and image without any limitations, get converted files in high quality</value>
+    <value>Free trial users can only convert the first 10 pages of a document.</value>
   </data>
   <data name="TextConvertPDFwithout" xml:space="preserve">
     <value>Convert PDF without limitation</value>
@@ -310,7 +310,7 @@
     <value>Edit PDF text and images</value>
   </data>
   <data name="TextEditPDF" xml:space="preserve">
-    <value>Edit PDF</value>
+    <value>Edit</value>
   </data>
   <data name="TextEnjoy" xml:space="preserve">
     <value>Enjoy advanced features now!</value>
@@ -319,7 +319,7 @@
     <value>Enjoy all advanced features now</value>
   </data>
   <data name="TextInsert" xml:space="preserve">
-    <value>AI translation, AI rewriting, AI correction.</value>
+    <value>AI translation, AI rewriting, AI correction</value>
   </data>
   <data name="TextLimit10" xml:space="preserve">
     <value>(Limit first 10 pages)</value>
@@ -349,7 +349,7 @@
     <value>Please Log in again</value>
   </data>
   <data name="TextRegisteras" xml:space="preserve">
-    <value>Login to access all premium features</value>
+    <value>Register as a PDF Master member to enjoy premium features</value>
   </data>
   <data name="TextSaveNoWatermark" xml:space="preserve">
     <value>No Watermark</value>
@@ -388,7 +388,7 @@
     <value>Subscription Expired</value>
   </data>
   <data name="TextSuch" xml:space="preserve">
-    <value>Merge two files at once, unlimited times.</value>
+    <value>Merge two files at once, unlimited times</value>
   </data>
   <data name="TextSupportAI" xml:space="preserve">
     <value>Support AI translation, AI rewriting, AI correction</value>
@@ -400,7 +400,7 @@
     <value>Unlimited Merge</value>
   </data>
   <data name="TextUnlock" xml:space="preserve">
-    <value>Unlock all Features for Free</value>
+    <value>Login Benefits</value>
   </data>
   <data name="TextUpgrade" xml:space="preserve">
     <value>Upgrade</value>
@@ -409,7 +409,7 @@
     <value>Welcome to Join</value>
   </data>
   <data name="TextWhenyou" xml:space="preserve">
-    <value>When you save a document with PDF Master after editing, no watermark will be attached</value>
+    <value>Free trial version will add a PDF Master official watermark to the document when saving.</value>
   </data>
   <data name="TextYouraccount" xml:space="preserve">
     <value>Your account has been logged into another device. If it was not done by you, please change your password as soon as possible.</value>

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

@@ -150,7 +150,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public void OnDialogClosed()
         {
-
+            App.LoginOpen = false;
         }
 
         public void OnDialogOpened(IDialogParameters parameters)

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

@@ -34,7 +34,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         public void OnDialogClosed()
         {
-
+            App.UserOpen = false;
         }
 
         public void OnDialogOpened(IDialogParameters parameters)

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -456,10 +456,12 @@ namespace PDF_Master.ViewModels
         {
             DialogParameters value = new DialogParameters();
             value.Add(ParameterNames.Loginoff, Loginoff);
+            App.LoginOpen = true;
             dialogs.ShowDialog(DialogNames.LoginDialog, value, dialogResult =>
             {
 
             });
+          
         }
 
         public void OpenRegisterOK()
@@ -497,9 +499,10 @@ namespace PDF_Master.ViewModels
                 }
                 else
                 {
-
+                    
                     Useremailchar = Settings.Default.UserDate.Email.Substring(0, 1);
                     App.mainWindowViewModel.UserVis = Visibility.Visible;
+                    App.UserOpen = true;
                     dialogs.ShowDialog(DialogNames.UserDialog);
                 }
             }

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

@@ -40,27 +40,26 @@
                     Margin="0,2,0,0"
                     HorizontalAlignment="Left"
                     FontFamily="SF Pro Text"
-                    FontSize="10"
-                    Foreground="#94989C"
+                    FontSize="12"
+                    FontWeight="SemiBold"
+                    Foreground="#252629"
                     LineHeight="16"
                     Text="{Binding TextRegisteras}"
                     TextWrapping="Wrap" />
             </StackPanel>
 
             <StackPanel
-                Margin="28,152,0,0"
+                Margin="28,134,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
-                <Grid  HorizontalAlignment="Left">
+                <Grid HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
                         HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/AI.png" />
                     </Border>
-                    <StackPanel
-                        Width="129"
-                        Margin="42,0,0,0">
+                    <StackPanel Width="129" Margin="42,0,0,0">
                         <TextBlock
                             Height="20"
                             FontFamily="Segoe UI"
@@ -72,54 +71,20 @@
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
-                            TextWrapping="Wrap"
                             Foreground="#616469"
-                            Text="{Binding TextInsert}" />
+                            Text="{Binding TextInsert}"
+                            TextWrapping="Wrap" />
                     </StackPanel>
                 </Grid>
-
-                <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
+                <Grid Margin="0,12,0,0" HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
-                        HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
-                    </Border>
-                    <StackPanel
-                        Width="129"
-                        Height="42"
-                        Margin="42,0,0,0">
-                        <TextBlock
-                            Height="20"
-                            FontFamily="Segoe UI"
-                            FontSize="12"
-                            FontWeight="SemiBold"
-                            LineHeight="20"
-                            Text="{Binding TextEditPDF}" />
-                        <TextBlock
-                            Height="18"
-                            Margin="0,4,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="11"
-                            Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding Textediting}" />
-                    </StackPanel>
-                </Grid>
-                <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
-                    <Border
-                        Width="36"
-                        Height="36"
-                        HorizontalAlignment="Left">
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png" />
                     </Border>
-                    <StackPanel Height="42" Margin="42,0,0,0">
+                    <StackPanel  Margin="42,0,0,0">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Height="20"
@@ -134,48 +99,75 @@
                                 FontFamily="Segoe UI"
                                 FontSize="11"
                                 Foreground="#94989C"
-                                LineHeight="18"
-                                Text="{Binding TextLimit10}" />
+                                Text="{Binding TextLimit10}"
+                                TextWrapping="Wrap" />
                         </StackPanel>
 
                         <TextBlock
-                            Height="18"
+                            Width="168"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding TextConvertPDF}" />
+                            Text="{Binding TextConvertPDF}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </Grid>
+                <Grid Margin="0,12,0,0" HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
+                    </Border>
+                    <StackPanel Margin="42,0,0,0" HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="{Binding TextMore}" />
+                        <TextBlock
+                            Width="168"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            Text="{Binding TextSuch}"
+                            TextWrapping="Wrap" />
                     </StackPanel>
                 </Grid>
                 <Grid
+                    Height="42"
                     Margin="0,12,0,0"
                     HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
-                        VerticalAlignment="Top"
                         HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
                     </Border>
                     <StackPanel
-                        Margin="42,0,0,0"
-                        HorizontalAlignment="Left">
+                        Width="129"
+                        Height="42"
+                        Margin="42,0,0,0">
                         <TextBlock
                             Height="20"
                             FontFamily="Segoe UI"
                             FontSize="12"
                             FontWeight="SemiBold"
                             LineHeight="20"
-                            Text="{Binding TextMore}" />
+                            Text="{Binding TextEditPDF}" />
                         <TextBlock
-                            Width="168"
+                            Height="18"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            TextWrapping="Wrap"
-                            Text="{Binding TextSuch}" />
+                            LineHeight="28"
+                            Text="{Binding Textediting}" />
                     </StackPanel>
                 </Grid>
             </StackPanel>

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

@@ -48,19 +48,17 @@
             </StackPanel>
 
             <StackPanel
-                Margin="28,152,0,0"
+                Margin="28,134,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top">
-                <Grid  HorizontalAlignment="Left">
+                <Grid HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
                         HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/AI.png" />
                     </Border>
-                    <StackPanel
-                        Width="129"
-                        Margin="42,0,0,0">
+                    <StackPanel Width="129" Margin="42,0,0,0">
                         <TextBlock
                             Height="20"
                             FontFamily="Segoe UI"
@@ -69,57 +67,23 @@
                             LineHeight="20"
                             Text="{Binding TextOrganize}" />
                         <TextBlock
-                            Margin="0,4,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="11"
-                            TextWrapping="Wrap"
-                            Foreground="#616469"
-                            Text="{Binding TextInsert}" />
-                    </StackPanel>
-                </Grid>
-
-                <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
-                    <Border
-                        Width="36"
-                        Height="36"
-                        HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
-                    </Border>
-                    <StackPanel
-                        Width="129"
-                        Height="42"
-                        Margin="42,0,0,0">
-                        <TextBlock
-                            Height="20"
-                            FontFamily="Segoe UI"
-                            FontSize="12"
-                            FontWeight="SemiBold"
-                            LineHeight="20"
-                            Text="{Binding TextEditPDF}" />
-                        <TextBlock
-                            Height="18"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding Textediting}" />
+                            Text="{Binding TextInsert}"
+                            TextWrapping="Wrap" />
                     </StackPanel>
                 </Grid>
-                <Grid
-                    Height="42"
-                    Margin="0,12,0,0"
-                    HorizontalAlignment="Left">
+                <Grid Margin="0,12,0,0" HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
-                        HorizontalAlignment="Left">
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png" />
                     </Border>
-                    <StackPanel Height="42" Margin="42,0,0,0">
+                    <StackPanel Margin="42,0,0,0">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Height="20"
@@ -134,48 +98,75 @@
                                 FontFamily="Segoe UI"
                                 FontSize="11"
                                 Foreground="#94989C"
-                                LineHeight="18"
-                                Text="{Binding TextLimit10}" />
+                                Text="{Binding TextLimit10}"
+                                TextWrapping="Wrap" />
                         </StackPanel>
 
                         <TextBlock
-                            Height="18"
+                            Width="168"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            LineHeight="28"
-                            Text="{Binding TextConvertPDF}" />
+                            Text="{Binding TextConvertPDF}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </Grid>
+                <Grid Margin="0,12,0,0" HorizontalAlignment="Left">
+                    <Border
+                        Width="36"
+                        Height="36"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top">
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
+                    </Border>
+                    <StackPanel Margin="42,0,0,0" HorizontalAlignment="Left">
+                        <TextBlock
+                            Height="20"
+                            FontFamily="Segoe UI"
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            LineHeight="20"
+                            Text="{Binding TextMore}" />
+                        <TextBlock
+                            Width="168"
+                            Margin="0,4,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="11"
+                            Foreground="#616469"
+                            Text="{Binding TextSuch}"
+                            TextWrapping="Wrap" />
                     </StackPanel>
                 </Grid>
                 <Grid
+                    Height="42"
                     Margin="0,12,0,0"
                     HorizontalAlignment="Left">
                     <Border
                         Width="36"
                         Height="36"
-                        VerticalAlignment="Top"
                         HorizontalAlignment="Left">
-                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/merge.png" />
+                        <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png" />
                     </Border>
                     <StackPanel
-                        Margin="42,0,0,0"
-                        HorizontalAlignment="Left">
+                        Width="129"
+                        Height="42"
+                        Margin="42,0,0,0">
                         <TextBlock
                             Height="20"
                             FontFamily="Segoe UI"
                             FontSize="12"
                             FontWeight="SemiBold"
                             LineHeight="20"
-                            Text="{Binding TextMore}" />
+                            Text="{Binding TextEditPDF}" />
                         <TextBlock
-                            Width="168"
+                            Height="18"
                             Margin="0,4,0,0"
                             FontFamily="Segoe UI"
                             FontSize="11"
                             Foreground="#616469"
-                            TextWrapping="Wrap"
-                            Text="{Binding TextSuch}" />
+                            LineHeight="28"
+                            Text="{Binding Textediting}" />
                     </StackPanel>
                 </Grid>
             </StackPanel>

PDF Office/Views/MainWindow.xaml.cs

@@ -121,15 +121,20 @@ namespace PDF_Master.Views
                         WindowState = WindowState.Normal;
                     }
                     Activate();
+                    //最小化后激活
+                    if (this.WindowState == WindowState.Minimized)
+                    {
+                        System.Windows.SystemCommands.RestoreWindow(this);
+                    }
                     ServiceHelper.GetUser();
                     if(msg==App.WebopenexpiredId)
                     {
-                        if (App.IsLogin == true)
+                        if (App.IsLogin == true&&App.UserOpen==false)
                         {
                             App.mainWindowViewModel.OpenUser();
                             App.WebOpencase = "";
                         }
-                        else
+                        else if(App.LoginOpen == false)
                         {
                             App.mainWindowViewModel.OpenLogin();
                             App.WebOpencase = "";