Merge pull request #259 in DESIGN/design-i18n from final/10.0 to bugfix/10.0

* commit 'fa88086071a74d1c094e38b15173f973577f9160':
  过往key修改-英文“控件”翻译
  过往key国际化修改-英文
  key国际化-繁体
  key国际化-繁体
  key国际化-繁体
  key国际化修改-英文
  key国际化-繁体
  update
  REPORT-19897  英文版设计器显示问题
  key国际化-英文

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

@@ -94,7 +94,7 @@ Fine-Design_Chart_Subject_Color=Theme Color
 Fine-Design_Chart_Style_Transparent=Transparent
 Fine-Design_Chart_Style_TopDownShade=Gradient
 Fine-Design_Chart_Style_Retro=Retro
-Fine-Design_Chart_Style_Present=Form
+Fine-Design_Chart_Style_Present=Display
 Fine-Design_Chart_Style_Plane3D=Plane 3D
 Fine-Design_Chart_Style_Name=Style
 Fine-Design_Chart_Style_GradientHighlight=Gradient Highlights

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

@@ -1463,7 +1463,8 @@ Fine-Design_Report_Role=Role
 Fine-Design_Basic_Role_changed_Is_Refresh=Roles change, whether to refresh
 Fine-Design_Basic_Root=Root
 Fine-Design_Report_Row=\u884C
-Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Row_Icon_File_Name=row_en.png
+Fine-Design_Report_Col_Icon_File_Name=col_en.png
 Fine-Design_Basic_SQL_Table=Table
 Fine-Design_Basic_SQL_View=View
 Fine-Design_Basic_Sample_Text=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C
@@ -2384,3 +2385,4 @@ Fine-Design_Vcs_Current=current version
 Fine-Design_Vcs_resetValue=reset value
 Fine-Design_Basic_Database_Manager=Database manager
 Fine-Design_Basic_Use_Universe_Database_Manager=Use universe database manager
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background_en.png

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

@@ -135,7 +135,7 @@ Fine-Design_Basic_Dbcp_Test_While_Idle=Open Idle Connections Recyclers Test
 Fine-Design_Basic_Connection_Pool_Evictionruns_millis=Sleep Time of Idle Connections Recyclers(ms)
 Fine-Design_Basic_Dbcp_Validation_Query=SQL Validation Query
 Fine-Design_Basic_DS_Class_Name=Class Name
-Fine-Design_Basic_DS_Class_TableData=Class Data Set
+Fine-Design_Basic_DS_Class_TableData=Class Dataset
 Fine-Design_Basic_DS_Database_Query=DB Query
 Fine-Design_Basic_DS_Dictionary=Data Dictionary
 Fine-Design_Basic_DS_Embedded_TableData=Built-in Data Set
@@ -155,7 +155,7 @@ Fine-Design_Chart_Data_Function_None=None
 Fine-Design_Chart_Data_Function_Sum=Sum
 Fine-Design_Chart_Data_Filter=Data Filter
 Fine-Design_Chart_Data_Setting=Data Setting
-Fine-Design_Basic_Datasource_Column_Index=Column Ordinal
+Fine-Design_Basic_Datasource_Column_Index=Column Index
 Fine-Design_Basic_Database_Connection_Failed=Connection Failed
 Fine-Design_Basic_Datasource_Connection_Successfully=Connection successfully
 Fine-Design_Basic_Datasource_Context=Context
@@ -374,10 +374,10 @@ Fine-Design_Report_M_New_WorkBook=New General Report
 Fine-Design_Basic_M_Open_Recent=Open Recent
 Fine-Design_Basic_M_Open_Report=Open...
 Fine-Design_Basic_M_Others=Others...
-Fine-Design_Basic_M_Page_Preview=Page Break Preview
+Fine-Design_Basic_M_Page_Preview=Pagination Preview
 Fine-Design_Basic_M_Page_Setup=Page Setup
 Fine-Design_Basic_M_Save_As=Save As
-Fine-Design_Basic_M_Write_Preview=Filling Preview
+Fine-Design_Basic_M_Write_Preview=Data Entry Preview
 Fine-Design_Report_M_Edit_Bring_Forward=Bring to Forward
 Fine-Design_Report_M_Edit_Bring_To_Front=Bring to Top
 Fine-Design_Report_M_Edit_Clear=Clear
@@ -430,13 +430,13 @@ Fine-Design_Basic_Merge=Merge
 Fine-Design_Basic_MobilePhone=MobilePhone
 Fine-Design_Basic_Mon=Mon
 Fine-Design_Basic_More_Information=More information
-Fine-Design_Basic_Multi_Nam_Formula=\  data set name\:
+Fine-Design_Basic_Multi_Nam_Formula=\  data set name:
 Fine-Design_Basic_Multiple_Markers=Several Markers in this Line
 Fine-Design_Basic_My_Computer=My Computer
 Fine-Design_Basic_NNormal=normal
 Fine-Design_Basic_Not_Null_Des=NOT NULL
 Fine-Design_Report_No_Border_Line=NO Border
-Fine-Design_Report_NS_Exception_ReadError=Error codes\:11300005 Template file parsing error
+Fine-Design_Report_NS_Exception_ReadError=Error codes:11300005 Template file parsing error
 Fine-Design_Basic_Need_Max_Value=Need Max Value
 Fine-Design_Basic_Need_Min_Value=Need Min Value
 Fine-Design_Basic_Next=Next
@@ -503,8 +503,8 @@ Fine-Design_Basic_Preference_Support_Cell_Editor_Definition=Support Cell Editor
 Fine-Design_Basic_Preference_Support_Default_Parent_Calculate=Default Parent Grid Calculate
 Fine-Design_Basic_Preference_Support_Undo=Support Undo
 Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible=Vertical Scroll Bar Visible
