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

# Conflicts:
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
#	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_ja_JP.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
#	design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

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

@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=bubble
 Fine-Engine_Chart_New_Bar=bar
 Fine-Engine_Chart_New_Area=area
 Fine-Engine_Chart_Drill_Map=Drill map
+Fine-Design_Chart_Axis_Type=Axis Type
+Fine-Design_Chart_Axis_Style=Axis Style
+Fine-Design_Chart_Axis_Interactive=Axis Interactive
+Fine-Design_Chart_Data_Check=Data Check

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties

@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=bubble
 Fine-Engine_Chart_New_Bar=bar
 Fine-Engine_Chart_New_Area=area
 Fine-Engine_Chart_Drill_Map=Drill map
+Fine-Design_Chart_Axis_Type=Axis Type
+Fine-Design_Chart_Axis_Style=Axis Style
+Fine-Design_Chart_Axis_Interactive=Axis Interactive
+Fine-Design_Chart_Data_Check=Data Check

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties

@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=\u30D0\u30D6\u30EB\u30C1\u30E3\u30FC\u30C8(\u65B0\u
 Fine-Engine_Chart_New_Bar=\u6A2A\u68D2\u30B0\u30E9\u30D5(\u65B0\u7279\u6027)
 Fine-Engine_Chart_New_Area=\u9762\u30B0\u30E9\u30D5(\u65B0\u7279\u6027)
 Fine-Engine_Chart_Drill_Map=\u30C9\u30EA\u30EB\u5730\u56F3(\u65B0\u7279\u6027)
+Fine-Design_Chart_Axis_Type=Axis Type
+Fine-Design_Chart_Axis_Style=Axis Style
+Fine-Design_Chart_Axis_Interactive=Axis Interactive
+Fine-Design_Chart_Data_Check=Data Check

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties

@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=\uAE30\uD3EC \uADF8\uB798\uD504
 Fine-Engine_Chart_New_Bar=\uB9C9\uB300 \uADF8\uB798\uD504
 Fine-Engine_Chart_New_Area=\uBA74\uC801 \uADF8\uB798\uD504
 Fine-Engine_Chart_Drill_Map=\uB4DC\uB9B4 \uC9C0\uB3C4
+Fine-Design_Chart_Axis_Type=Axis Type
+Fine-Design_Chart_Axis_Style=Axis Style
+Fine-Design_Chart_Axis_Interactive=Axis Interactive
+Fine-Design_Chart_Data_Check=Data Check

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties

@@ -217,7 +217,7 @@ Fine-Design_Chart_Off=\u5173\u95ED
 Fine-Design_Chart_Null_Value_Show=\u7A7A\u503C\u663E\u793A
 Fine-Design_Chart_Null_Value_Continue=\u8DF3\u8FC7
 Fine-Design_Chart_NULL_Value_Color=\u7A7A\u503C\u989C\u8272
-Fine-Design_Chart_Null_Value_Break=\u7A7A\u503C\u65AD\u5F00
+Fine-Design_Chart_Null_Value_Break=\u65AD\u5F00
 Fine-Design_Chart_Not_Support_Img_And_Cell=\u4E0D\u652F\u6301\u56FE\u7247\u5F62\u5F0F\u548C\u5355\u5143\u683C\u6570\u636E\u6E90
 Fine-Design_Chart_Not_Limit=\u4E0D\u9650\u5236
 Fine-Design_Chart_Not_Follow_Mouse=\u4E0D\u8DDF\u968F\u9F20\u6807
@@ -343,7 +343,7 @@ Fine-Design_Chart_Legend=\u56FE\u4F8B
 Fine-Design_Chart_Layout_Right=\u53F3\u4FA7
 Fine-Design_Chart_Layout_Position=\u4F4D\u7F6E
 Fine-Design_Chart_Layout_Left=\u5DE6\u4FA7
-Fine-Design_Chart_Layout=\u5F62\u5F0F
+Fine-Design_Chart_Layout=\u5E03\u5C40
 Fine-Design_Chart_Layer_Tree=\u94BB\u53D6\u5C42\u7EA7\u5173\u7CFB
 Fine-Design_Chart_Layer_Map_Type=\u5C55\u793A\u7C7B\u578B
 Fine-Design_Chart_Layer_GaoDe=\u9AD8\u5FB7\u5730\u56FE
@@ -527,7 +527,7 @@ Fine-Design_Chart_Change_Bar_Size=\u5C06\u67F1\u5F62\u56FE\u5927\u5C0F\u7F29\u65
 Fine-Design_Chart_Change=\u53EF\u8C03\u6574
 Fine-Design_Chart_Cell_Data=\u5355\u5143\u683C\u6570\u636E
 Fine-Design_Chart_Category_Use_Name=\u5206\u7C7B\u540D
-Fine-Design_Chart_Category_Name=\u5206\u7C7B
+Fine-Design_Chart_Category_Name=\u5206\u7C7B\u540D
 Fine-Design_Chart_Category_Label=\u5206\u7C7B\u6807\u7B7E
 Fine-Design_Chart_Category_Gap=\u5206\u7C7B\u95F4\u9694
 Fine-Design_Chart_Category_Axis=\u5206\u7C7B\u5750\u6807\u8F74
@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=\u6C14\u6CE1\u56FE
 Fine-Engine_Chart_New_Bar=\u6761\u5F62\u56FE
 Fine-Engine_Chart_New_Area=\u9762\u79EF\u56FE
 Fine-Engine_Chart_Drill_Map=\u94BB\u53D6\u5730\u56FE
+Fine-Design_Chart_Axis_Type=\u8F74\u7C7B\u578B
+Fine-Design_Chart_Axis_Style=\u8F74\u6837\u5F0F
+Fine-Design_Chart_Axis_Interactive=\u5750\u6807\u8F74\u4EA4\u4E92\u5C5E\u6027
+Fine-Design_Chart_Data_Check=\u6570\u636E\u76D1\u63A7

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties

@@ -629,3 +629,7 @@ Fine-Engine_Chart_New_Bubble=\u6C23\u6CE1\u5716
 Fine-Engine_Chart_New_Bar=\u689D\u5F62\u5716
 Fine-Engine_Chart_New_Area=\u9762\u7A4D\u5716
 Fine-Engine_Chart_Drill_Map=\u947D\u53D6\u5730\u5716
+Fine-Design_Chart_Axis_Type=Axis Type
+Fine-Design_Chart_Axis_Style=Axis Style
+Fine-Design_Chart_Axis_Interactive=Axis Interactive
+Fine-Design_Chart_Data_Check=Data Check

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

@@ -48,7 +48,7 @@ Fine-Design_Chart_Bar_Outside=\u67F1\u5B50\u5916\u4FA7
 Fine-Design_Chart_Bar_Style=\u6761\u5F62
 Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\u4ECE\u5DE6\u4E0B\u5230\u53F3\u4E0A\u53D1\u6563
 Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\u4ECE\u5DE6\u4E0A\u5230\u53F3\u4E0B\u53D1\u6563
-Fine-Design_Report_Slope_Line_Tip=\u8F93\u5165\u659C\u7EBF\u6587\u5B57,\u4EE5{}\u5206\u9694,\u4F8B\u5982:{}
+Fine-Design_Report_Slope_Line_Tip=\u8F93\u5165\u659C\u7EBF\u6587\u5B57,\u4EE5{}\u5206\u9694,\u4F8B\u5982\:{}
 Fine-Design_Report_Slope_Line=\u659C\u7EBF
 Fine-Design_Report_Bind_Column_Bottom_N=\u540EN\u4E2A
 Fine-Design_Report_Bind_Column_Custom_Data_Appearance=\u81EA\u5B9A\u4E49\u663E\u793A
@@ -98,7 +98,7 @@ Fine-Design_Basic_Choose_All=\u5168\u9009
 Fine-Design_Basic_Choose_None=\u4E0D\u9009
 Fine-Design_Basic_Click_Get_Default_URL=\u70B9\u51FB\u6B64\u6309\u94AE\u83B7\u5F97\u9ED8\u8BA4URL
 Fine-Design_Form_Click_Me=\u70B9\u6211\u6709\u60CA\u559C\u54E6\uFF01
-Collect-Click\!_Get_user_information_code=\u70B9\u51FB!\u83B7\u53D6\u6FC0\u6D3B\u7801
+Collect-Click\!_Get_user_information_code=\u70B9\u51FB\!\u83B7\u53D6\u6FC0\u6D3B\u7801
 Fine-Design_Report_Collect_Use_Designer=\u4F7F\u7528\u8BBE\u8BA1\u5668
 Fine-Design_Chart_Color_Match=\u914D\u8272
 Fine-Design_Basic_Colors=\u989C\u8272
@@ -660,7 +660,7 @@ Fine-Design_Report_Test_URL=\u6D4B\u8BD5\u8FDE\u63A5
 Fine-Design_Report_Thick_Bottom_Border_Line=\u7C97\u5E95\u6846\u7EBF
 Fine-Design_Basic_To=\u5230
 Fine-Design_Basic_Today=\u4ECA\u5929
-Fine-Design_Chart_Top_Down_Shade=\u6E10\u53D8
+Fine-Design_Chart_Top_Down_Shade=\u4E0A\u4E0B\u6E10\u53D8
 Fine-Design_Report_Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u53CC\u4E0B\u6846\u7EBF
 Fine-Design_Report_Top_And_Thick_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u7C97\u4E0B\u6846\u7EBF
 Fine-Design_Report_Top_Bottom_Border_Line=\u4E0A\u4E0B\u6846\u7EBF
@@ -767,7 +767,7 @@ Fine-Design_Report_One_Record_Exists_In_Many_Groups=\u4E00\u4E2A\u8BB0\u5F55\u53
 Fine-Design_Basic_Duplicate_Parameter_Name=\u8BE5\u53C2\u6570\u540D\u5DF2\u5B58\u5728\uFF0C\u8BF7\u91CD\u547D\u540D
 Fine-Design_Basic_Empty_Parameter_Name=\u53C2\u6570\u540D\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u8BF7\u91CD\u547D\u540D\u3002
 Fine-Design_Basic_Workspace_Default=\u9ED8\u8BA4\u5DE5\u4F5C\u76EE\u5F55
-Fine-Design_Basic_Extend_Class=\u7EE7\u627F\u7C7B:{}\u3002
+Fine-Design_Basic_Extend_Class=\u7EE7\u627F\u7C7B\:{}\u3002
 Fine-Design_Basic_Product_Feedback=\u4EA7\u54C1\u53CD\u9988
 Fine-Design_Basic_Px=\u50CF\u7D20
 Fine-Design_Basic_Roles_Already_Authority_Edited=\u5DF2\u914D\u7F6E\u89D2\u8272
@@ -897,7 +897,7 @@ Fine-Design_Basic_Plugin_Delete=\u5220\u9664
 Fine-Design_Basic_Plugin_Detecting_Update=\u6B63\u5728\u68C0\u6D4B\u66F4\u65B0
 Fine-Design_Basic_Plugin_Disable=\u7981\u7528
 Fine-Design_Basic_Plugin_Has_Been_Actived=\u63D2\u4EF6\u5DF2\u88AB\u542F\u7528
-Fine-Design_Basic_Plugin_Has_Been_Disabled=
+Fine-Design_Basic_Plugin_Has_Been_Disabled=Plugin has been disabled, restart the designer and sever to enable it and the sever need to be manually restarted
 Fine-Design_Basic_Plugin_Install=\u5B89\u88C5
 Fine-Design_Basic_Plugin_Install_From_Local=\u4ECE\u672C\u5730\u6587\u4EF6\u5B89\u88C5
 Fine-Design_Basic_Plugin_Install_Successful=\u8BE5\u63D2\u4EF6\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u53CA\u670D\u52A1\u5668\u65F6\u88AB\u542F\u7528\uFF0C\u670D\u52A1\u5668\u9700\u624B\u52A8\u91CD\u542F
@@ -1426,22 +1426,22 @@ Fine-Design_Basic_Refresh_Successfully=\u5237\u65B0\u6210\u529F
 Fine-Design_Basic_Reg_Expressions=\u6B63\u5219\u8868\u8FBE\u5F0F
 Fine-Design_Basic_Reg_Max_Length=\u6700\u5927\u957F\u5EA6
 Fine-Design_Basic_Reg_Min_Length=\u6700\u5C0F\u957F\u5EA6
-Fine-Design_Basic_Remote_Env_Account_Password=\u5BC6\u7801:
+Fine-Design_Basic_Remote_Env_Account_Password=\u5BC6\u7801\:
-Fine-Design_Basic_Remote_Env_Account_Username=\u7528\u6237\u540D:
+Fine-Design_Basic_Remote_Env_Account_Username=\u7528\u6237\u540D\:
 Fine-Design_Basic_Remote_Env_Config=\u8FDC\u7A0B\u670D\u52A1\u5668\u914D\u7F6E
 Fine-Design_Basic_Remote_Env_Enable_Https=\u542F\u7528https
-Fine-Design_Basic_Remote_Env_Host_IP=\u4E3B\u673A\u540D/IP:
+Fine-Design_Basic_Remote_Env_Host_IP=\u4E3B\u673A\u540D/IP\:
-Fine-Design_Basic_Remote_Env_Https_Cert_Path=\u8BC1\u4E66\u8DEF\u5F84:
+Fine-Design_Basic_Remote_Env_Https_Cert_Path=\u8BC1\u4E66\u8DEF\u5F84\:
-Fine-Design_Basic_Remote_Env_Https_Secret_Key=https\u79D8\u94A5:
+Fine-Design_Basic_Remote_Env_Https_Secret_Key=https\u79D8\u94A5\:
 Fine-Design_Basic_Remote_Env_Https_Tips=\u63D0\u793A\uFF1A\u914D\u7F6Ehttps\u540E\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002
 Fine-Design_Basic_Remote_Env_Platform_Account=\u51B3\u7B56\u7CFB\u7EDF\u8D26\u53F7
-Fine-Design_Basic_Remote_Env_Port=\u7AEF\u53E3:
+Fine-Design_Basic_Remote_Env_Port=\u7AEF\u53E3\:
 Fine-Design_Basic_Remote_Env_Server=\u8FDC\u7A0B\u670D\u52A1\u5668
 Fine-Design_Basic_Remote_Env_Server_Config_Tips=\u63D0\u793A\uFF1A\u4E3B\u673A\u4F4D\u7F6E\u662F\u4E3B\u673A\u540D\u3001\u7AEF\u53E3\u3001Web\u5E94\u7528\u3001Servlet\u7684\u7EC4\u5408\uFF0C\u586B\u5199\u4E3B\u673A\u540D\u3001\u7AEF\u53E3\u3001Web\u5E94\u7528\u3001Servlet\u540E\u81EA\u52A8\u751F\u6210\u4E3B\u673A\u4F4D\u7F6E\uFF0C\u6216\u8F93\u5165\u4E3B\u673A\u4F4D\u7F6E\u540E\u81EA\u52A8\u751F\u6210\u5176\u4ED6\u56DB\u9879\u3002
-Fine-Design_Basic_Remote_Env_Servlet_Name=Servlet:
+Fine-Design_Basic_Remote_Env_Servlet_Name=Servlet\:
 Fine-Design_Basic_Remote_Env_Test_Connection=\u6D4B\u8BD5\u8FDE\u63A5
-Fine-Design_Basic_Remote_Env_URL=\u4E3B\u673A\u4F4D\u7F6E:
+Fine-Design_Basic_Remote_Env_URL=\u4E3B\u673A\u4F4D\u7F6E\:
-Fine-Design_Basic_Remote_Env_Web_Name=Web\u5E94\u7528:
+Fine-Design_Basic_Remote_Env_Web_Name=Web\u5E94\u7528\:
 Fine-Design_Basic_Remove=\u5220\u9664
 Fine-Design_Form_Remove_Button_ToolBar=\u79FB\u9664\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
 Fine-Design_Form_Remove_Item=\u5220\u9664\u9009\u4E2D
@@ -1802,12 +1802,12 @@ Fine-Design_Basic_Tabledata_Select_To_Merge=\u9009\u62E9\u8981\u5408\u5E76\u7684
 Fine-Design_Basic_Tabledata_Default_Parameter=\u6570\u636E\u96C6\u9ED8\u8BA4\u53C2\u6570
 Fine-Design_Basic_Tabledata_Type_Tree=\u6811\u6570\u636E\u96C6
 Fine-Design_Basic_Tabledata_Type_Database_Query=\u6570\u636E\u67E5\u8BE2\u6570\u636E\u96C6
-Fine-Design_Basic_Tabledata_Type_Class=\u7A0B\u5E8F\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Class=\u7A0B\u5E8F
 Fine-Design_Basic_Tabledata_Type_Embedded=\u5185\u7F6E\u6570\u636E\u96C6
 Fine-Design_Basic_Tabledata_Type_Relation=\u5173\u8054\u6570\u636E\u96C6
 Fine-Design_Basic_Tabledata_Type_Stored_Procedure=\u5B58\u50A8\u8FC7\u7A0B
 Fine-Design_Basic_Tabledata_Preview_Warn_Text=\u7B2C{}\u5217\u4E0D\u5B58\u5728\uFF0C\u603B\u8BA1{}\u5217\uFF01
-Fine-Design_Basic_Connection_Duplicate_Name=\u6570\u636E\u8FDE\u63A5:{}\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u4FEE\u6539\u540D\u5B57\uFF01
+Fine-Design_Basic_Connection_Duplicate_Name=\u6570\u636E\u8FDE\u63A5\:{}\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u4FEE\u6539\u540D\u5B57\uFF01
 Fine-Design_Basic_Connection_Empty_Name=\u6570\u636E\u96C6\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u6DFB\u52A0\u4E00\u4E2A\u540D\u5B57\uFF01
 Fine-Design_Basic_Multiple_Select_Warn_Text=\u5F53\u524D\u5217\u8868\u4E3A\u7A7A\u6216\u8005\u4F60\u6CA1\u6709\u9009\u4E2D\u4EFB\u4F55\u9879
 Fine-Design_Basic_Template_Select=\u9009\u62E9\u6A21\u677F
@@ -1834,7 +1834,7 @@ Fine-Design_Basic_Widget_Type_Textarea=\u6587\u672C\u57DF\u63A7\u4EF6
 Fine-Design_Basic_Widget_Type_Password=\u5BC6\u7801\u63A7\u4EF6
 Fine-Design_Basic_Widget_Type_Text=\u6587\u672C\u63A7\u4EF6
 Fine-Design_Basic_Workspace_Empty_Name_Warn_Text=\u5F53\u524D\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u8BBE\u7F6E\u4E00\u4E2A\u540D\u5B57
-Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text=\u8FD0\u884C\u73AF\u5883:{}\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u91CD\u547D\u540D!
+Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text=\u8FD0\u884C\u73AF\u5883\:{}\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u91CD\u547D\u540D\!
 Fine-Design_Basic_Template_Closed_Warn_Text=\u6A21\u677F{}\u5DF2\u7ECF\u5173\u95ED\u3002
 Fine-Design_Basic_DS_Column=\u6570\u636E\u5217
 Fine-Design_Basic_Tabledata_Embedded_Table_Design=\u8868\u8BBE\u8BA1
@@ -1891,7 +1891,7 @@ Fine-Design_Chart_Subject_Color=\u4E3B\u9898\u989C\u8272
 Fine-Design_Chart_Category_Name=\u5206\u7C7B\u540D
 Fine-Design_Chart_Second_Value_Axis=\u7B2C\u4E8C\u503C\u8F74
 Fine-Design_Chart_Value_Define=\u503C\u5B9A\u4E49
-Fine-Design_Chart_Enable_Auto_Refresh=\u542F\u7528\u81EA\u52A8\u5237\u65B0
+Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52A8\u5237\u65B0
 Fine-Design_Chart_Tabledata=\u6570\u636E\u96C6
 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u5B57\u6BB5\u540D
 Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u5B57\u6BB5\u503C
@@ -1903,7 +1903,6 @@ Fine-Design_Chart_Alert_Value=\u8B66\u6212\u503C
 Fine-Design_Chart_Alert_Line_Color=\u8B66\u6212\u7EBF\u989C\u8272
 Fine-Design_Chart_Alert_Tip=\u63D0\u793A\u6587\u5B57
 Fine-Design_Chart_Content=\u5185\u5BB9
-
 Fine-Design_Chart_Layout=\u5E03\u5C40
 Fine-Design_Chart_At_The_Left=\u5C45\u5DE6
 Fine-Design_Chart_At_The_Right=\u5C45\u53F3
@@ -1929,12 +1928,10 @@ Fine-Design_Report_Write_Select_Cell_Count=\u5DF2\u7ECF\u9009\u62E9\u4E86{}\u4E2
 Fine-Design_Report_DSColumn_Result_Group_Format=\u683C\u5F0F\uFF1A{} \u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u7F6E\u53C2\u6570{}\u8868\u793A\u603B\u6570
 Fine-Design_Report_Format=\u683C\u5F0F
 Fine-Design_Basic_Illegal_Name_Tips=\u8BF7\u91CD\u547D\u540D
-
 Fine-Design_Basic_Cancel=\u53D6\u6D88
 Fine-Design_Basic_Common_Save_Failed=Save failed
 Fine-Design_Basic_Common_Save_Successfully=Save successfully
 Fine-Design_Report_Edit=\u7F16\u8F91
-
 Fine-Design_Report_Parameter_Formula=\u516C\u5F0F
 Fine-Design_Report_Page_Setup_Orientation=\u65B9\u5411
 Fine-Design_Report_OK=\u786E\u5B9A
@@ -1949,7 +1946,6 @@ Fine-Design_Report_Font_Italic=\u503E\u659C
 Fine-Design_Report_Font_Bold=\u52A0\u7C97
 Fine-Design_Report_Font_Bold_Italic=\u52A0\u7C97\u503E\u659C
 Fine-Design_Report_Alpha=\u4E0D\u900F\u660E\u5EA6
-
 Fine-Design_Form_FRFont_Bold=\u52A0\u7C97
 Fine-Design_Form_StyleAlignment_Center=\u5C45\u4E2D
 Fine-Design_Report_Tree_Height=\u9AD8\u5EA6
@@ -2068,10 +2064,9 @@ Fine-Design_Report_Form=\u8868\u5355
 Fine-Design_Basic_Form_Basic_Properties=\u57FA\u672C\u5C5E\u6027
 Fine-Design_Chart_Unit_Thousand=\u5343
 Fine-Design_Report_Icon=\u56FE\u6807
-Fine-Design_Basic_Line=\u884C: {0}
+Fine-Design_Basic_Line=\u884C\: {0}
 Fine-Design_Basic_Location=\u4F4D\u7F6E
 Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790
-
 Fine-Design_Report_Formula=\u516C\u5F0F
 Fine-Design_Report_Advanced=\u9AD8\u7EA7
 Fine-Design_Basic_Y_Axis=Y\u8F74
@@ -2081,13 +2076,8 @@ Fine-Design_Basic_Value=\u503C
 Fine-Design_Basic_Text=\u6587\u672C
 Fine-Design_Basic_Search=\u641C\u7D22
 Fine-Design_Basic_Background=\u80CC\u666F
-
-
-
 Fine-Design_Report_Radius=\u5706\u89D2
 Fine-Design_Report_Fill=\u586B\u5145
-
-
 Fine-Design_Basic_Engine_Event_After_Append=\u6DFB\u52A0\u884C\u540E
 Fine-Design_Basic_Engine_Event_After_Applet_Print=Applet\u6253\u5370\u540E
 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E
@@ -2188,3 +2178,49 @@ Fine-Design_Basic_Make_Failure=\u65B0\u5EFA\u5931\u8D25
 Fine-Design_Basic_Rename_Failure=\u91CD\u547D\u540D\u5931\u8D25
 Fine-Design_Basic_Confirm_Delete_Folder=\u5220\u9664\u6240\u9009\u6587\u4EF6\u5939\u4F1A\u540C\u65F6\u5220\u9664\u5B83\u5305\u542B\u7684\u6A21\u677F\uFF0C\u662F\u5426\u5220\u9664\uFF1F
 Fine-Design_Basic_Delete_Failure=\u5220\u9664\u5931\u8D25
+Fine-Design_Basic_Write_Insert_Submit=\u63D2\u5165\u63D0\u4EA4
+Find-Design_Basic_Hyperlink_Extends_Report_Parameters=Inherit Report Parameters
+Fine-Design_Basic_Plugin_Warning=Alert
+Fine-Design_Report_DEFAULT=DEFAULT
+Fine-Design_Appear_Refresh=\u9875\u9762\u518D\u73B0\u65F6\u5237\u65B0
+Fine-Design_Report_Tab_Carousel=tab\u8F6E\u64AD
+Fine-Design_DataFunction_Sum=\u6C42\u548C
+Fine-Design_DataFunction_Average=\u5E73\u5747
+Fine-Design_DataFunction_Max=\u6700\u5927\u503C
+Fine-Design_DataFunction_Min=\u6700\u5C0F\u503C
+Fine-Design_DataFunction_Count=\u4E2A\u6570
+Fine-Design_DataFunction_None=\u65E0
+Fine-Design_Basic_Action_CollapseAllFolds_Desc=\u53D6\u6D88\u6240\u6709\u4EE3\u7801\u6298\u53E0.
+Fine-Design_Basic_Action_CollapseAllFolds_Mnemonic=O
+Fine-Design_Basic_Action_CollapseAllFolds_Name=\u53D6\u6D88\u6240\u6709\u4EE3\u7801\u6298\u53E0
+Fine-Design_Basic_Action_CollapseCommentFolds_Desc=\u53D6\u6D88\u6CE8\u91CA\u4EE3\u7801\u6298\u53E0.
+Fine-Design_Basic_Action_CollapseCommentFolds_Mnemonic=C
+Fine-Design_Basic_Action_CollapseCommentFolds_Name=\u53D6\u6D88\u6CE8\u91CA\u4EE3\u7801\u6298\u53E0
+Fine-Design_Basic_Action_Copy_Desc=\u5C06\u5F53\u524D\u9009\u62E9\u590D\u5236\u5230\u526A\u8D34\u677F.
+Fine-Design_Basic_Action_Copy_Mnemonic=C
+Fine-Design_Basic_Action_Copy_Name=\u590D\u5236
+Fine-Design_Basic_Action_Cut_Desc=\u5C06\u5F53\u524D\u9009\u62E9\u590D\u5236\u5230\u526A\u8D34\u677F\u5E76\u4ECE\u6587\u672C\u533A\u57DF\u5220\u9664.
+Fine-Design_Basic_Action_Cut_Mnemonic=T
+Fine-Design_Basic_Action_Cut_Name=\u526A\u5207
+Fine-Design_Basic_Action_Delete_Desc=\u5220\u9664\u5F53\u524D\u9009\u62E9\u533A\u57DF.
+Fine-Design_Basic_Action_Delete_Mnemonic=D
+Fine-Design_Basic_Action_Delete_Name=\u5220\u9664
+Fine-Design_Basic_Action_ExpandAllFolds_Desc=\u6253\u5F00\u6240\u6709\u4EE3\u7801\u6298\u53E0.
+Fine-Design_Basic_Action_ExpandAllFolds_Mnemonic=E
+Fine-Design_Basic_Action_ExpandAllFolds_Name=\u6253\u5F00\u6240\u6709\u4EE3\u7801\u6298\u53E0
+Fine-Design_Basic_Action_Paste_Desc=\u5C06\u5F53\u524D\u526A\u8D34\u677F\u5185\u5BB9\u590D\u5236\u5230\u6587\u672C\u533A\u57DF.
+Fine-Design_Basic_Action_Paste_Mnemonic=P
+Fine-Design_Basic_Action_Paste_Name=\u7C98\u8D34
+Fine-Design_Basic_Action_Redo_Desc=\u6267\u884C\u4E0B\u4E2A\u64CD\u4F5C.
+Fine-Design_Basic_Action_Redo_Mnemonic=R
+Fine-Design_Basic_Action_Redo_Name=\u91CD\u65B0\u64CD\u4F5C
+Fine-Design_Basic_Action_SelectAll_Desc=\u9009\u62E9\u5F53\u524D\u6587\u6863\u4E2D\u5168\u90E8\u5185\u5BB9.
+Fine-Design_Basic_Action_SelectAll_Mnemonic=A
+Fine-Design_Basic_Action_SelectAll_Name=\u5168\u9009
+Fine-Design_Basic_Action_ToggleCurrentFold_Desc=\u6298\u53E0/\u5F00\u542F\u63D2\u5165\u7B26\u6240\u5728\u4F4D\u7F6E.
+Fine-Design_Basic_Action_ToggleCurrentFold_Mnemonic=F
+Fine-Design_Basic_Action_ToggleCurrentFold_Name=\u6298\u53E0/\u5F00\u542F\u672C\u533A\u6BB5
+Fine-Design_Basic_Action_Undo_Desc=\u64A4\u9500\u4E0A\u6B21\u64CD\u4F5C.
+Fine-Design_Basic_Action_Undo_Mnemonic=U
+Fine-Design_Basic_Action_Undo_Name=\u590D\u539F
+Fine-Design_Basic_Actions=\u4EFB\u52A1

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

@@ -48,7 +48,7 @@ Fine-Design_Chart_Bar_Outside=\u67F1\u5B50\u5916\u5074
 Fine-Design_Chart_Bar_Style=\u689D\u5F62
 Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\u7E3D\u5DE6\u4E0B\u5230\u53F3\u4E0A\u767C\u6563
 Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\u5F9E\u5DE6\u4E0A\u5230\u53F3\u4E0B\u767C\u6563
-Fine-Design_Report_Slope_Line_Tip=Input Slope Line text separated by {},Example:{}
+Fine-Design_Report_Slope_Line_Tip=Input Slope Line text separated by {},Example\:{}
 Fine-Design_Report_Slope_Line=\u659C\u7DDA
 Fine-Design_Report_Bind_Column_Bottom_N=\u5F8CN\u500B
 Fine-Design_Report_Bind_Column_Custom_Data_Appearance=\u81EA\u5B9A\u7FA9\u986F\u793A
@@ -98,7 +98,7 @@ Fine-Design_Basic_Choose_All=\u5168\u9078
 Fine-Design_Basic_Choose_None=\u4E0D\u9078
 Fine-Design_Basic_Click_Get_Default_URL=\u9EDE\u64CA\u6B64\u6309\u9215\u7372\u5F97\u9810\u8A2DURL
 Fine-Design_Form_Click_Me=\u9EDE\u6211\u6709\u9A5A\u559C\u54E6\uFF01
-Collect-Click\!_Get_user_information_code=\u9EDE\u64CA!\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC
+Collect-Click\!_Get_user_information_code=\u9EDE\u64CA\!\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC
 Fine-Design_Report_Collect_Use_Designer=\u4F7F\u7528\u8A2D\u8A08\u5668
 Fine-Design_Chart_Color_Match=\u914D\u8272
 Fine-Design_Basic_Colors=\u984F\u8272
@@ -195,6 +195,7 @@ Fine-Design_Basic_Env_Des1=\u8ACB\u9078\u64C7\u5831\u8868\u4F3A\u670D\u5668\u624
 Fine-Design_Basic_Env_Des2=Servlet\u4F4D\u7F6E\u662F\u4E3B\u6A5F\u540D\uFF0C\u57E0\uFF0CWEB\u61C9\u7528\uFF0CServlet\u7684\u7D44\u5408\uFF0C\u5B83\u61C9\u7576\u6307\u5411\u4E00\u500BServlet\uFF0C\u6BD4\u5982"http\://localhost\:8080/WebReport/ReportServer"\u3002\u60A8\u53EF\u4EE5\u9078\u64C7\u586B\u5BEB\u4E3B\u6A5F\u540D\uFF0C\u57E0\uFF0CWEB\u61C9\u7528\uFF0CServlet\uFF0C\u5B83\u6703\u81EA\u52D5\u751F\u6210\u60A8\u6240\u9700\u8981\u7684Servlet\u4F4D\u7F6E\u3002
 Fine-Design_Basic_Env_Remote_Server=\u9060\u7A0B\u4F3A\u670D\u5668
 Fine-Design_Report_Even=\u5076\u6578
+Fine-Design_Report_Event_Set=\u4E8B\u4EF6\u8A2D\u5B9A
 Fine-Design_Basic_Example=\u4F8B\u5982
 Fine-Design_Report_Exception_Stack_Trace=\u932F\u8AA4\u7570\u5E38\u5806\u68E7\u8A0A\u606F
 Fine-Design_Report_Execute_Report_by_Layer_Engine=\u7528\u5217\u5F0F\u7684\u5F15\u64CE\u4F86\u57F7\u884C\u5831\u8868
@@ -430,7 +431,7 @@ Fine-Design_Basic_MobilePhone=\u624B\u6A5F
 Fine-Design_Basic_Mon=\u661F\u671F\u4E00
 Fine-Design_Basic_More_Information=\u66F4\u591A\u8A0A\u606F
 Fine-Design_Basic_Multi_Nam_Formula=\  \u8CC7\u6599\u96C6\u540D\:                       \u8CC7\u6599\u96C6\u689D\u4EF6\:
-Fine-Design_Basic_Multiple_Markers=Multiple markers at this line:
+Fine-Design_Basic_Multiple_Markers=Multiple markers at this line\:
 Fine-Design_Basic_My_Computer=\u6211\u7684\u96FB\u8166
 Fine-Design_Basic_NNormal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u4E0D\u80FD\u70BA\u7A7A
@@ -481,6 +482,7 @@ Fine-Design_Report_ParentCell_Setting=\u7236\u683C\u8A2D\u5B9A
 Fine-Design_Basic_Password=\u5BC6\u78BC
 Fine-Design_Form_Pink=\u7C89\u7D05
 Fine-Design_Basic_Loading_And_Waiting=Loading,Please Waiting...
+Fine-Design_Basic_TableData_Select_One=Select one TD
 Fine-Design_Chart_Pointer_A_Tick_Order=\u6307\u91DD\u503C\u53CA\u523B\u5EA6\u503C\u6578\u91CF\u7D1A
 Fine-Design_Report_Poly=\u8907\u5408\u5F0F\u5831\u8868
 Fine-Design_Report_Poly_Report_Block=\u8868\u683C\u985E\u578B\u805A\u5408\u584A
@@ -765,7 +767,7 @@ Fine-Design_Report_One_Record_Exists_In_Many_Groups=\u4E00\u500B\u8A18\u9304\u53
 Fine-Design_Basic_Duplicate_Parameter_Name=The parameter name already exists, please rename.
 Fine-Design_Basic_Empty_Parameter_Name=The parameter name is empty, please rename.
 Fine-Design_Basic_Workspace_Default=Default workspace
-Fine-Design_Basic_Extend_Class=Extend class:{}.
+Fine-Design_Basic_Extend_Class=Extend class\:{}.
 Fine-Design_Basic_Product_Feedback=\u554F\u984C\u53CD\u994B
 Fine-Design_Basic_Px=\u50CF\u7D20
 Fine-Design_Basic_Roles_Already_Authority_Edited=\u5DF2\u914D\u7F6E\u89D2\u8272
@@ -1040,9 +1042,9 @@ Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801
 Fine-Design_Basic_Community_Bug=BUG\u53CD\u994B
 Fine-Design_Report_Community_Help=\u5E6B\u52A9\u6587\u6A94
 Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u8FF4\u97FF
+Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3
 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236
 Fine-Design_Basic_Commuinity_Solution=\u79D1\u6280\u65B9\u6848
-Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3
 Fine-Design_Basic_Community_Questions=\u554F\u984C\u6C42\u52A9
 Fine-Design_Basic_Community_sign=\u5831\u8868\u5DE5\u7A0B\u5E2B\u8A8D\u8B49
 Fine-Design_Basic_Community_Update=\u7522\u54C1\u66F4\u65B0
@@ -1104,7 +1106,7 @@ Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
 Fine-Design_Report_Confusion_Key=\u6DF7\u6DC6\u95DC\u9375\u5B57
 Fine-Design_Basic_Connect_SQL_Cannot_Null=\u8CC7\u6599\u9023\u63A5\u548CSQL\u9762\u677F\u4E0D\u80FD\u70BA\u7A7A
 Fine-Design_Report_Connection_Failed=\u93C8\u63A5\u5931\u6557
-Fine-Design_Form_Coords_And_Size=\u5EA7\u6A19\XB7\u5C3A\u5BF8
+Fine-Design_Form_Coords_And_Size=\u5EA7\u6A19XB7\u5C3A\u5BF8
 Fine-Design_Basic_Copy=\u8907\u88FD
 Fine-Design_Report_Copy_Number=\u4EFD\u6578
 Fine-Design_Basic_Cover_None=\u5168\u4E0D\u8986\u84CB
@@ -1171,7 +1173,6 @@ Fine-Design_Report_Error_Handler_Template=\u51FA\u932F\u6A21\u677F\u5B9A\u7FA9
 Fine-Design_Report_Event=\u4E8B\u4EF6
 Fine-Design_Report_Event_Name=\u4E8B\u4EF6\u540D
 Fine-Design_Report_Event_Name_Type=\u4E8B\u4EF6\u540D\u5B57\u548C\u985E\u578B
-Fine-Design_Report_Event_Set=\u4E8B\u4EF6\u8A2D\u5B9A
 Fine-Design_Report_Event_Show_Widgets=\u76F4\u63A5\u986F\u793A\u5C0F\u5DE5\u5177
 Fine-Design_Report_Event_Type=\u4E8B\u4EF6\u985E\u578B
 Fine-Design_Report_Exchange_Key=\u9EDE\u64CA\u4E92\u63DB\u5FEB\u6377\u9375
@@ -1425,22 +1426,22 @@ Fine-Design_Basic_Refresh_Successfully=\u91CD\u65B0\u6574\u7406\u6210\u529F
 Fine-Design_Basic_Reg_Expressions=\u6B63\u5247\u8868\u9054\u5F0F
 Fine-Design_Basic_Reg_Max_Length=\u6700\u5927\u9577\u5EA6
 Fine-Design_Basic_Reg_Min_Length=\u6700\u5C0F\u9577\u5EA6
-Fine-Design_Basic_Remote_Env_Account_Password=\u5BC6\u78BC:
+Fine-Design_Basic_Remote_Env_Account_Password=\u5BC6\u78BC\:
-Fine-Design_Basic_Remote_Env_Account_Username=\u7528\u6236\u540D:
+Fine-Design_Basic_Remote_Env_Account_Username=\u7528\u6236\u540D\:
 Fine-Design_Basic_Remote_Env_Config=\u9060\u7A0B\u670D\u52D9\u5668\u914D\u7F6E
 Fine-Design_Basic_Remote_Env_Enable_Https=\u555F\u7528https
-Fine-Design_Basic_Remote_Env_Host_IP=\u4E3B\u6A5F\u540D/IP:
+Fine-Design_Basic_Remote_Env_Host_IP=\u4E3B\u6A5F\u540D/IP\:
-Fine-Design_Basic_Remote_Env_Https_Cert_Path=\u8B49\u66F8\u8DEF\u5F91:
+Fine-Design_Basic_Remote_Env_Https_Cert_Path=\u8B49\u66F8\u8DEF\u5F91\:
-Fine-Design_Basic_Remote_Env_Https_Secret_Key=https\u5BC6\u9470:
+Fine-Design_Basic_Remote_Env_Https_Secret_Key=https\u5BC6\u9470\:
 Fine-Design_Basic_Remote_Env_Https_Tips=\u63D0\u793A\uFF1A\u914D\u7F6Ehttps\u5F8C\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002
 Fine-Design_Basic_Remote_Env_Platform_Account=\u6C7A\u7B56\u7CFB\u7D71\u8CEC\u865F
-Fine-Design_Basic_Remote_Env_Port=\u7AEF\u53E3:
+Fine-Design_Basic_Remote_Env_Port=\u7AEF\u53E3\:
 Fine-Design_Basic_Remote_Env_Server=\u9060\u7A0B\u670D\u52D9\u5668
 Fine-Design_Basic_Remote_Env_Server_Config_Tips=\u63D0\u793A\uFF1A\u4E3B\u6A5F\u4F4D\u7F6E\u662F\u4E3B\u6A5F\u540D\u3001\u7AEF\u53E3\u3001Web\u61C9\u7528\u3001Servlet\u7684\u7D44\u5408\uFF0C\u586B\u5BEB\u4E3B\u6A5F\u540D\u3001\u7AEF\u53E3\u3001Web\u61C9\u7528\u3001Servlet\u5F8C\u81EA\u52D5\u751F\u6210\u4E3B\u6A5F\u4F4D\u7F6E\uFF0C\u6216\u8F38\u5165\u4E3B\u6A5F\u4F4D\u7F6E\u5F8C\u81EA\u52D5\u751F\u6210\u5176\u4ED6\u56DB\u9805\u3002
-Fine-Design_Basic_Remote_Env_Servlet_Name=Servlet:
+Fine-Design_Basic_Remote_Env_Servlet_Name=Servlet\:
 Fine-Design_Basic_Remote_Env_Test_Connection=\u6E2C\u8A66\u9023\u63A5
-Fine-Design_Basic_Remote_Env_URL=\u4E3B\u6A5F\u4F4D\u7F6E:
+Fine-Design_Basic_Remote_Env_URL=\u4E3B\u6A5F\u4F4D\u7F6E\:
-Fine-Design_Basic_Remote_Env_Web_Name=Web\u61C9\u7528:
+Fine-Design_Basic_Remote_Env_Web_Name=Web\u61C9\u7528\:
 Fine-Design_Basic_Remove=\u522A\u9664
 Fine-Design_Form_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 Fine-Design_Form_Remove_Item=\u522A\u9664\u9078\u4E2D
@@ -1585,6 +1586,7 @@ Fine-Design_Basic_Web_Preview_Port=\u57E0\u865F
 Fine-Design_Basic_Web_Preview_Port_Setting=\u57E0\u8A2D\u5B9A
 Fine-Design_Report_Widget=\u5C0F\u5DE5\u5177
 Fine-Design_Basic_Widget_Settings_Duplicate=\u8A2D\u5B9A
+Fine-Design_Form_Widget_Visible=\u63A7\u5236\u5143\u4EF6\u53EF\u898B
 Fine-Design_Form_Widget_Display_Position=\u63A7\u5236\u9805\u986F\u793A\u4F4D\u7F6E
 Fine-Design_Form_Widget_Order=\u63A7\u4EF6\u9806\u5E8F
 Fine-Design_Form_Widget_Display_Position_Similar=\u986F\u793A\u4F4D\u7F6E
@@ -1600,7 +1602,6 @@ Fine-Design_Form_Widget_Return_Leaf=\u7D50\u679C\u8FD4\u56DE\u8449\u5B50\u7BC0\u
 Fine-Design_Form_Widget_Return_Path=\u7D50\u679C\u8FD4\u56DE\u5B8C\u6574\u5C64\u6B21\u8DEF\u5F91
 Fine-Design_Form_Widget_Scaling_Mode_Fit=\u9069\u61C9\u5340\u57DF
 Fine-Design_Form_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u5927\u5C0F
-Fine-Design_Form_Widget_Visible=\u63A7\u5236\u5143\u4EF6\u53EF\u898B
 Fine-Design_Form_Widget_Width=\u63A7\u5236\u9805\u5BEC\u5EA6
 Fine-Design_Basic_Designer_Width=\u5BEC
 Fine-Design_Basic_WorkBook=\u5DE5\u4F5C\u7C3F
@@ -1644,9 +1645,10 @@ Fine-Design_Report_Engine_ECP_Error_Password=\u5BC6\u78BC\u932F\u8AA4
 Fine-Design_Report_Engine_Email=\u90F5\u4EF6
 Fine-Design_Report_Engine_Enlarge_Or_Reduce=\u7E2E\u653E
 Fine-Design_Report_Engine_ErrorCode_Prefix=\u932F\u8AA4\u4EE3\u78BC
-Fine-Design_Report_Engine_Excel_Import_Clean=
+Fine-Design_Report_Engine_Excel_Import_Append=\u589E\u91CF\u5BFC\u5165
-Fine-Design_Report_Engine_Excel_Import_Cover=
+Fine-Design_Report_Engine_Excel_Import_Clean=\u6E05\u7A7A\u5BFC\u5165
-Fine-Design_Report_Engine_Excel_Import_Repeat=
+Fine-Design_Report_Engine_Excel_Import_Cover=\u8986\u76D6\u5BFC\u5165
+Fine-Design_Report_Engine_Excel_Import_Repeat=\u591A\u6B21\u5BFC\u5165[excel]
 Fine-Design_Report_Engine_Export=\u532F\u51FA
 Fine-Design_Basic_Engine_Export_Excel_Page=\u5206\u9801\u532F\u51FA
 Fine-Design_Basic_Engine_Export_Excel_PageToSheet=\u5206\u9801\u5206sheet\u532F\u51FA
@@ -1750,10 +1752,10 @@ Fine-Design_Report_Widget_Mobile_Terminal=\u884C\u52D5\u8A2D\u5099
 Fine-Design_Form_Widget_Tree_And_Table=\u63A7\u5236\u9805\u6A39\u548C\u63A7\u5236\u9805\u8868
 Fine-Design_Basic_Remote_Connect_Auth_Failed=\u7528\u6236\u540D\u5BC6\u78BC\u932F\u8AA4
 Fine-Design_Basic_Remote_Connect_Failed=Connect Failed
-Fine-Design_Basic_Remote_Connect_Successful=
+Fine-Design_Basic_Remote_Connect_Successful=\u8FDC\u7A0B\u8FDE\u63A5\u6210\u529F
 Fine-Design_Basic_Remote_Disconnected=\u9023\u63A5\u5DF2\u65B7\u958B
 Fine-Design_Basic_Remote_Env=Remote
-Fine-Design_Basic_Remote_Env_Try=
+Fine-Design_Basic_Remote_Env_Try=\u6D4B\u8BD5\u8FDE\u63A5
 Fine-Design_Report_Export_Background=\u532F\u51FA\u5831\u8868\u80CC\u666F
 Fine-Design_Basic_Loading_Project=\u9805\u76EE\u52A0\u8F09\u4E2D...
 Fine-Design_Report_Print_Background=\u5217\u5370\u5831\u8868\u80CC\u666F
@@ -1784,31 +1786,30 @@ Fine-Design_Report_Write_Submit_Type=Submit type
 Fine-Design_Basic_Write_Submit_Event=Submit event
 Fine-Design_Basic_Write_Custom_Event=Custom event
 Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Basic_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size\: {} px
 Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
 Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
 Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
 Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
 Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
 Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_Basic_Table_Data_Empty_Name_Tips=Tabledata name is empty, please given a name!
+Fine-Design_Basic_Table_Data_Empty_Name_Tips=Tabledata name is empty, please given a name\!
-Fine-Design_Basic_Table_Data_Duplicate_Name_Tips={} has been existed, Please rename!
+Fine-Design_Basic_Table_Data_Duplicate_Name_Tips={} has been existed, Please rename\!
-Fine-Design_Basic_Stored_Procedure_Name_Tips=Stored procedure name cannot include underline!
+Fine-Design_Basic_Stored_Procedure_Name_Tips=Stored procedure name cannot include underline\!
 Fine-Design_Basic_Class_Location_Description=Class file must be located in {}.
 Fine-Design_Basic_Tabledata_Type_File=File
 Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
 Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
 Fine-Design_Basic_Tabledata_Type_Tree=Tree
 Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Basic_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=\u7A0B\u5F0F
 Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
 Fine-Design_Basic_Tabledata_Type_Relation=Relation
 Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_Basic_TableData_Select_One=Select one TD
 Fine-Design_Basic_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
-Fine-Design_Basic_Connection_Duplicate_Name=Connection {} has been existed, Please rename!
+Fine-Design_Basic_Connection_Duplicate_Name=Connection {} has been existed, Please rename\!
-Fine-Design_Basic_Connection_Empty_Name=Connection name is empty, please given a name!
+Fine-Design_Basic_Connection_Empty_Name=Connection name is empty, please given a name\!
-Fine-Design_Basic_Multiple_Select_Warn_Text=The current list is empty, or you did select none of the item!
+Fine-Design_Basic_Multiple_Select_Warn_Text=The current list is empty, or you did select none of the item\!
 Fine-Design_Basic_Template_Select=Select Template
 Fine-Design_Basic_Parameter_UI_Display=Display parameter UI
 Fine-Design_Basic_Template_Parameter=Template parameter
@@ -1816,6 +1817,7 @@ Fine-Design_Report_Submit_Type_Custom=Custom submit
 Fine-Design_Basic_Parameter_Duplicate_Name=Duplicate name
 Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Basic_Authority_Edit_Status=Authority edit status
+Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
 Fine-Design_Report_Decimal_Digits=Decimal digits
 Fine-Design_Basic_Widget_Type_Date=Date
 Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
@@ -1831,8 +1833,9 @@ Fine-Design_Basic_Widget_Type_List=List
 Fine-Design_Basic_Widget_Type_Textarea=Textarea
 Fine-Design_Basic_Widget_Type_Password=Password
 Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_Basic_Workspace_Empty_Name_Warn_Text=Name is empty, please given a name!
+Fine-Design_Basic_Workspace_Empty_Name_Warn_Text=Name is empty, please given a name\!
-Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text=Workspace {} has been existed, Please rename!
+Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text=Workspace {} has been existed, Please rename\!
+Fine-Design_Basic_Template_Closed_Warn_Text=Template {} already closed.
 Fine-Design_Basic_DS_Column=DS Column
 Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
 Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
@@ -1842,7 +1845,6 @@ Fine-Design_Basic_Connection_Pool_Max_Wait_Time=Max Wait Time(ms)
 Fine-Design_Report_Privilege_Poly_Block_Edit=Ploy block privilege editing
 Fine-Design_Basic_Parameter_Source_Type_Tabledata=Tabledata parameter
 Fine-Design_Basic_Function_Type_Hierarchy=Hierachy
-Fine-Design_Basic_Template_Closed_Warn_Text=Template {} already closed.
 Fine-Design_Report_Column_Style=Report Column Style
 Fine-Design_Report_Column_Area=Report Column Area
 Fine-Design_Report_Column_Data=Report Column Data
@@ -1851,7 +1853,6 @@ Fine-Design_Basic_Template_File_Name_Duplicate=Template "{}" already exist
 Fine-Design_Basic_Button_Type_Parameter_Submit=Parameter Submit
 Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
 Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
-Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
 Fine-Design_Form_Title_Style=Title Style
 Fine-Design_Form_Button_Name=Button Name
 Fine-Design_Basic_Button_Style=Button Style
@@ -1902,7 +1903,6 @@ Fine-Design_Chart_Alert_Value=Alert Value
 Fine-Design_Chart_Alert_Line_Color=Alert Line Color
 Fine-Design_Chart_Alert_Tip=Alert Tip
 Fine-Design_Chart_Content=Content
-
 Fine-Design_Chart_Layout=Layout
 Fine-Design_Chart_At_The_Left=At Left
 Fine-Design_Chart_At_The_Right=At Right
@@ -1925,16 +1925,13 @@ Fine-Design_Chart_Single_Layer_Map=Single Layer Map
 Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
 Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
 Fine-Design_Report_Write_Select_Cell_Count=Selected {} cells
-Fine-Design_Report_DSColumn_Result_Group_Format=Format:{} serial number start from 1,built-in parameter {} show total count
+Fine-Design_Report_DSColumn_Result_Group_Format=Format\:{} serial number start from 1,built-in parameter {} show total count
 Fine-Design_Report_Format=Format
 Fine-Design_Basic_Illegal_Name_Tips=Please rename
-
 Fine-Design_Basic_Cancel=\u53D6\u6D88
 Fine-Design_Basic_Common_Save_Failed=Save failed
 Fine-Design_Basic_Common_Save_Successfully=Save successfully
 Fine-Design_Report_Edit=\u7DE8\u8F2F
-
-
 Fine-Design_Report_Parameter_Formula=\u516C\u5F0F
 Fine-Design_Report_Page_Setup_Orientation=\u65B9\u5411
 Fine-Design_Report_OK=\u78BA\u5B9A
@@ -2055,6 +2052,7 @@ Fine-Design_Form_Brown=\u8910\u8272
 Fine-Design_Report_Cache_Validate_Time=\u5831\u8868\u7DE9\u5B58\u6709\u6548\u6642\u9593
 Fine-Design_Form_Card_Layout=\u5361\u7247\u5E03\u5C40
 Fine-Design_Basic_Cell=\u5132\u5B58\u683C
+Fine-Design_Form_Center=\u5C45\u4E2D
 Fine-Design_Basic_Clear=\u6E05\u9664
 Fine-Design_Basic_Column_Name=\u6B04\u540D
 Fine-Design_Report_Condition=\u689D\u4EF6
@@ -2064,10 +2062,9 @@ Fine-Design_Basic_Float=\u6D6E\u9EDE\u578B
 Fine-Design_Basic_Foreground=\u5B57\u5F62\u8272\u5F69
 Fine-Design_Report_Form=\u8868\u55AE
 Fine-Design_Basic_Form_Basic_Properties=\u57FA\u672C\u5C6C\u6027
-Fine-Design_Basic_Plugin_Warning=\u8B66\u544A
 Fine-Design_Chart_Unit_Thousand=\u5343
 Fine-Design_Report_Icon=\u5716\u6A19
-Fine-Design_Basic_Line=Line: {0}
+Fine-Design_Basic_Line=Line\: {0}
 Fine-Design_Basic_Location=\u4F4D\u7F6E
 Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790
 Fine-Design_Report_Formula=\u516C\u5F0F
@@ -2078,12 +2075,9 @@ Fine-Design_Basic_Widget=\u63A7\u5236\u9805
 Fine-Design_Basic_Value=\u503C
 Fine-Design_Basic_Text=\u6587\u672C
 Fine-Design_Basic_Search=\u641C\u7D22
-
+Fine-Design_Basic_Background=\u80CC\u666F
-
-
 Fine-Design_Report_Radius=\u5713\u89D2
 Fine-Design_Report_Fill=\u586B\u5145
-
 Fine-Design_Basic_Engine_Event_After_Append=\u65B0\u589E\u5217\u5F8C
 Fine-Design_Basic_Engine_Event_After_Applet_Print=Applet\u5217\u5370\u5F8C
 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C
@@ -2133,7 +2127,6 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B
 Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u5831\u5931\u6557
 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u5831\u6210\u529F
 Fine-Design_Report_Alignment=\u5C0D\u9F4A
-<<<<<<< HEAD
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Basic_AlphaFine_Enable_Segmentation=
@@ -2142,9 +2135,7 @@ Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
 Fine-Design_Report_AlphaFine_Back=
 Fine-Design_Basic_Loading_Embed_Server=
-=======
 Fine-Design_Basic_Local_Workspace=\u672C\u6A5F\u76EE\u9304
->>>>>>> origin/release/10.0
 Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A
 Fine-Design_Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0
 Fine-Design_Updater_Update=\u66F4\u65B0
@@ -2187,5 +2178,49 @@ Fine-Design_Basic_Make_Failure=\u65B0\u5EFA\u5931\u6557
 Fine-Design_Basic_Rename_Failure=\u91CD\u547D\u540D\u5931\u6557
 Fine-Design_Basic_Confirm_Delete_Folder=\u522A\u9664\u6240\u9078\u6587\u4EF6\u593E\u6703\u540C\u6642\u522A\u9664\u5B83\u5305\u542B\u7684\u6A21\u677F\uFF0C\u662F\u5426\u522A\u9664\uFF1F
 Fine-Design_Basic_Delete_Failure=\u522A\u9664\u5931\u6557
-
+Fine-Design_Basic_Write_Insert_Submit=\u63D2\u5165\u63D0\u4EA4
-
+Find-Design_Basic_Hyperlink_Extends_Report_Parameters=Inherit Report Parameters
+Fine-Design_Basic_Plugin_Warning=\u8B66\u544A
+Fine-Design_Report_DEFAULT=DEFAULT
+Fine-Design_Appear_Refresh=\u9875\u9762\u518D\u73B0\u65F6\u5237\u65B0
+Fine-Design_Report_Tab_Carousel=tab\u8F6E\u64AD
+Fine-Design_DataFunction_Sum=\u6C42\u548C
+Fine-Design_DataFunction_Average=\u5E73\u5747
+Fine-Design_DataFunction_Max=\u6700\u5927\u503C
+Fine-Design_DataFunction_Min=\u6700\u5C0F\u503C
+Fine-Design_DataFunction_Count=\u4E2A\u6570
+Fine-Design_DataFunction_None=\u65E0
+Fine-Design_Basic_Action_CollapseAllFolds_Desc=Collapses all folds.
+Fine-Design_Basic_Action_CollapseAllFolds_Mnemonic=O
+Fine-Design_Basic_Action_CollapseAllFolds_Name=Collapse All Folds
+Fine-Design_Basic_Action_CollapseCommentFolds_Desc=Collapses all comment folds.
+Fine-Design_Basic_Action_CollapseCommentFolds_Mnemonic=C
+Fine-Design_Basic_Action_CollapseCommentFolds_Name=Collapse All Comments
+Fine-Design_Basic_Action_Copy_Desc=\u62F7\u8C9D\u73FE\u9078\u9805\u5165\u526A\u8CBC\u677F.
+Fine-Design_Basic_Action_Copy_Mnemonic=C
+Fine-Design_Basic_Action_Copy_Name=\u8907\u88FD
+Fine-Design_Basic_Action_Cut_Desc=\u522A\u9664\u9078\u64C7\u4E26\u653E\u5165\u526A\u8CBC\u677F.
+Fine-Design_Basic_Action_Cut_Mnemonic=T
+Fine-Design_Basic_Action_Cut_Name=\u526A\u5207
+Fine-Design_Basic_Action_Delete_Desc=\u522A\u9664\u7576\u524D\u9078\u9805.
+Fine-Design_Basic_Action_Delete_Mnemonic=D
+Fine-Design_Basic_Action_Delete_Name=\u522A\u9664
+Fine-Design_Basic_Action_ExpandAllFolds_Desc=Expands all folds.
+Fine-Design_Basic_Action_ExpandAllFolds_Mnemonic=E
+Fine-Design_Basic_Action_ExpandAllFolds_Name=Expand All Folds
+Fine-Design_Basic_Action_Paste_Desc=\u5C07\u526A\u8CBC\u677F\u4E2D\u7684\u6587\u672C\u653E\u5165\u7576\u524D\u4F4D\u7F6E.
+Fine-Design_Basic_Action_Paste_Mnemonic=P
+Fine-Design_Basic_Action_Paste_Name=\u7C98\u8CBC
+Fine-Design_Basic_Action_Redo_Desc=\u91CD\u8907\u6700\u5F8C\u53D6\u6D88\u7684\u884C\u52D5.
+Fine-Design_Basic_Action_Redo_Mnemonic=R
+Fine-Design_Basic_Action_Redo_Name=Redo
+Fine-Design_Basic_Action_SelectAll_Desc=\u5168\u9078\u73FE\u6A94\u6848\u6240\u6709\u6587\u5B57.
+Fine-Design_Basic_Action_SelectAll_Mnemonic=A
+Fine-Design_Basic_Action_SelectAll_Name=\u5168\u9078
+Fine-Design_Basic_Action_ToggleCurrentFold_Desc=Toggles the fold at the caret position.
+Fine-Design_Basic_Action_ToggleCurrentFold_Mnemonic=F
+Fine-Design_Basic_Action_ToggleCurrentFold_Name=Toggle Current Fold
+Fine-Design_Basic_Action_Undo_Desc=\u53D6\u6D88\u6700\u5F8C\u4E00\u6B21\u884C\u52D5.
+Fine-Design_Basic_Action_Undo_Mnemonic=U
+Fine-Design_Basic_Action_Undo_Name=Undo
+Fine-Design_Basic_Actions=\u4EFB\u52D9