Merge remote-tracking branch 'origin/release/10.0' into release/10.0

# Conflicts:
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties

design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties

@@ -2609,8 +2609,7 @@ FR-Engine_Set_Margin_When_Printing=Set printing margins when printing
 FR-Engine_Show_Print_Setting_Window_When_Printing=Show print setting window when printing
 FR-Engine_Style=
 FR-Engine_Style_Name=
-FR-Engine_Tab_Layout_Title=
-FR-Engine_Utils-Print[Client]=
+FR-Engine_Tab_Layout_Title=Print[Client]=
 FR-Engine_Utils-Submit=
 FR-Engine_Verify-Message=Message
 FR-Engine_ViewPreview=
@@ -2716,6 +2715,7 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet label page display positio
 Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated?
 Fine-Designer_Submit_Condition=Submission conditions
 Fine-Designer_About_Remark_Info=*If the above route can not contact the staff, or after the contact has not been satisfactorily resolved, please call the president to do 24 hours call: {R1}, to serve you.
+Fine-Designer_Allow_Full_Screen=Allow full screen
 Fine-Design_Log_Level_Info=Info
 Fine-Design_Log_Level_Warn=Warn
 Fine-Design_Log_Level_Error=Error

design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties

@@ -675,9 +675,9 @@ Line-Style=Line Style
 Links=Links
 List-Need_Head=Need List Head
 Load=Load
-Fine-Design_Loading=Loading
+Loading=Loading
 Location=Location
-Fine-Design_Template_Status_Locked={}Locked{}
+Locked=(Locked)
 Log=Log
 Logout=Logout
 Low=Low
@@ -2008,7 +2008,7 @@ FR-Designer_Inherit_Page_Layout_Setting=Inherit page layout setting
 FR-Designer_Inherit_Page_Margin_Setting=Inherit page margin setting
 FR-Designer_Inherit_Page_Paper_Setting=Inherit page paper setting
 FR-Designer_Initial_Background_Tips=Initial background of the button
-FR-Design_Initializing=Initializing
+FR-Designer_Initializing=Initializing
 FR-Designer_Input_Rule=Input Rule
 FR-Designer_Input_The_Name_Of_Gloabel_Style=Input the name of gloabel style
 FR-Designer_Insert_Cell_Element=Insert Cell Element
@@ -2626,7 +2626,7 @@ Fine-Designer_Basic_Remote_Connect_Auth_Failed=wrong username & password
 Fine-Designer_Basic_Remote_Connect_Failed=Connect Failed
 Fine-Designer_Basic_Remote_Connect_Successful=Connected
 Fine-Designer_Basic_Remote_Disconnected=server disconnected
-Fine-Design_Basic_Remote_Env=Remote
+Fine-Designer_Basic_Remote_Env=Remote
 Fine-Designer_Basic_Remote_Env_Config=Remote Env Configuration
 Fine-Designer_Basic_Remote_Env_Host=Host
 Fine-Designer_Basic_Remote_Env_Password=Password
@@ -2636,13 +2636,13 @@ Fine-Designer_Basic_Remote_Env_User=Username
 Fine-Designer_Export_Background=Export Background
 Fine-Designer_Loading_Project=Loading project...
 Fine-Designer_Print_Background=Print Background
-Fine-Design_Remote_Design_Add_Member=Add Design Member
+Fine-Designer_Remote_Design_Add_Member=Add Design Member
 Fine-Designer_Remote_Design_Authority_Manager=Remote Design Authority Management
 Fine-Designer_Remote_Design_Configure_Authority=Configure Authority
-Fine-Design_Remote_Design_Decision_Member=Decision System Member
-Fine-Design_Remote_Design_Search=Search
-Fine-Design_Remote_Design_Selected_Member=Selected Design Members
-Fine-Design_Remote_Design_Selected_Member_Count={} Selected
+Fine-Designer_Remote_Design_Decision_Member=Decision System Member
+Fine-Designer_Remote_Design_Search=Search
+Fine-Designer_Remote_Design_Selected_Member=Selected Design Members
+Fine-Designer_Remote_Design_Selected_Member_Count={R1} Selected
 Fine-Designer_Remote_Design_Template_Authority_Config=Template Design Permission Configuration
 Fine-Designer_Remote_Design_User=Remote Design User
 Fine-Designer_Report_Background=Report Background
@@ -2809,5 +2809,3 @@ Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
 Fine-Design_Template_Global_Style_Missed=Global style {} missed
 Fine-Design_Write_Select_Cell_Count=Selected {} cells
 Fine-Design_DSColumn_Result_Group_Format=Format:{} serial number start from 1,built-in parameter {} show total count
-Fine-Design_Format=Format
-Fine-Design_Illegal_Name_Tips=Please rename

design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties

@@ -2651,6 +2651,7 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u7
 Fine-Plugin_Shop_Need_Install_Version=\u9700\u8981\u66F4\u65B0\u523010.0\u63D2\u4EF6\u5546\u5E97\uFF0C\u662F\u5426\u66F4\u65B0\uFF1F
 Fine-Designer_Submit_Condition=\u63D0\u4EA4\u6761\u4EF6
 Fine-Designer_About_Remark_Info=*\u5982\u679C\u4EE5\u4E0A\u9014\u5F84\u65E0\u6CD5\u8054\u7CFB\u5230\u5DE5\u4F5C\u4EBA\u5458\uFF0C\u6216\u8005\u8054\u7CFB\u540E\u6CA1\u6709\u5F97\u5230\u6EE1\u610F\u89E3\u51B3\uFF0C\u8BF7\u62E8\u603B\u88C1\u529E24\u5C0F\u65F6\u7535\u8BDD\uFF1A{R1}\uFF0C\u6765\u4E3A\u60A8\u670D\u52A1\u3002
+Fine-Designer_Allow_Full_Screen=\u5141\u8BB8\u5168\u5C4F
 Fine-Design_Log_Level_Info=\u6D88\u606F
 Fine-Design_Log_Level_Warn=\u8B66\u544A
 Fine-Design_Log_Level_Error=\u9519\u8BEF

design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

@@ -2650,6 +2650,7 @@ Fine-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u7
 Fine-Plugin_Shop_Need_Install_Version=\u9700\u8981\u66F4\u65B0\u523010.0\u63D2\u4EF6\u5546\u5E97\uFF0C\u662F\u5426\u66F4\u65B0\uFF1F
 Fine-Designer_Submit_Condition=\u63D0\u4EA4\u689D\u4EF6
 Fine-Designer_About_Remark_Info=*\u5982\u679C\u4EE5\u4E0A\u9014\u5F91\u7121\u6CD5\u806F\u7CFB\u5230\u5DE5\u4F5C\u4EBA\u54E1\uFF0C\u6216\u8005\u806F\u7CFB\u5F8C\u6C92\u6709\u5F97\u5230\u6EFF\u610F\u89E3\u51B3\uFF0C\u8ACB\u64A5\u7E3D\u88C1\u8FA624\u5C0F\u6642\u96FB\u8A71\uFF1A{R1}\uFF0C\u4F86\u70BA\u60A8\u670D\u52D9\u3002
+Fine-Designer_Allow_Full_Screen=\u5141\u8A31\u5168\u5C4F
 Fine-Design_Log_Level_Info=Info
 Fine-Design_Log_Level_Warn=Warn
 Fine-Design_Log_Level_Error=Error