-Fine-Design_Basic_Present_Formula_Present=Formula Present
-Fine-Design_Basic_Present_No_Present=Cancel Present Settings
+Fine-Design_Basic_Present_Formula_Present=Formula Display
+Fine-Design_Basic_Present_No_Present=Cancel Display Settings
 Fine-Design_Basic_Preview_Tool_Tips=Preview ToolTips
 Fine-Design_Basic_Previous=Previous
 Fine-Design_Report_PrintP_Print_Preview=Print Preview
@@ -531,7 +531,7 @@ Fine-Design_Report_Remove_Button_ToolBar=Remove the toolbar the button is in
 Fine-Design_Report_Rename=Rename
 Fine-Design_Report_Report=Report
 Fine-Design_Basic_Report_Web_Attributes=Web Attributes
-Fine-Design_Basic_Report_Write_Attributes=Filling Attribute
+Fine-Design_Basic_Report_Write_Attributes=Data Entry Attribute
 Fine-Design_Report_Write_Attributes_Group_Warning=Number of cells in each field in all cell group must be the same
 Fine-Design_Report_ReportColumns_Columns_After=Over
 Fine-Design_Report_ReportColumns_Columns_Horizontally=Fixed lines per column
@@ -541,7 +541,7 @@ Fine-Design_Report_ReportColumns_Report_Columns=Multi-columns/lines display
 Fine-Design_Report_ReportD_Excel_Export=Export Attributes
 Fine-Design_Report_ReportD_Export_Hided_Column=Export hidden column
 Fine-Design_Report_ReportD_Export_Hided_Row=Export hidden Row
-Fine-Design_Report_ReportD_Report_Write_Attributes=Report filling attributes
+Fine-Design_Report_ReportD_Report_Write_Attributes=Data Entry attributes
 Fine-Design_Report_ReportGUI_Print_Background=Print/export background
 Fine-Design_Report_ReportServerP_Add_Printer=Add printer
 Fine-Design_Report_ReportServerP_Are_You_Sure_To_Delete_The_Selected_Printer=Are you sure to delete the selected printer
@@ -587,7 +587,7 @@ Fine-Design_Basic_Server_Start=Start
 Fine-Design_Basic_Server_Stop=Stop
 Fine-Design_Report_Template_Version_Not_Match=You open the template file is open there will be an error made ??by the later design or the risk of losing the original template attribute. Please upgrade your designer to version {} if need to open this template
 Fine-Design_Report_ServerM_Predefined_Styles=Predefined Styles
-Fine-Design_Report_ServerM_Widget_Manager=Control management
+Fine-Design_Report_ServerM_Widget_Manager=Widget manager
 Fine-Design_Report_Server_Charset=Server code
 Fine-Design_Basic_Set_Paramete_Name=Set parameter name first
 Fine-Design_Report_Set_Callback_Function=Set callback function
@@ -702,7 +702,7 @@ Fine-Design_Report_Utils_Left_To_Right_Duplicate=From left to right
 Fine-Design_Report_Utils_Merge_Cell=Merge Cells
 Fine-Design_Basic_Utils_Move_Down=Move Down
 Fine-Design_Basic_Utils_Move_Up=Move Up
-Fine-Design_Report_Utils_No_Pagination=No Page Break
+Fine-Design_Report_Utils_No_Pagination=No Pagination
 Fine-Design_Basic_Utils_Now_Create_Connection=Creating data connection
 Fine-Design_Basic_Utils_Report_Env_Directory=Report working directory
 Fine-Design_Basic_Utils_Report_Runtime_Env=Report working directory
@@ -721,8 +721,8 @@ Fine-Design_Report_Verify_Message=Error Message
 Fine-Design_Report_Formula_Verify=Validation formula
 Fine-Design_Form_Vertical_Split_Layout=Vertical Split Layout
 Fine-Design_Form_Vertical_Box_Layout_Duplicate=Vertical Box Layout
-Fine-Design_Report_WEB_Pagination_Setting=Page Break Preview
-Fine-Design_Report_WEB_Write_Setting=Filling Settings
+Fine-Design_Report_WEB_Pagination_Setting=Pagination Preview
+Fine-Design_Report_WEB_Write_Setting=Data Entry Settings
 Fine-Design_Form_WLayout_Border_Layout_Container=You have the central and northern border layout containers.You can adjust the height of the northern one
 Fine-Design_Report_WLayout_Border_Three_Container=You have the central, northern and western border layout containers.You can adjust the height of the northern one and the width of the western one.
 Fine-Design_Form_WLayout_Border_ToolTips=The complete border layout container\uFFFD\uFFFDis composed of central, eastern, western, northern and  southern parts. You can adjust the height  of the northern and southern ones and the width of the eastern and western ones.
@@ -747,7 +747,7 @@ Fine-Design_Report_Widget_User_Defined_Editor=Predefine editor, you can only cha
 Fine-Design_Basic_Widget_User_Defined_Widget_Config=Predefined control
 Fine-Design_Report_Widget_Visible=Visible
 Fine-Design_Report_Widge_Width_Duplicate=Control width
-Fine-Design_Report_Writer_ShortCuts_Setting=Filling Shortcut key setting
+Fine-Design_Report_Writer_ShortCuts_Setting=Data Entry Shortcut key setting
 Fine-Design_Report_X_Coordinate=Horizontal axis
 Fine-Design_Report_Y_Coordinate=Vertical Coordinate
 Fine_Design_Chart_Year=Year
