Master

16055-注册登录-无网络时，底部按钮的颜色修复，16987-合并-单页，pages不要加修复，17678-图片编辑框选区域即为图像置入的大小，等6.30解决bug

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -2694,6 +2694,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Edit PDF</source>
           <target state="new">Edit PDF</target>
         </trans-unit>
+        <trans-unit id="Merge_ItemPage" translate="yes" xml:space="preserve">
+          <source>Page</source>
+          <target state="new">Page</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -2694,6 +2694,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Edit PDF</source>
           <target state="new">Edit PDF</target>
         </trans-unit>
+        <trans-unit id="Merge_ItemPage" translate="yes" xml:space="preserve">
+          <source>Page</source>
+          <target state="new">Page</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -2694,6 +2694,10 @@ Some functions may not work, please restart or re-download PDF Reader Pro from o
           <source>Edit PDF</source>
           <target state="new">Edit PDF</target>
         </trans-unit>
+        <trans-unit id="Merge_ItemPage" translate="yes" xml:space="preserve">
+          <source>Page</source>
+          <target state="new">Page</target>
+        </trans-unit>
       </group>
     </body>
   </file>

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

@@ -1273,6 +1273,15 @@ namespace PDF_Master.Strings.MainPage {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Page 的本地化字符串。
+        /// </summary>
+        public static string Merge_ItemPage {
+            get {
+                return ResourceManager.GetString("Merge_ItemPage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Pages 的本地化字符串。
         /// </summary>

PDF Office/Strings/MainPage/MainPage.resx

@@ -558,6 +558,9 @@ The file format you selected is not supported by this feature, please select the
 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_ItemPage" xml:space="preserve">
+    <value>Page</value>
+  </data>
   <data name="Merge_ItemPages" xml:space="preserve">
     <value>Pages</value>
   </data>

PDF Office/ViewModels/Dialog/ToolsDialogs/MergeDialogViewModel.cs

@@ -615,13 +615,15 @@ namespace PDF_Master.ViewModels.Dialog.ToolsDialogs
                     }
 
                     mergeObject.DocName = doc.FileName;
-                    mergeObject.DocPageCount = doc.PageCount.ToString() + " " + App.MainPageLoader.GetString("Merge_ItemPages");
+                   
                     if (doc.PageCount > 1)
                     {
+                        mergeObject.DocPageCount = doc.PageCount.ToString() + " " + App.MainPageLoader.GetString("Merge_ItemPages");
                         mergeObject.IsEvenPageIsEnabled = true;
                     }
                     else
                     {
+                        mergeObject.DocPageCount = doc.PageCount.ToString() + " " + App.MainPageLoader.GetString("Merge_ItemPage");
                         mergeObject.IsEvenPageIsEnabled = false;
                     }
                     mergeObject.SDKPageCount = doc.PageCount;

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -761,9 +761,10 @@ namespace PDF_Master.ViewModels.Tools
                     openFileDialog.Filter = "Image Files(*.jpg;*.jpeg;*.png;*.bmp)|*.jpg;*.jpeg;*.png;*.bmp;";
                     if (openFileDialog.ShowDialog() == true)
                     {                 
-                    PDFViewer.AddPDFEditImage(CompressImage(openFileDialog.FileName, 800), 500,500);
+                    PDFViewer.AddPDFEditImage(openFileDialog.FileName,500,500);
                     events.GetEvent<PageEditNotifyEvent>().Publish(new PageEditNotifyEventArgs(unicode));
-                }
+                    }
+                    
                 }
             else if(e.NotifyType == CustomNotifyType.PDFEditImageResize)
             {

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

@@ -70,13 +70,13 @@
                 Text="{Binding Text_toconnect}"
                 TextAlignment="Center"
                 TextWrapping="Wrap" />
-            <Button
-                Background="#273C62"
+            <Button             
                 Content="{Binding Text_retry}"
                 Command="{Binding RetryCommand}"
                 Foreground="White"
                 Width="65"
                 Height="32"
+                 Style="{StaticResource Btn.cta}"
                 VerticalAlignment="Bottom" IsDefault="True" />
         </Grid>