@@ -759,7 +759,7 @@ Fine-Design_Chart_Cycle=Cycle
 Fine-Design_Basic_Detail_Description=Detailed description
 Fine-Design_Basic_Feedback_Info=We welcome your comments and suggestions, please fill out the information as detailed as possible, we will contact you soon
 Fine-Design_Basic_Feedback_Tip=Please enter a description of the problem, not more than 400 words
-Fine-Design_Basic_FileLocked_Undeleted=Template is locked, you can not delete\! Click OK to refresh the templates list
+Fine-Design_Basic_FileLocked_Undeleted=Template is locked, you can not delete! Click OK to refresh the templates list
 Fine-Design_Report_Is_Need_Word_Adjust=Word Auto Adjust
 Fine-Design_Basic_Mobile_Number=Mobile Number
 Fine-Design_Basic_No-Alternatives=no alternatives
@@ -767,7 +767,7 @@ Fine-Design_Report_One_Record_Exists_In_Many_Groups=One record exists in many gr
 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=Product Feedback
 Fine-Design_Basic_Px=px
 Fine-Design_Basic_Roles_Already_Authority_Edited=Configured role
@@ -785,7 +785,7 @@ Fine-Design_Basic_App_File_Lookup_range=Search range
 Fine-Design_Basic_App_File_Message=Message
 Fine-Design_Basic_App_Privilege_No=No Permission
 Fine-Design_Report_Template_File=Report Template
-Fine-Design_Basic_App_Template_Report_Not_Exist=Report Not Exist\!
+Fine-Design_Basic_App_Template_Report_Not_Exist=Report Not Exist!
 Fine-Design_Basic_App_Template_Save=Save
 Fine-Design_Basic_Background_Image=Image
 Fine-Design_Basic_Background_Image_Adjust=Adjust Image
@@ -827,7 +827,7 @@ Fine-Design_Report_BBSLogin_Connection_Failure=Connection failure, check your ne
 Fine-Design_Report_BBSLogin_Download-Unlogin_Tip=Login to download
 Fine-Design_Report_BBSLogin_Forgot-Password=Forget Password
 Fine-Design_Report_BBSLogin_Login=Login
-Fine-Design_Report_BBSLogin_Login-Failure-Tip=Incorrect username or password\! please try again
+Fine-Design_Report_BBSLogin_Login-Failure-Tip=Incorrect username or password! please try again
 Fine-Design_Report_BBSLogin_Login-Title=BBS Login
 Fine-Design_Report_BBSLogin_Password=Password
 Fine-Design_Report_BBSLogin_Password_Empty_Tip=Password can not be null
@@ -835,7 +835,7 @@ Fine-Design_Report_BBSLogin_Privite_Message=Privite Message
 Fine-Design_Report_BBSLogin_Register_Account=Register Account
 Fine-Design_Report_BBSLogin_Switch_Account=Switch Account
 Fine-Design_Report_BBSLogin_Username_Empty_Tip=User name can not be null
-Fine-Design_Basic_Activation_Key=Activation Key\:
+Fine-Design_Basic_Activation_Key=Activation Key:
 Fine-Design_Basic_Activation_Key_Copy_OK=Key has been copy to clipboard
 Fine-Design_Basic_Copy_Activation_Key=Double click to copy key to clipboard
 Fine-Design_Basic_Copy_Build_NO=Double click to copy build NO.
@@ -874,8 +874,8 @@ Fine-Design_Form_ToolBar_Chart=Chart
 Fine-Design_Form_ToolBar_Widget=Control
 Fine-Design_Basic_Formula_Dictionary_Display_Examples_Html=<html>Tip: the real value is =range(100), the real value($$$)'s display value is =0 - $$$, <br>the result is 1, 2, ..., 100 and -1, -2, ..., -100.<br></html>
 Fine-Design_Basic_Hyperlink_Name=Name
-Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL=Define sql for page break query
-Fine-Design_Basic_Layer_Page_Report_Page_Query=Page Break query
+Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL=Define sql for paging query
+Fine-Design_Basic_Layer_Page_Report_Page_Query=Paging query
 Fine-Design_Form_Layout_Adaptive_Layout=Adaptive layout
 Fine-Design_Basic_Local_File=Local file
 Fine-Design_Form_Min_Height=Min Height
@@ -886,7 +886,7 @@ Fine-Design_Form_Move_Tab_Next=move to next
 Fine-Design_Form_Move_Tab_Prev=move to previous
 Fine-Design_Form_Output_Background_Set=Background set
 Fine-Design_Form_Output_Default_Background=Default background
-Fine-Design_Form_Output_Excel_Page=Excel Export(page break)
+Fine-Design_Form_Output_Excel_Page=Excel Export(Pagination)
 Fine-Design_Report_Output_Excel_Sheet=Excel Export(one page per sheet)
 Fine-Design_Report_Output_Excel_Simple=Excel Export(original)
 Fine-Design_Basic_Plugin_Active=Enable
@@ -957,7 +957,7 @@ Fine-Design_Form_Widget_Style_Title_Content=Title Content
 Fine-Design_Form_Widget_Style_Title_Format=Title Format
 Fine-Design_Form_Widget_Area_Scaling=Component area scaling
 Fine-Design_Form_Widget_Scaling_Mode=Scaling mode
-Fine-Design_Basic_Widget_Settings=Control Setting
+Fine-Design_Basic_Widget_Settings=Widget Setting
 Fine-Design_Basic_Widget_Size=Control Size
 Fine-Design_Chart_Widget_Style=Style
 Fine-Design_Report_Write_Auto_Stash=auto stash
@@ -977,7 +977,7 @@ Fine-Design_Form_Adaptive_Property_Auto_Match_Desc=In order to improve the end t
 Fine-Design_Basic_Add=Add
 Fine-Design_Report_Add_Condition=Add Condition
 Fine-Design_Report_Add_Event=Add Event
-Fine-Design_Report_Add_FloatElement=Add FloatElement
+Fine-Design_Report_Add_FloatElement=Add Float Element
 Fine-Design_Basic_Add_Hyperlink=Add Hyperlink
 Fine-Design_Basic_Add_JS_warning=Type the correct URL
 Fine-Design_Form_Add_all=Add all
@@ -1180,7 +1180,7 @@ Fine-Design_Report_Exchange_Key=Click to exchange shortcut key
 Fine-Design_Report_Expand=Expand
 Fine-Design_Report_ExpandD_Expand_Direction=Expand Direction
 Fine-Design_Report_ExpandD_Expandable=Expandable
-Fine-Design_Report_ExpandD_Up_Father_Cell=Up Father Cell
+Fine-Design_Report_ExpandD_Up_Father_Cell=Up Parent Cell
 Fine-Design_Report_Expend_Sort=ExpendSort
 Fine-Design_Basic_Export=Export
 Fine-Design_Report_Export_PDF=PDF
@@ -1382,8 +1382,8 @@ Fine-Design_Basic_Page_Setup_MM=mm
 Fine-Design_Basic_Page_Setup_Horizontal=Horizontal
 Fine-Design_Report_PageSetup_Page=Page
 Fine-Design_Basic_Page_Setup_Vertical=Vertical
-Fine-Design_Report_Pagination=Page Break
-Fine-Design_Report_Pagination_Setting=Page Break Preview
+Fine-Design_Report_Pagination=Pagination
+Fine-Design_Report_Pagination_Setting=Pagination Preview
 Fine-Design_Report_Paper=Paper
 Fine-Design_Form_Parameter_Body=Parameter interface
 Fine-Design_Basic_Parameter=Parameter
@@ -1405,7 +1405,7 @@ Fine-Design_Basic_Preference_Caching_Template=Template memory optimization
 Fine-Design_Basic_Preference_Caching_Template_Tip=Set to 0 to close the function; restart the designer and take effect
 Fine-Design_Basic_Preference_Max_Caching_Template=The designer maximum cache template number:
 Fine-Design_Report_Prepare_Export=Ready to export, please wait
-Fine-Design_Report_Present=present
+Fine-Design_Report_Present=Display
 Fine-Design_Basic_Preview=Preview
 Fine-Design_Report_Preview_Data_Confusion=Preview Data After Confusion
 Fine-Design_Report_Print_Area_Tip=eg(1, 4-9, 6, 8)
@@ -1418,7 +1418,7 @@ Fine-Design_Form_Properties=Properties
 Fine-Design_Report_Properties_Mobile=MobileProperties
 Fine-Design_Basic_Property=Property
 Fine-Design_Form_Query=Query
-Fine-Design_Basic_RWA_Help=Set "No update if no modidy", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
+Fine-Design_Basic_RWA_Help=Set "No update if no modidy", so if cell is not modified, the record will not update; it improves data entry and submit performance when data is large.
 Fine-Design_Report_Read_Failure=Read failure
 Fine-Design_Basic_Refresh=Refresh
 Fine-Design_Basic_Refresh_Successfully=Refresh successfully
@@ -1461,7 +1461,8 @@ Fine-Design_Report_Role=Role
 Fine-Design_Basic_Role_changed_Is_Refresh=Roles change, whether to refresh
 Fine-Design_Basic_Root=Root node
 Fine-Design_Report_Row=Row
-Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Row_Icon_File_Name=row_en.png
+Fine-Design_Report_Col_Icon_File_Name=col_en.png
 Fine-Design_Basic_SQL_Table=Tab
 Fine-Design_Basic_SQL_View=View
 Fine-Design_Basic_Sample_Text=SampleText SampleText
@@ -1559,7 +1560,7 @@ Fine-Design_Basic_Total_N_Grade=Total:${N}Layer
 Fine-Design_Report_Tree_ComboBox=Drop-down Tree
 Fine-Design_Basic_Tree_Data_Field=Tree Data Field
 Fine-Design_Report_Type=Type
-Fine-Design_Basic_Type_Set=Type Set
+Fine-Design_Basic_Type_Set=Type
 Fine-Design_Report_Underline=Underline
 Fine-Design_Basic_Undo=Undo
 Fine-Design_Report_Unit_PT_Duplicate=Pound
@@ -1605,9 +1606,9 @@ Fine-Design_Form_Widget_Width=Width
 Fine-Design_Basic_Designer_Width=W
 Fine-Design_Basic_WorkBook=WorkBook
 Fine-Design_Basic_Work_After_Restart_Designer=Take effect when the designer is restarted
-Fine-Design_Basic_Write_Save_Formula=Preserve formula when fill
+Fine-Design_Basic_Write_Save_Formula=Preserve formula when data entry
 Fine-Design_Basic_Write_Enhance_Preview=Write Enhance Preview
-Fine-Design_Report_Write_Setting=Filling Settings
+Fine-Design_Report_Write_Setting=Data Entry Settings
 Fine-Design_Basic_X_Coordinate=Abscissa
 Fine-Design_Basic_Y_Coordinate=Ordinate
 Fine-Design_Report_Yes=Yes
@@ -1649,7 +1650,7 @@ Fine-Design_Report_Engine_Excel_Import_Clean=Emptying import
 Fine-Design_Report_Engine_Excel_Import_Cover=Overlay import
 Fine-Design_Report_Engine_Excel_Import_Repeat=Import Excel Sustained
 Fine-Design_Report_Engine_Export=Export
-Fine-Design_Basic_Engine_Export_Excel_Page=Page Break Export
+Fine-Design_Basic_Engine_Export_Excel_Page=Pagination Export
 Fine-Design_Basic_Engine_Export_Excel_PageToSheet=export one page per sheet
 Fine-Design_Basic_Engine_Export_Excel_Simple=Export unaltered
 Fine-Design_Report_Engine_Export-Offline-Html=Output offline HTML report
@@ -1663,7 +1664,7 @@ Fine-Design_Form_Engine_NameWidget-Name=Predefined Control Name
 Fine-Design_Report_Engine_Native_Print=Local Printing
 Fine-Design_Basic_Engine_No_TableData=No Return Dataset
 Fine-Design_Report_Engine_No_Client_Print=No Client Printing
-Fine-Design_Report_Engine_Page-Frozen=Page break Freeze:
+Fine-Design_Report_Engine_Page-Frozen=Pagination Freeze:
 Fine-Design_Basic_Engine_Parameter_Formula=Formula
 Fine-Design_Basic_Engine_Parameter_Name=Parameter Name
 Fine-Design_Report_Engine_Please_Set_Repeat_First=Please set duplicate columns and rows first
@@ -1860,7 +1861,7 @@ Fine-Design_Form_Widget_Choose_Type_All=Provide Choose All
 Fine-Design_Form_Layout_Style=Layout Style
 Fine-Design_Form_Query_Button=Query Button
 Fine-Design_Form_Toolbar_Setting=Form Toolbar Setting
-Fine-Design_Form_Widget_Setting=Control Setting
+Fine-Design_Form_Widget_Setting=Widget Setting
 Fine-Design_Form_Hyperlink_Undefined=Undefined Hyperlink
 Fine-Design_Form_Hyperlink_Group_Count=Total has {} groups hyperlink
 Fine-Design_Form_Widget_Alias_Name=Control Alias
@@ -1950,7 +1951,7 @@ Fine-Design_Form_StyleAlignment_Center=Center
 Fine-Design_Report_Tree_Height=Tree Height
 Fine-Design_Report_Tree_Width=Tree Width
 Fine-Design_Form_Widget_Style_Preview=Preview
-Fine-Design_Form_Widget_Control_Setting=Control Setting
+Fine-Design_Form_Widget_Control_Setting=Widget Setting
 Fine-Design_Form_Widget_Size=Control Size
 Fine-Design_Form_Widget_Style=Style
 Fine-Design_Chart_Add_Hyperlink=Add Hyperlink
@@ -1974,7 +1975,7 @@ Fine-Design_Report_Toolbar_Button=Toolbar Button
 Fine-Design_Report_Edit_DashBoard_Potence=Edit Dashboard Potence
 Fine-Design_Report_Toolbar_Choose_Role=Toolbar Permission Control
 Fine-Design_Report_Server_Toolbar_Choose_Role=Server Toolbar Permission Setting
-Fine-Design_Report_Face_Write_Page=Filling Page
+Fine-Design_Report_Face_Write_Page=Data Entry Page
 Fine-Design_Report_Float_Element_Edit_Tips=Do not use a cell attribute table to edit a float element
 Fine-Design_Report_None_Message_Property_Table=None Message Property Table
 Fine-Design_Report_Custom_Style=Custom Style
@@ -2015,7 +2016,7 @@ Fine-Design_Report_Custom_Event=Custom Event
 Fine-Design_Report_Paste_Cell_Tips=Only selected cell can paste cell element
 Fine-Design_Report_Paste_Character_Tips=Only selected cell can paste character
 Fine-Design_Report_Use_Widget=Use Widget
-Fine-Design_Report_Other_Present=Other Present
+Fine-Design_Report_Other_Present=Other Display
 Fine-Design_Report_WorkBook=WorkBook
 Fine-Design_Basic_Wed=Wed
 Fine-Design_Report_Warning=Alert
@@ -2094,7 +2095,7 @@ Fine-Design_Basic_Engine_Event_After_To_Pdf=After Exporting PDF
 Fine-Design_Basic_Engine_Event_After_To_Word=After Exporting Word
 Fine-Design_Basic_Engine_Event_After_Verify=After validation
 Fine-Design_Basic_Engine_Event_After_Verify_Write=After submit validation
-Fine-Design_Basic_Engine_Event_After_Write=After filling report
+Fine-Design_Basic_Engine_Event_After_Write=After Data Entry
 Fine-Design_Basic_Engine_Event_Before_Append=Add Before Row
 Fine-Design_Basic_Engine_Event_Before_Applet_Print=Before Applet Print
 Fine-Design_Basic_Engine_Event_Before_Delete=Delete Before Row
@@ -2110,7 +2111,7 @@ Fine-Design_Basic_Engine_Event_Before_To_Image=Before Exporting Image
 Fine-Design_Basic_Engine_Event_Before_To_Pdf=Before Exporting PDF
 Fine-Design_Basic_Engine_Event_Before_To_Word=Before Exporting Word
 Fine-Design_Basic_Engine_Event_Before_Verify_Write=Before submit validation
-Fine-Design_Basic_Engine_Event_Before_Write=Before filling report
+Fine-Design_Basic_Engine_Event_Before_Write=Before Data Entry
 Fine-Design_Basic_Engine_Event_Callback=After Upload
 Fine-Design_Basic_Engine_Event_Card_Change=Tab Switch Event
 Fine-Design_Basic_Engine_Event_Change=Value Change
@@ -2122,8 +2123,8 @@ Fine-Design_Basic_Engine_Event_State_Change=State Change
 Fine-Design_Basic_Engine_Event_Stop_Edit=Edit end
 Fine-Design_Basic_Engine_Event_Success=Success
 Fine-Design_Basic_Engine_Event_Unload_Check=Leave Without Submitting
-Fine-Design_Basic_Engine_Event_Write_Failure=Filling failed
-Fine-Design_Basic_Engine_Event_Write_Success=Filling successfully
+Fine-Design_Basic_Engine_Event_Write_Failure=Data Entry failed
+Fine-Design_Basic_Engine_Event_Write_Success=Data Entry Successful
 Fine-Design_Report_Alignment=Alignment
 Fine-Design_Basic_Local_Workspace=Local Directory
 Fine-Design_Updater_UpdateAndUpgrade=Update&Upgrade
@@ -2266,7 +2267,6 @@ Fine-Design_Basic_Delete_Failure=Failed
 Fine-Design_Double_Side_Print=Double-sided printing
 Fine-Design_Basic_Confirm_Delete_Folder=Deleting a selected folder will also delete the template it contains. Continue?
 Fine-Design_Basic_Folder_Name_Duplicate=Folder "{}" already exist
-Fine-Design_Report_Mobile_Screen_Zoom_In=
 Fine-Design_Basic_AlphaFine_Search_Type=Search Type
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Service
 Fine-Design_Report_Alpha_Hot_No_Item=There is no content in this topic.
@@ -2291,7 +2291,6 @@ Fine-Design_Needle_Printer_Optimize=Needle printing optimization
 Fine-Designer_Fit-Ver=Vertical screen
 Fine-Designer_Fit-Preview=Preview
 Fine-Design_Report_Custom_Consignee=Custom Consignee
-Fine-Design_Basic_Plugin_Get_Cube=
 Fine-Designer_Fit-Template=Template adaptive attr
 Fine-Designer_Fit-Edit-Local=Edit local config
 Fine-Design_Report_Tip_Invalid_In_Page_View=Tip: invalid when paging preview.
@@ -2300,7 +2299,7 @@ Fine-Designer_Fit-UseGlobal=Use globalconfig
 Fine-Design_Software_Download_Url=Software download address
 Fine-Designer_Fit-Horizontal=Horizontal adaptive
 Fine-Design_Needle_Printer_Optimize_Tip=Tip: replace the text font with bold font to optimize the printing effect.
-Fine-Designer_Fit-Font=Font\:
+Fine-Designer_Fit-Font=Font:
 Fine-Designer_Fit-AttrSet=Set attribute
 Fine-Designer_Fit-Set-Global=Set as global config
 Fine-Designer_Fit-Global=Global config
@@ -2327,9 +2326,9 @@ Fine-Design_Mobile_Display_Gap=DisplayGap
 Fine-Design_Mobile_Slider_Title=SliderTitle
 Fine-Design_Mobile_Gap_Fix=GapFix
 Fine-Design_Mobile_Select_Icon=Select Icon
-Fine-Design_Report_Properties_Mobile_Tip=\u63D0\u793A\uFF1A
+Fine-Design_Report_Properties_Mobile_Tip=Tip:
 Fine-Design_Mobile_Under_Line=Underline
-Fine-Design_Report_Support_Scan_Code=\u652F\u6301\u626B\u7801\u8F93\u5165
+Fine-Design_Report_Support_Scan_Code=support scan code input
 Fine-Design_Mobile_Tab_Style=TabStyle
 Fine-Design_Mobile_Spit_Line=Splitline
 Fine-Design_Mobile_Title_Width_Fix=TitleWidthFix
@@ -2337,12 +2336,11 @@ Fine-Design_Mobile_Select_Fill=SelectFill
 
 Fine-Design_Mobile_Bottom_Border=BottomBorder
 Fine-Design_Encode_Auto=auto
-Fine-Design_Report_Properties_Mobile_Install_Parameter_Pane_Plugin=\u5B89\u88C5\u53C2\u6570\u9762\u677F\u63D2\u4EF6
+Fine-Design_Report_Properties_Mobile_Install_Parameter_Pane_Plugin=Install parameter panel plugin
 Fine-Design_Mobile_Custom_Icon_Message=The 48 * 48 standard PNG image is better.
 Fine-Design_Encrypt_Decrypt_Exception=Unable to open unauthorized encryption template
-Fine-Design_Report_Properties_Mobile_To_Get_More_Style=\u4EE5\u83B7\u5F97\u66F4\u591A\u6837\u5F0F
-Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test=<html>\u8FDC\u7A0B\u8BBE\u8BA1\u53EF\u4EE5\u8FDE\u63A5\uFF0C<br>\u4F46\u7248\u672C\u4E0D\u5339\u914D\u3002</html>
-Fine-Design-Basic_Save_Failure=\ 
+Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test=<html>Remote design can be connected, <br>but the versions do not match.</html>
+Fine-Design-Basic_Save_Failure=\ Saving failed
 Fine-Design_Basic_Develop_Tools=Develop Tools
 Fine-Design_Basic_Open_Debug_Window=Open Debug Window
 Fine-Design_Basic_Reload=Reload
@@ -2393,3 +2391,7 @@ Fine-Design_Vcs_resetValue=reset value
 Fine-Design_Basic_Database_Manager=Database manager
 Fine-Design_Basic_Use_Universe_Database_Manager=Use universe database manager
 Fine-Design_Basic_Close_Window=Close Window
+Fine-Design_Basic_Remote_Design_Version_Inconsistency=Remote design can be connected, but the versions do not match. Continue to connect?
+Fine-Design_Report_Properties_Mobile_To_Get_More_Style=to get more styles
+Fine-Design_Basic_Plugin_Get_Cube=Getting cube
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background_en.png

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

@@ -1461,7 +1461,8 @@ Fine-Design_Report_Role=\u5F79\u5272
 Fine-Design_Basic_Role_changed_Is_Refresh=\u30ED\u30FC\u30EB\u306F\u5909\u66F4\u3055\u308C\u307E\u3057\u305F\u3002\u66F4\u65B0\u3057\u307E\u3059\u304B\uFF1F
 Fine-Design_Basic_Root=\u30EB\u30FC\u30C8\u30CE\u30FC\u30C9
 Fine-Design_Report_Row=\u884C
-Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Row_Icon_File_Name=row_en.png
+Fine-Design_Report_Col_Icon_File_Name=col_en.png
 Fine-Design_Basic_SQL_Table=\u8868
 Fine-Design_Basic_SQL_View=\u30D3\u30E5\u30FC
 Fine-Design_Basic_Sample_Text=\u30C6\u30AD\u30B9\u30C8\u3000\u30C6\u30AD\u30B9\u30C8
@@ -2379,3 +2380,4 @@ Fine-Design_Vcs_Remind=\u5168\u3066\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u3
 Fine-Design_Offline_Helptutorial_Msg=\u4ECA\u306F\u30AA\u30D5\u30E9\u30A4\u30F3\u72B6\u614B\u3067\u3059\u304C\u3001\u30D8\u30EB\u30D7\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093
 Fine-Design_Vcs_NotSupportRemote=\u30D0\u30FC\u30B8\u30E7\u30F3\u7BA1\u7406\u306F\u30AF\u30E9\u30B9\u30BF\u306B\u5229\u7528\u3067\u304D\u307E\u305B\u3093
 Fine-Design_Vcs_resetValue=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u5024\u3092\u30AF\u30EA\u30A2
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background_en.png

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

@@ -1449,7 +1449,8 @@ Fine-Design_Report_Role=\uC5ED\uD560
 Fine-Design_Basic_Role_changed_Is_Refresh=\uC5ED\uD560\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC0C8\uB85C\uACE0\uCE68 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 Fine-Design_Basic_Root=\uB8E8\uD2B8 \uB178\uB4DC
 Fine-Design_Report_Row=\uD589
-Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Row_Icon_File_Name=row_en.png
+Fine-Design_Report_Col_Icon_File_Name=col_en.png
 Fine-Design_Basic_SQL_Table=\uD14C\uC774\uBE14
 Fine-Design_Basic_SQL_View=View
 Fine-Design_Basic_Sample_Text=\uC0D8\uD50C\uD14D\uC2A4\uD2B8
@@ -2382,3 +2383,4 @@ Fine-Design_Vcs_resetValue=
 Fine-Design_Basic_Database_Manager=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uAD00\uB9AC
 Fine-Design_Basic_Use_Universe_Database_Manager=\uD1B5\uC6A9 \uB370\uC774\uD130 \uC5F0\uACB0 \uAD00\uB9AC\uC790 \uC0AC\uC6A9
 Fine-Design_Basic_Close_Window=\uCC3D \uB2EB\uAE30
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background_en.png

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

@@ -1464,6 +1464,7 @@ Fine-Design_Basic_Role_changed_Is_Refresh=\u89D2\u8272\u5DF2\u53D8\u52A8\uFF0C\u
 Fine-Design_Basic_Root=\u6839\u8282\u70B9
 Fine-Design_Report_Row=\u884C
 Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Col_Icon_File_Name=col.png
 Fine-Design_Basic_SQL_Table=\u8868
 Fine-Design_Basic_SQL_View=\u89C6\u56FE
 Fine-Design_Basic_Sample_Text=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C
@@ -2383,3 +2384,4 @@ Fine-Design_Vcs_resetValue=\u6E05\u7A7A\u63A7\u4EF6\u503C
 Fine-Design_Basic_Database_Manager=\u6570\u636E\u8FDE\u63A5\u7BA1\u7406\u5668
 Fine-Design_Basic_Use_Universe_Database_Manager=\u4F7F\u7528\u901A\u7528\u6570\u636E\u8FDE\u63A5\u7BA1\u7406\u5668
 Fine-Design_Basic_Close_Window=\u5173\u95ED\u7A97\u53E3
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background.png

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

@@ -508,7 +508,7 @@ Fine-Design_Report_RCode_Error_Correct=\u7CFE\u932F
 Fine-Design_Report_RCode_Version=\u7248\u672C
 Fine-Design_Basic_RWA_Add_Field=\u65B0\u589E\u6B04\u4F4D
 Fine-Design_Report_RWA_Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5132\u5B58\u683C
-Fine-Design_Report_Submit_Type_Build_In_Sql=\u5167\u5EFAQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=\u5167\u5EFASQL
 Fine-Design_Report_RWA_Click_Cell_To_Edit_Value=\u55AE\u64CA\u7BC4\u672C\u5132\u5B58\u683C\u4FEE\u6539\u503C
 Fine-Design_Report_RWA_Column_Offset=\u6B04\u504F\u79FB
 Fine-Design_Basic_RWA_NotChange_Unmodified=\u4E0D\u6539\u8B8A\u6642\u4E0D\u66F4\u65B0
@@ -1453,6 +1453,7 @@ Fine-Design_Basic_Role_changed_Is_Refresh=\u89D2\u8272\u5DF2\u8B8A\u52D5\uFF0C\u
 Fine-Design_Basic_Root=\u6839\u7BC0\u9EDE
 Fine-Design_Report_Row=\u5217
 Fine-Design_Report_Row_Icon_File_Name=row.png
+Fine-Design_Report_Col_Icon_File_Name=col.png
 Fine-Design_Basic_SQL_Table=\u8868
 Fine-Design_Basic_SQL_View=\u6AA2\u8996\u8868
 Fine-Design_Basic_Sample_Text=\u793A\u4F8B\u6587\u5B57 \u793A\u4F8B\u6587\u5B57
@@ -2249,19 +2250,19 @@ Fine-Design_Basic_Template_Already_Saved=\u7BC4\u672C\u5DF2\u7D93\u5132\u5B58{}.
 Fine-Design_Basic_Extend_Class=\u7E7C\u627F\u985E\u5225:{}\u3002
 Fine-Design_Basic_Plugin_Install_Successful=\u8A72\u5916\u639B\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u53CA\u4F3A\u670D\u5668\u6642\u88AB\u555F\u7528\uFF0C\u4F3A\u670D\u5668\u9700\u624B\u52D5\u91CD\u555F
 Fine-Design_Basic_Plugin_Load_Plugins_From_Server=\u7C21\u55AE\u901A\u7528\u67E5\u8A62
-Fine-Design_Basic_Plugin_Simple_General=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53C3\u6578
-Fine-Design_Basic_Plugin_Refresh_Parameter_In_SQL=\u67E5\u8A62\u65B9\u5F0F
-Fine-Design_Basic_Plugin_Query_Type=\u683C\u5F0F\u8AAA\u660E
-Fine-Design_Basic_Plugin_Format_explan=\u884C\u8EF8/\u7DAD\u5EA6
-Fine-Design_Basic_Plugin_Row_Dimension=\u8A9E\u6CD5\u683C\u5F0F\u53C3\u8003MDX\u8A9E\u6CD5\u3002 \n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product] .[Product].MEMBERS ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u6CE8\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\uFF0C\u67E5\u8A62\u8EF8\u53EA\u652F\u63F4\u50B3\u56DE\u5169\u500B\u8EF8\u3002
-Fine-Design_Basic_Plugin_MDX_Explain=\u5217\u8EF8/\u6307\u6A19
-Fine-Design_Basic_Plugin_Index=\u6B63\u5728\u7372\u53D6cube
-Fine-Design_Basic_Plugin_Get_Cube=\u8CC7\u6599\u5EAB\u9023\u63A5
-Fine-Design_Basic_Plugin_DataBase_Connection=WEB\u61C9\u7528
-Fine-Design_Basic_Plugin_Web_Apply=\u71B1\u9580\u554F\u984C
-Fine-Design_Report_AlphaFine_Hot=\u5167\u5EFA\u4F3A\u670D\u5668\u555F\u52D5\u4E2D...
-Fine-Design_Basic_Loading_Embed_Server=\u5206\u8A5E\u641C\u7D22
-Fine-Design_Basic_AlphaFine_Enable_Segmentation=\u50B3\u56DE
+Fine-Design_Basic_Plugin_Simple_General=\u7C21\u55AE\u901A\u7528\u67E5\u8A62
+Fine-Design_Basic_Plugin_Refresh_Parameter_In_SQL=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53C3\u6578
+Fine-Design_Basic_Plugin_Query_Type=\u67E5\u8A62\u65B9\u5F0F
+Fine-Design_Basic_Plugin_Format_explan=\u683C\u5F0F\u8AAA\u660E
+Fine-Design_Basic_Plugin_Row_Dimension=\u884C\u8EF8/\u7DAD\u5EA6
+Fine-Design_Basic_Plugin_MDX_Explain=\u8A9E\u6CD5\u683C\u5F0F\u53C3\u8003MDX\u8A9E\u6CD5\u3002 \n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product] .[Product].MEMBERS ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u6CE8\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\uFF0C\u67E5\u8A62\u8EF8\u53EA\u652F\u63F4\u50B3\u56DE\u5169\u500B\u8EF8\u3002
+Fine-Design_Basic_Plugin_Index=\u5217\u8EF8/\u6307\u6A19
+Fine-Design_Basic_Plugin_Get_Cube=\u6B63\u5728\u7372\u53D6cube
+Fine-Design_Basic_Plugin_DataBase_Connection=\u8CC7\u6599\u5EAB\u9023\u63A5
+Fine-Design_Basic_Plugin_Web_Apply=WEB\u61C9\u7528
+Fine-Design_Report_AlphaFine_Hot=\u71B1\u9580\u554F\u984C
+Fine-Design_Basic_Loading_Embed_Server=\u5167\u5EFA\u4F3A\u670D\u5668\u555F\u52D5\u4E2D...
+Fine-Design_Basic_AlphaFine_Enable_Segmentation=\u5206\u8A5E\u641C\u7D22
 Fine-Design_Report_AlphaFine_Back=\u50B3\u56DE
 Fine-Design_Report_AlphaFine_Relation_Item=\u76F8\u95DC\u554F\u984C
 Fine-Design_Basic_AlphaFine_Search_Type=\u641C\u5C0B\u65B9\u5F0F
@@ -2402,3 +2403,4 @@ Fine-Design_Basic_Database_Manager=\u8CC7\u6599\u9023\u63A5\u7BA1\u7406\u5668
 Fine-Design_Basic_Use_Universe_Database_Manager=\u4F7F\u7528\u901A\u7528\u6578\u64DA\u9023\u63A5\u7BA1\u7406\u5668
 Fine-Design_Basic_Close_Window=\u95DC\u9589\u8996\u7A97
 Fine-Design_Basic_Remote_Design_Version_Inconsistency=\u9060\u7AEF\u8A2D\u8A08\u53EF\u4EE5\u9023\u63A5\uFF0C\u4F46\u7248\u672C\u4E0D\u540C\u3002\u662F\u5426\u9700\u8981\u7E7C\u7E8C\u9023\u63A5?
+Fine-Design_Report_WaterMark_Background_Icon_File_Name=watermark_background.png