REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

6 years ago · 1a9e0b1971
6 changed files with 516 additions and 516 deletions
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
@ -100,56 +100,56 @@ BackgroundTexture-Walnut=Walnut
 BackgroundTexture-WaterDroplets=Water Drip
 BackgroundTexture-WhiteMarble=White Marble
 BackgroundTexture-WovenMat=Woven Mat
-Fine-Design_Style_Background_Setting=Background Setting
+Fine-Design_Basic_Style_Background_Setting=Background Setting
-Fine-Design_Style_Background_Gradient_Area=Gradient Area
+Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
-Fine-Design_Style_Background_Gradient_Repeat_Show=Repeat Show
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
-Fine-Design_Style_Background_Choose_Gradient_Color=Choose Color
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
-Fine-Design_Style_Background_Gradient_Current_Area=Current Area
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
-Fine-Design_Style_Background_Gradient_Custom_Area=Custom Area
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
-Fine-Design_Style_Add_Icon=Add icon
+Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_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_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_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_Tabledata_Type_Database_Query=Database Query
+Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=Class
-Fine-Design_Tabledata_Type_Embedded=Embedded
+Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
-Fine-Design_Tabledata_Type_Relation=Relation
+Fine-Design_Basic_Tabledata_Type_Relation=Relation
-Fine-Design_Tabledata_Type_File=File
+Fine-Design_Basic_Tabledata_Type_File=File
-Fine-Design_Tabledata_Type_Tree=Tree
+Fine-Design_Basic_Tabledata_Type_Tree=Tree
-Fine-Design_Tabledata_Type_Stored_Procedure=Stored Procedure
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
+Fine-Design_Basic_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
-Fine-Design_Tabledata_Select_To_Merge=Select TD to merge
+Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
-Fine-Design_Tabledata_Default_Parameter=TD default parameter
+Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
 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_Multiple_Select_Warn_Text=The current list is empty, or you did select none of the item!
-Fine-Design_Template_Select=Select Template
+Fine-Design_Basic_Template_Select=Select Template
 Fine-Design_Basic_Parameter_UI_Display=Display parameter UI
 Fine-Design_Basic_Parameter_Duplicate_Name=Duplicate name
 Fine-Design_Basic_Parameter_Source_Type_Tabledata=Tabledata parameter
 Fine-Design_Basic_Parameter_Source_Type_Server=Server parameter
-Fine-Design_Template_Parameter=Template parameter
+Fine-Design_Basic_Template_Parameter=Template parameter
-Fine-Design_Submit_Type_Custom=Custom submit
+Fine-Design_Report_Submit_Type_Custom=Custom submit
-Fine-Design_Report_Engine_Attribute=Report engine attribute
+Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Basic_Authority_Edit_Status=Authority edit status
 Fine-Design_Report_Decimal_Digits=Decimal digits
-Fine-Design_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date
-Fine-Design_Widget_Type_Number=Number
+Fine-Design_Basic_Widget_Type_Number=Number
-Fine-Design_Widget_Type_Label=Label
+Fine-Design_Basic_Widget_Type_Label=Label
-Fine-Design_Widget_Type_Button=Button
+Fine-Design_Basic_Widget_Type_Button=Button
-Fine-Design_Widget_Type_File=File
+Fine-Design_Basic_Widget_Type_File=File
-Fine-Design_Widget_Type_Checkbox_Group=Checkbox Group
+Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
-Fine-Design_Widget_Type_Radio_Group=Radio Group
+Fine-Design_Basic_Widget_Type_Radio_Group=Radio Group
-Fine-Design_Widget_Type_Combo_Box=Combobox
+Fine-Design_Basic_Widget_Type_Combo_Box=Combobox
-Fine-Design_Widget_Type_Combo_Checkbox=Combo Checkbox
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=Combo Checkbox
-Fine-Design_Widget_Type_Checkbox=Checkbox
+Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
-Fine-Design_Widget_Type_List=List
+Fine-Design_Basic_Widget_Type_List=List
-Fine-Design_Widget_Type_Text=Text
+Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_Widget_Type_Textarea=Textarea
+Fine-Design_Basic_Widget_Type_Textarea=Textarea
-Fine-Design_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password
-Fine-Design_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_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_Function_Type_Hierarchy=Hierachy
 BaiduMap=Baidu Map
 BarCodeD-Drawing_Text=Drawing Barcode Text
@ -157,10 +157,10 @@ BarInside=Bar Inside
 BarOutSide=Bar Out Side
 BarStyle=Bar Style
 Basic=Basic
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=Lower left to upper right
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=Lower left to upper right
-Fine-Design_Slope_Line_Upper_Left_To_Lower_Right=Upper left to lower right
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=Upper left to lower right
-Fine-Design_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_Slope_Line=Slope Line
+Fine-Design_Report_Slope_Line=Slope Line
 BindColumn-Bottom_N=Last N
 BindColumn-Custom_Data_Appearance=Customize Data Appearance
 BindColumn-Even_Selected_(2,4,6...)=Select Even Set(2,4,6...)
@ -277,7 +277,7 @@ Compile_Success=Compile Success
 Fine-Design_Basic_Compile_Save_Attention=Compile Success And Then Save
 Fine-Design_Basic_Common_Save_Successfully=Save successfully
 Fine-Design_Basic_Common_Save_Failed=Save failed
-Fine-Design_Template_Closed_Warn_Text=Template {} already closed.
+Fine-Design_Basic_Template_Closed_Warn_Text=Template {} already closed.
 Component_Interval=Components Interval
 Component_Scale=Component Scale
 Condition=Condition
@ -724,7 +724,7 @@ List-Need_Head=Need Head
 Load=Load
 Fine-Design_Basic_Loading=Loading
 Location=Location
-Fine-Design_Template_Status_Locked={}Locked{}
+Fine-Design_Basic_Template_Status_Locked={}Locked{}
 Log=Log
 Logout=Logout
 Low=Low
@ -860,7 +860,7 @@ Opened=Opened
 Options=Options
 Or=or
 Or-you=or you
-Fine-Design_Show_All_Oracle_Tables=Show All Oracle Tables
+Fine-Design_Basic_Show_All_Oracle_Tables=Show All Oracle Tables
 Fine-Design_Basic_Editor_Preference=Editor Preference
 Orange=Orange
 Original_Marked_Filed=Original Marked Filed
@ -986,7 +986,7 @@ RESTART=RESTART
 RP_Authority_Edit=Authority
 RWA-Add_Field=Add Field
 RWA-Batch_Modify_Cells=Batch Modify Cells
-Fine-Design_Submit_Type_Build_In_Sql=BuildIn SQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=BuildIn SQL
 RWA-Click_Cell_To_Edit_Value=Click Cell to Edit Value
 RWA-Column_Offset=Column Offset
 RWA-Help=helpdetail
@ -1008,7 +1008,7 @@ Recursion=Recursion
 Red=Red
 Refresh=Refresh
 Refresh_Database=Refresh database
-Fine-Design_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
 Registration-User_Name=User Name
 Related=Related
 RelatedChart=RelatedChart
@ -1089,7 +1089,7 @@ Second_Axis=Second Axis
 Select=Select
 Select_A_Tree_DataSource_To_Build=Select a tree data source to build
 Select_DataColumn=Select Data Column
-Fine-Design_Tabledata_Select=Select Data Set
+Fine-Design_Chart_Tabledata_Select=Select Data Set
 Select_Specified_Grouping=Select Specified Grouping
 Select_The_Source_To_Save=Select Source to Save
 Select_sort_order=Select sort order
@ -1107,7 +1107,7 @@ Server-Embedded_Server=Embedded Server
 Server-Open_Service_Manager=Open Service Manager
 Server-Start=Start
 Server-Stop=Stop
-Fine-Design_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_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
 Server-version-tip=You are currently connected to the server version is less than the designer version number you are using to continue to connect you to edit some of the properties may not be able to effectively save. If the need to connect, please send your designer version and the server version is consistent
 Server-version-tip-moreInfo=Your own team of our FineReport Designer version number of the product as well as the deployment server version number is consistent, in order to avoid the problems caused by inconsistent versions of risk.If you open a template produced higher Designer version, may open the error may be missing the original template properties. If you create the template used Designer Version higher than your final deployment with the server version, the server may not be able to properly load the template you create.
 ServerM-Predefined_Styles=Predefined Styles
@ -1397,7 +1397,7 @@ Yes=Yes
 add=
 alert_word=
 alraedy_close=already closed
-Fine-Design_Template_Already_Saved=Template Already Saved
+Fine-Design_Basic_Template_Already_Saved=Template Already Saved
 already_exists=already exists
 can_not_include_underline=can not contain "_"
 check_communication=please check the network communication is normal and that the server is running
@ -1420,17 +1420,17 @@ open-new-form-tip=open new form tip
 paper=
 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_Workspace_Default=Default workspace
+Fine-Design_Basic_Workspace_Default=Default workspace
 Fine-Design_Basic_Extend_Class=Extend class:{}.
-Fine-Design_Write_Smart_Submit=Smart submit
+Fine-Design_Basic_Write_Smart_Submit=Smart submit
-Fine-Design_Write_Delete_Submit=Delete submit
+Fine-Design_Basic_Write_Delete_Submit=Delete submit
-Fine-Design_Write_Update_Submit=Update submit
+Fine-Design_Basic_Write_Update_Submit=Update submit
-Fine-Design_Write_Submit_Type=Submit type
+Fine-Design_Report_Write_Submit_Type=Submit type
-Fine-Design_Write_Choose_Submit_Type=Choose submit type
+Fine-Design_Report_Write_Choose_Submit_Type=Choose submit type
-Fine-Design_Write_Submit_Event=Submit event
+Fine-Design_Basic_Write_Submit_Event=Submit event
-Fine-Design_Write_Custom_Event=Custom event
+Fine-Design_Basic_Write_Custom_Event=Custom event
-Fine-Design_Style_Font_Size=Font size
+Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size: {} px
 period=
 product_feedback=Product Feedback
@ -1499,7 +1499,7 @@ FR-Base_Value=
 FR-Base_Yes=
 FR-Base_sure_remove_item=
 FR-ConditionB_Operator=
-Fine-Design_Template_Custom_Style_Missed=Custom style missed
+Fine-Design_Report_Template_Custom_Style_Missed=Custom style missed
 FR-Designer-All_MSBold=
 FR-Designer-AlphaFine_NO_Result=no search result
 FR-Designer-AlphaFine_SetShortcuts=
@ -2160,7 +2160,7 @@ FR-Designer_Move_Up=Move up(F)
 FR-Designer_Name=Name
 FR-Designer_New_Value=
 Fine-Design_Report_No=No
-Fine-Design_Template_Permission_Denied=No Privilege
+Fine-Design_Basic_Template_Permission_Denied=No Privilege
 FR-Designer_NoResult=No results
 FR-Designer_No_Auto_Adjust=no automatic adjust
 FR-Designer_No_Settings_Available=No Settings Available!
@ -2357,7 +2357,7 @@ FR-Designer_Subscript=
 FR-Designer_Superscript=
 FR-Designer_Support_Email=Email:
 FR-Designer_Support_QQ=
-Fine-Design_Support_String_To_Formula=
+Fine-Design_Report_Support_String_To_Formula=
 FR-Designer_Swatch=
 FR-Designer_System_default=
 FR-Designer_Sytle-FRFont=Font
@ -2489,7 +2489,7 @@ FR-Designer_XMLA_Password=Password
 FR-Designer_XMLA_UserName=User name
 FR-Designer_X_Coordinate=X Coordinate
 FR-Designer_Y_Coordinate=Y Coordinate
-Fine-Design_Yes=
+Fine-Design_Report_Yes=
 FR-Designer_Zoom_In_Logic=zoom in logic
 FR-Designer_Zoom_Out_Logic=zoom out logic
 FR-Designer_bold=
@ -2709,40 +2709,40 @@ Fine-Designer_Allow_Full_Screen=Allow full screen
 Fine-Design_Basic_Log_Level_Info=Info
 Fine-Design_Basic_Log_Level_Warn=Warn
 Fine-Design_Basic_Log_Level_Error=Error
-Fine-Design_Switch_Workspace_Failed=Switch Workspace Failed
+Fine-Design_Basic_Switch_Workspace_Failed=Switch Workspace Failed
-Fine-Design_TableData_Select_One=Select one TD
+Fine-Design_Basic_TableData_Select_One=Select one TD
 Fine-Design_Basic_DS_Column=DS Column
-Fine-Design_Tabledata_Embedded_Table_Design=Table Design
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
-Fine-Design_Tabledata_Embedded_Column_Setting=Columns Setting
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
 Fine-Design_Basic_Database_Select_Table=Select Database Table
-Fine-Design_Tabledata_Source_Type_Template=Template Tabledata
+Fine-Design_Basic_Tabledata_Source_Type_Template=Template Tabledata
 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_Report_Column_Style=Report Column Style
 Fine-Design_Report_Column_Area=Report Column Area
 Fine-Design_Report_Column_Data=Report Column Data
 Fine-Design_Report_Column_Warn_Text=Report Column Area Format Error
-Fine-Design_Template_File_Name_Duplicate=Template {} already exist
+Fine-Design_Basic_Template_File_Name_Duplicate=Template {} already exist
 Fine-Design_Basic_Button_Type_Parameter_Submit=Parameter Submit
-Fine-Design_Style_Indent_Right=Indent Right(PT)
+Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
-Fine-Design_Style_Indent_Left=Indent Left(PT)
+Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
 Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
-Fine-Design_Title_Style=Title Style
+Fine-Design_Form_Title_Style=Title Style
 Fine-Design_Form_Button_Name=Button Name
 Fine-Design_Basic_Button_Style=Button Style
-Fine-Design_Widget_Value=Widget Value
+Fine-Design_Form_Widget_Value=Widget Value
-Fine-Design_Widget_Choose_Type_All=Provide Choose All
+Fine-Design_Form_Widget_Choose_Type_All=Provide Choose All
-Fine-Design_Widget_Alias_Name=Widget Alias Name
+Fine-Design_Form_Widget_Alias_Name=Widget Alias Name
 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=Widget Setting
 Fine-Design_Form_Hyperlink_Undefined=Undefined Hyperlink
 Fine-Design_Form_Hyperlink_Group_Count=Total has {} groups hyperlink
-Fine-Design_Widget_Button_Setting=Button Setting
+Fine-Design_Form_Widget_Button_Setting=Button Setting
-Fine-Design_Widget_Icon=Widget Icon
+Fine-Design_Form_Widget_Icon=Widget Icon
-Fine-Design_Widget_Page_Navi_Text=Current/Total
+Fine-Design_Form_Widget_Page_Navi_Text=Current/Total
-Fine-Design_Toolbar_Custom_Button=Custom Button
+Fine-Design_Form_Toolbar_Custom_Button=Custom Button
 Fine-Design_Form_Authority_Edit=Form Authority Edit
 Fine-Design_Form_Layout_2x2=2x2Layout Container
 Fine-Design_Form_Layout_2x3=2x3Layout Container
@ -2764,7 +2764,7 @@ Fine-Design_Chart_Category_Name=Category Name
 Fine-Design_Chart_Second_Value_Axis=Second Value Axis
 Fine-Design_Chart_Value_Define=Value Define
 Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh
-Fine-Design_Tabledata=Tabledata
+Fine-Design_Chart_Tabledata=Tabledata
 Fine-Design_Chart_Enable_Field_Name=Enable Field Name
 Fine-Design_Chart_Enable_Field_Value=Enable Field Value
 Fine-Design_Chart_Legend_Name=Legend(Series) Name
@ -2796,9 +2796,9 @@ Fine-Design_Chart_Area_Value=Area Value
 Fine-Design_Chart_Area_Name=Area Name
 Fine-Design_Chart_Map_Data=Map Data
 Fine-Design_Chart_Single_Layer_Map=Single Layer Map
-Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
+Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
-Fine-Design_Template_Global_Style_Missed=Global style {} missed
+Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
-Fine-Design_Write_Select_Cell_Count=Selected {} cells
+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_Format=Format
 Fine-Design_Basic_Illegal_Name_Tips=Please rename
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
@ -527,7 +527,7 @@ Fine-Design_Report_Column_Style=Report Column Style
 Fine-Design_Report_Column_Warn_Text=Report Column Area Format Error
 Fine-Design_Report_Decimal_Digits=Decimal digits
 Fine-Design_Report_DSColumn_Result_Group_Format=Format:{} serial number start from 1,built-in parameter {} show total count
-Fine-Design_Report_Engine_Attribute=Report engine attribute
+Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Report_Export_Excel_Page=Excel(Page)
 Fine-Design_Report_Export_Excel_Page_To_Sheet=One Page Per Sheet
 Fine-Design_Report_Export_Excel_Simple=Excel(Simple)
@ -535,91 +535,91 @@ Fine-Design_Report_Export_Word=Word
 Fine-Design_Report_Fill_Blank_Data=Supplement blank data
 Fine-Design_Report_Filter=Filter
 Fine-Design_Report_OK=OK
-Fine-Design_Show_All_Oracle_Tables=Show All Oracle Tables
+Fine-Design_Basic_Show_All_Oracle_Tables=Show All Oracle Tables
-Fine-Design_Slope_Line=Slope Line
+Fine-Design_Report_Slope_Line=Slope Line
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=lower left-upper right
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=lower left-upper right
-Fine-Design_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_Slope_Line_Upper_Left_To_Lower_Right=upper left-lower right
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=upper left-lower right
-Fine-Design_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_Style_Add_Icon=Add icon
+Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_Style_Background_Choose_Gradient_Color=Choose Color
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
-Fine-Design_Style_Background_Gradient_Area=Gradient Area
+Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
-Fine-Design_Style_Background_Gradient_Current_Area=Current Area
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
-Fine-Design_Style_Background_Gradient_Custom_Area=Custom Area
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
-Fine-Design_Style_Background_Gradient_Repeat_Show=Repeat Show
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
-Fine-Design_Style_Background_Setting=Background Settings
+Fine-Design_Basic_Style_Background_Setting=Background Settings
-Fine-Design_Style_Font_Size=Font size
+Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Style_Indent_Left=Indent Left(PT)
+Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
-Fine-Design_Style_Indent_Right=Indent Right(PT)
+Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
-Fine-Design_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size: {} px
-Fine-Design_Submit_Type_Build_In_Sql=Built-in SQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=Built-in SQL
-Fine-Design_Submit_Type_Custom=Custom submit
+Fine-Design_Report_Submit_Type_Custom=Custom submit
-Fine-Design_Support_String_To_Formula=Surport String To Formula
+Fine-Design_Report_Support_String_To_Formula=Surport String To Formula
-Fine-Design_Switch_Workspace_Failed=Switch Workspace Failed
+Fine-Design_Basic_Switch_Workspace_Failed=Switch Workspace Failed
-Fine-Design_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_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_Tabledata=Tabledata
+Fine-Design_Chart_Tabledata=Tabledata
-Fine-Design_Tabledata_Default_Parameter=TD default parameter
+Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
-Fine-Design_Tabledata_Embedded_Column_Setting=Columns Setting
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
-Fine-Design_Tabledata_Embedded_Table_Design=Table Design
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
-Fine-Design_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
+Fine-Design_Basic_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
-Fine-Design_Tabledata_Select=Select Data Set
+Fine-Design_Chart_Tabledata_Select=Select Data Set
-Fine-Design_TableData_Select_One=Select one TD
+Fine-Design_Basic_TableData_Select_One=Select one TD
-Fine-Design_Tabledata_Select_To_Merge=Select TD to merge
+Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
-Fine-Design_Tabledata_Source_Type_Template=Template Tabledata
+Fine-Design_Basic_Tabledata_Source_Type_Template=Template Tabledata
-Fine-Design_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=Class
-Fine-Design_Tabledata_Type_Database_Query=Database Query
+Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Tabledata_Type_Embedded=Embedded
+Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
-Fine-Design_Tabledata_Type_File=File
+Fine-Design_Basic_Tabledata_Type_File=File
-Fine-Design_Tabledata_Type_Relation=Relation
+Fine-Design_Basic_Tabledata_Type_Relation=Relation
-Fine-Design_Tabledata_Type_Stored_Procedure=Stored Procedure
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_Tabledata_Type_Tree=Tree
+Fine-Design_Basic_Tabledata_Type_Tree=Tree
-Fine-Design_Template_Already_Saved=Template Already Saved {}.
+Fine-Design_Basic_Template_Already_Saved=Template Already Saved {}.
-Fine-Design_Template_Closed_Warn_Text=Template {} already closed.
+Fine-Design_Basic_Template_Closed_Warn_Text=Template {} already closed.
-Fine-Design_Template_Custom_Style_Missed=Custom style lost
+Fine-Design_Report_Template_Custom_Style_Missed=Custom style lost
-Fine-Design_Template_File_Name_Duplicate=Template {} already exist
+Fine-Design_Basic_Template_File_Name_Duplicate=Template {} already exist
-Fine-Design_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
-Fine-Design_Template_Global_Style_Missed=Global style {} missed
+Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
-Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
+Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
-Fine-Design_Template_Parameter=Template parameter
+Fine-Design_Basic_Template_Parameter=Template parameter
-Fine-Design_Template_Permission_Denied=Permission_Denied
+Fine-Design_Basic_Template_Permission_Denied=Permission_Denied
-Fine-Design_Template_Select=Select Template
+Fine-Design_Basic_Template_Select=Select Template
-Fine-Design_Template_Status_Locked={}Locked{}
+Fine-Design_Basic_Template_Status_Locked={}Locked{}
-Fine-Design_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_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_Title_Style=Title Style
+Fine-Design_Form_Title_Style=Title Style
-Fine-Design_Toolbar_Custom_Button=Custom Button
+Fine-Design_Form_Toolbar_Custom_Button=Custom Button
-Fine-Design_Widget_Alias_Name=Widget Alias Name
+Fine-Design_Form_Widget_Alias_Name=Widget Alias Name
-Fine-Design_Widget_Button_Setting=Button Setting
+Fine-Design_Form_Widget_Button_Setting=Button Setting
-Fine-Design_Widget_Choose_Type_All=Provide Choose All
+Fine-Design_Form_Widget_Choose_Type_All=Provide Choose All
-Fine-Design_Widget_Icon=Widget Icon
+Fine-Design_Form_Widget_Icon=Widget Icon
-Fine-Design_Widget_Page_Navi_Text=Current/Total
+Fine-Design_Form_Widget_Page_Navi_Text=Current/Total
-Fine-Design_Widget_Type_Button=Button
+Fine-Design_Basic_Widget_Type_Button=Button
-Fine-Design_Widget_Type_Checkbox=Checkbox
+Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
-Fine-Design_Widget_Type_Checkbox_Group=Checkbox Group
+Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
-Fine-Design_Widget_Type_Combo_Box=Combobox
+Fine-Design_Basic_Widget_Type_Combo_Box=Combobox
-Fine-Design_Widget_Type_Combo_Checkbox=Combo Checkbox
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=Combo Checkbox
-Fine-Design_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date
-Fine-Design_Widget_Type_File=File
+Fine-Design_Basic_Widget_Type_File=File
-Fine-Design_Widget_Type_Label=Label
+Fine-Design_Basic_Widget_Type_Label=Label
-Fine-Design_Widget_Type_List=List
+Fine-Design_Basic_Widget_Type_List=List
-Fine-Design_Widget_Type_Number=Number
+Fine-Design_Basic_Widget_Type_Number=Number
-Fine-Design_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password
-Fine-Design_Widget_Type_Radio_Group=Radio Group
+Fine-Design_Basic_Widget_Type_Radio_Group=Radio Group
-Fine-Design_Widget_Type_Text=Text
+Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_Widget_Type_Textarea=Textarea
+Fine-Design_Basic_Widget_Type_Textarea=Textarea
-Fine-Design_Widget_Value=Widget Value
+Fine-Design_Form_Widget_Value=Widget Value
-Fine-Design_Workspace_Default=Default workspace
+Fine-Design_Basic_Workspace_Default=Default workspace
-Fine-Design_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_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_Write_Choose_Submit_Type=Choose submit type
+Fine-Design_Report_Write_Choose_Submit_Type=Choose submit type
-Fine-Design_Write_Custom_Event=Custom event
+Fine-Design_Basic_Write_Custom_Event=Custom event
-Fine-Design_Write_Delete_Submit=Delete submit
+Fine-Design_Basic_Write_Delete_Submit=Delete submit
-Fine-Design_Write_Select_Cell_Count=Selected {} cells
+Fine-Design_Report_Write_Select_Cell_Count=Selected {} cells
-Fine-Design_Write_Smart_Submit=Smart submit
+Fine-Design_Basic_Write_Smart_Submit=Smart submit
-Fine-Design_Write_Submit_Event=Submit event
+Fine-Design_Basic_Write_Submit_Event=Submit event
-Fine-Design_Write_Submit_Type=Submit type
+Fine-Design_Report_Write_Submit_Type=Submit type
-Fine-Design_Write_Update_Submit=Update submit
+Fine-Design_Basic_Write_Update_Submit=Update submit
-Fine-Design_Yes=Yes
+Fine-Design_Report_Yes=Yes
 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: {}, to serve you.
 Fine-Designer_Allow_Full_Screen=Allow full screen
 Fine-Designer_Basic_Remote_Connect_Auth_Failed=wrong username & password
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
@ -100,17 +100,17 @@ BackgroundTexture-Walnut=\u30AF\u30EB\u30DF
 BackgroundTexture-WaterDroplets=\u3057\u305A\u304F
 BackgroundTexture-WhiteMarble=\u767D\u3044\u5927\u7406\u77F3
 BackgroundTexture-WovenMat=\u7E54\u7269
-Fine-Design_Style_Background_Setting=\u80CC\u666F\u8A2D\u5B9A
+Fine-Design_Basic_Style_Background_Setting=\u80CC\u666F\u8A2D\u5B9A
 BaiduMap=\u767E\u5EA6\u30DE\u30C3\u30D7
 BarCodeD-Drawing_Text=\u30D0\u30FC\u30B3\u30FC\u30C9\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3059\u308B
 BarInside=\u67F1\u5B50\u5185\u4FA7
 BarOutSide=\u5916\u306E\u67F1
 BarStyle=\u30B9\u30C8\u30EA\u30C3\u30D7
 Basic=\u57FA\u672C
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=\u5DE6\u4E0B\u5074\u304B\u3089\u53F3\u4E0A\u5074\u3078\u5E83\u304C\u308B
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\u5DE6\u4E0B\u5074\u304B\u3089\u53F3\u4E0A\u5074\u3078\u5E83\u304C\u308B
-Fine-Design_Slope_Line_Upper_Left_To_Lower_Right=\u5DE6\u4E0A\u5074\u304B\u3089\u53F3\u4E0B\u5074\u3078\u5E83\u3052\u308B
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\u5DE6\u4E0A\u5074\u304B\u3089\u53F3\u4E0B\u5074\u3078\u5E83\u3052\u308B
-Fine-Design_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_Slope_Line=\u659C\u7DDA
+Fine-Design_Report_Slope_Line=\u659C\u7DDA
 BindColumn-Bottom_N=\u5F8C\u306EN\u500B
 BindColumn-Custom_Data_Appearance=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306F\u8868\u793A\u3059\u308A\u307E\u3059
 BindColumn-Even_Selected_(2,4,6...)=\u5076\u6570\u30BB\u30C3\u30C8(2\u30014\u30016...)\u3092\u9078\u629E\u3057\u305F
@ -671,7 +671,7 @@ List-Need_Head=\u30EA\u30B9\u30C8\u30D8\u30C3\u30C9\u304C\u5FC5\u8981\u3067\u305
 Load=\u30ED\u30FC\u30C9
 Fine-Design_Basic_Loading=\u30ED\u30FC\u30C9\u4E2D
 Location=\u4F4D\u7F6E
-Fine-Design_Template_Status_Locked={}\u30ED\u30C3\u30AF\u6E08\u307F{}
+Fine-Design_Basic_Template_Status_Locked={}\u30ED\u30C3\u30AF\u6E08\u307F{}
 Log=\u30ED\u30B0
 Logout=\u9000\u51FA
 Low=\u4F4E
@ -807,7 +807,7 @@ Opened=\u8D77\u52D5\u6E08\u307F
 Options=\u30AA\u30D7\u30B7\u30E7\u30F3
 Or=\u307E\u305F\u306F
 Or-you=\u307E\u305F\u306F
-Fine-Design_Show_All_Oracle_Tables=\u3059\u3079\u3066\u306E\u8868
+Fine-Design_Basic_Show_All_Oracle_Tables=\u3059\u3079\u3066\u306E\u8868
 Fine-Design_Basic_Editor_Preference=Editor Preference
 Orange=\u30AA\u30EC\u30F3\u30B8
 Original_Marked_Filed=\u521D\u671F\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9
@ -933,7 +933,7 @@ RESTART=\u518D\u8D77\u52D5
 RP_Authority_Edit=\u6A29\u9650\u7DE8\u96C6
 RWA-Add_Field=\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u8FFD\u52A0
 RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6B63\u30BB\u30EB
-Fine-Design_Submit_Type_Build_In_Sql=\u5185\u8535SQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=\u5185\u8535SQL
 RWA-Click_Cell_To_Edit_Value=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30BB\u30EB\u4FEE\u6B63\u5024
 RWA-Column_Offset=\u5217\u30AA\u30D5\u30BB\u30C3\u30C8
 RWA-Help=\u8A2D\u7F6E\u5F8C\u306E\u6539\u6B63\u3092\u66F4\u65B0\u3057\u306A\u3044\u3068\u3001\u7533\u544A\u30D7\u30EC\u30D3\u30E5\u30FC\u30EC\u30DD\u30FC\u30C8\u306B\u8A18\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u6240\u5728\u30EC\u30A4\u30E4
@ -955,7 +955,7 @@ Recursion=\u5E30\u7D0D
 Red=\u8D64\u8272
 Refresh=\u66F4\u65B0
 Refresh_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u66F4\u65B0
-Fine-Design_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
 Registration-User_Name=\u30E6\u30FC\u30B6\u540D
 Related=\u9023\u52D5
 RelatedChart=\u30B0\u30E9\u30D5\u9023\u52D5
@ -1036,7 +1036,7 @@ Second_Axis=\u6B21\u5EA7\u6A19\u8EF8
 Select=\u9078\u629E
 Select_A_Tree_DataSource_To_Build=\u30C4\u30EA\u30FC\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u9078\u629E\u3057\u3066\u7D44\u307F\u7ACB\u3066\u3066\u304F\u3060\u3055\u3044
 Select_DataColumn=\u30C7\u30FC\u30BF\u5217\u3092\u9078\u629E
-Fine-Design_Tabledata_Select=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u9078\u629E
+Fine-Design_Chart_Tabledata_Select=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u9078\u629E
 Select_Specified_Grouping=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u3092\u9078\u629E
 Select_The_Source_To_Save=\u8A18\u61B6\u3059\u308B\u9805\u76EE\u3092\u9078\u629E
 Select_sort_order=\u6392\u5217\u9806\u5E8F\u3092\u9078\u629E
@ -1054,7 +1054,7 @@ Server-Embedded_Server=\u5185\u8535\u30B5\u30FC\u30D0\u30FC
 Server-Open_Service_Manager=\u30B5\u30FC\u30D3\u30B9\u7BA1\u7406\u5668\u3092\u958B\u304F
 Server-Start=\u8D77\u52D5
 Server-Stop=\u505C\u6B62
-Fine-Design_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_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
 Server-version-tip=\u3042\u306A\u305F\u306F\u3001\u73FE\u5728\u3001\u3042\u306A\u305F\u306F\u3044\u304F\u3064\u304B\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u52B9\u679C\u7684\u306B\u4FDD\u5B58\u3059\u308B\u3053\u3068\u304C
 Server-version-tip-moreInfo=\u79C1\u305F\u3061\u306E\u88FD\u54C1\u306EFineReport Designer\u30D0\u30FC\u30B8\u30E7\u30F3\u756A\u53F7\u3060\u3051\u3067\u306A\u304F\u3001
 ServerM-Predefined_Styles=\u4E8B\u524D\u5B9A\u7FA9\u30B9\u30BF\u30A4\u30EB
@ -1344,7 +1344,7 @@ Yes=\u306F\u3044
 add=\u8FFD\u52A0
 alert_word=\u884C\u306E\u9AD8\u3055\u3092\u56FA\u5B9A\u305B\u305A\u5C0E\u51FA\u3092\u9078\u629E\u3057\u305F\u6B73\u3001\u5C0E\u51FA\u3057\u305Fword\u306E\u7DE8\u96C6\u306F\u3001\u30BB
 alraedy_close=\u3059\u3067\u306B\u30AA\u30D5
-Fine-Design_Template_Already_Saved=Template Already Saved {}.
+Fine-Design_Basic_Template_Already_Saved=Template Already Saved {}.
 already_exists=\u3053\u3053\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
 can_not_include_underline=_\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 check_communication=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u901A\u4FE1\u304C\u6B63\u5E38\u3067\u3042\u308A\u3001\u30B5\u30FC\u30D0\u304C\u52D5\u4F5C\u3057\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060
@ -1367,7 +1367,7 @@ open-new-form-tip=711\u4EE5\u4E0B\u306E\u751F\u7523\u306E\u305F\u3081\u306E\u30C
 paper=\u7D19
 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_Workspace_Default=Default workspace
+Fine-Design_Basic_Workspace_Default=Default workspace
 Fine-Design_Basic_Extend_Class=Extend class:{}.
 period=\u3002
 product_feedback=\u88FD\u54C1\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
@ -1436,7 +1436,7 @@ FR-Base_Value=\u5024
 FR-Base_Yes=\u306F\u3044
 FR-Base_sure_remove_item=\u672C\u5F53\u306B\u9078\u629E\u3057\u305F\u9805\u76EE\u3092\u524A\u9664\u3057\u307E\u3059\u304B
 FR-ConditionB_Operator=\u6F14\u7B97\u5B50
-Fine-Design_Template_Custom_Style_Missed=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B9\u30BF\u30A4\u30EB\u306F\u5931\u308F\u308C\u307E\u3057\u305F
+Fine-Design_Report_Template_Custom_Style_Missed=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B9\u30BF\u30A4\u30EB\u306F\u5931\u308F\u308C\u307E\u3057\u305F
 FR-Designer-All_MSBold=\u5FAE\u8EDF\u96C5\u9ED2
 FR-Designer-AlphaFine_NO_Result=
 FR-Designer-AlphaFine_SetShortcuts=
@ -2095,7 +2095,7 @@ FR-Designer_Move_Up=
 FR-Designer_Name=\u540D\u79F0
 FR-Designer_New_Value=\u65B0\u5024
 Fine-Design_Report_No=\u3044\u3044\u3048
-Fine-Design_Template_Permission_Denied=Permission_Denied
+Fine-Design_Basic_Template_Permission_Denied=Permission_Denied
 FR-Designer_NoResult=
 FR-Designer_No_Auto_Adjust=
 FR-Designer_No_Settings_Available=
@ -2292,7 +2292,7 @@ FR-Designer_Subscript=\u4E0B\u4ED8\u304D
 FR-Designer_Superscript=\u4E0A\u4ED8\u304D
 FR-Designer_Support_Email=
 FR-Designer_Support_QQ=\u6280\u8853QQ
-Fine-Design_Support_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5B57\u5217\u7DE8\u96C6\u3092\u516C\u5F0F\u3068\u3059\u308B\u3053\u3068\u306B\u30B5\u30DD\u30FC\u30C8
+Fine-Design_Report_Support_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5B57\u5217\u7DE8\u96C6\u3092\u516C\u5F0F\u3068\u3059\u308B\u3053\u3068\u306B\u30B5\u30DD\u30FC\u30C8
 FR-Designer_Swatch=\u30B5\u30F3\u30D7\u30EB
 FR-Designer_System_default=\u30B7\u30B9\u30C6\u30E0\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u3059\u308B
 FR-Designer_Sytle-FRFont=\u30D5\u30A9\u30F3\u30C8
@ -2424,7 +2424,7 @@ FR-Designer_XMLA_Password=\u30D1\u30B9\u30EF\u30FC\u30C9
 FR-Designer_XMLA_UserName=\u30E6\u30FC\u30B6\u540D
 FR-Designer_X_Coordinate=\u6A2A\u5EA7\u6A19
 FR-Designer_Y_Coordinate=\u7E26\u5EA7\u6A19
-Fine-Design_Yes=\u306F\u3044
+Fine-Design_Report_Yes=\u306F\u3044
 FR-Designer_Zoom_In_Logic=
 FR-Designer_Zoom_Out_Logic=
 FR-Designer_bold=\u592A\u304F\u3059\u308B
@ -2642,100 +2642,100 @@ Fine-Plugin_Shop_Need_Install_Version=
 Fine-Design_Basic_Log_Level_Info=Info
 Fine-Design_Basic_Log_Level_Warn=Warn
 Fine-Design_Basic_Log_Level_Error=Error
-Fine-Design_Switch_Workspace_Failed=Switch Workspace Failed
+Fine-Design_Basic_Switch_Workspace_Failed=Switch Workspace Failed
-Fine-Design_Write_Smart_Submit=Smart submit
+Fine-Design_Basic_Write_Smart_Submit=Smart submit
-Fine-Design_Write_Delete_Submit=Delete submit
+Fine-Design_Basic_Write_Delete_Submit=Delete submit
-Fine-Design_Write_Update_Submit=Update submit
+Fine-Design_Basic_Write_Update_Submit=Update submit
-Fine-Design_Write_Choose_Submit_Type=Choose submit type
+Fine-Design_Report_Write_Choose_Submit_Type=Choose submit type
-Fine-Design_Write_Submit_Type=Submit type
+Fine-Design_Report_Write_Submit_Type=Submit type
-Fine-Design_Write_Submit_Event=Submit event
+Fine-Design_Basic_Write_Submit_Event=Submit event
-Fine-Design_Write_Custom_Event=Custom event
+Fine-Design_Basic_Write_Custom_Event=Custom event
-Fine-Design_Style_Font_Size=Font size
+Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size: {} px
-Fine-Design_Style_Background_Gradient_Area=Gradient Area
+Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
-Fine-Design_Style_Background_Gradient_Repeat_Show=Repeat Show
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
-Fine-Design_Style_Background_Choose_Gradient_Color=Choose Color
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
-Fine-Design_Style_Background_Gradient_Current_Area=Current Area
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
-Fine-Design_Style_Background_Gradient_Custom_Area=Custom Area
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
-Fine-Design_Style_Add_Icon=Add icon
+Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_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_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_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_Tabledata_Type_File=File
+Fine-Design_Basic_Tabledata_Type_File=File
-Fine-Design_Tabledata_Select_To_Merge=Select TD to merge
+Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
-Fine-Design_Tabledata_Default_Parameter=TD default parameter
+Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
-Fine-Design_Tabledata_Type_Tree=Tree
+Fine-Design_Basic_Tabledata_Type_Tree=Tree
-Fine-Design_Tabledata_Type_Database_Query=Database Query
+Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=Class
-Fine-Design_Tabledata_Type_Embedded=Embedded
+Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
-Fine-Design_Tabledata_Type_Relation=Relation
+Fine-Design_Basic_Tabledata_Type_Relation=Relation
-Fine-Design_Tabledata_Type_Stored_Procedure=Stored Procedure
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_TableData_Select_One=Select one TD
+Fine-Design_Basic_TableData_Select_One=Select one TD
-Fine-Design_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
+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_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_Template_Select=Select Template
+Fine-Design_Basic_Template_Select=Select Template
 Fine-Design_Basic_Parameter_UI_Display=Display parameter UI
-Fine-Design_Template_Parameter=Template parameter
+Fine-Design_Basic_Template_Parameter=Template parameter
-Fine-Design_Submit_Type_Custom=Custom submit
+Fine-Design_Report_Submit_Type_Custom=Custom submit
 Fine-Design_Basic_Parameter_Duplicate_Name=Duplicate name
-Fine-Design_Report_Engine_Attribute=Report engine attribute
+Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Basic_Authority_Edit_Status=Authority edit status
 Fine-Design_Report_Decimal_Digits=Decimal digits
-Fine-Design_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date
-Fine-Design_Widget_Type_Checkbox_Group=Checkbox Group
+Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
-Fine-Design_Widget_Type_Radio_Group=Radio Group
+Fine-Design_Basic_Widget_Type_Radio_Group=Radio Group
-Fine-Design_Widget_Type_Number=Number
+Fine-Design_Basic_Widget_Type_Number=Number
-Fine-Design_Widget_Type_Label=Label
+Fine-Design_Basic_Widget_Type_Label=Label
-Fine-Design_Widget_Type_Button=Button
+Fine-Design_Basic_Widget_Type_Button=Button
-Fine-Design_Widget_Type_File=File
+Fine-Design_Basic_Widget_Type_File=File
-Fine-Design_Widget_Type_Combo_Box=Combobox
+Fine-Design_Basic_Widget_Type_Combo_Box=Combobox
-Fine-Design_Widget_Type_Combo_Checkbox=Combo Checkbox
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=Combo Checkbox
-Fine-Design_Widget_Type_Checkbox=Checkbox
+Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
-Fine-Design_Widget_Type_List=List
+Fine-Design_Basic_Widget_Type_List=List
-Fine-Design_Widget_Type_Textarea=Textarea
+Fine-Design_Basic_Widget_Type_Textarea=Textarea
-Fine-Design_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password
-Fine-Design_Widget_Type_Text=Text
+Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_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_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_DS_Column=DS Column
-Fine-Design_Tabledata_Embedded_Table_Design=Table Design
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
-Fine-Design_Tabledata_Embedded_Column_Setting=Columns Setting
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
 Fine-Design_Basic_Database_Select_Table=Select Database Table
-Fine-Design_Tabledata_Source_Type_Template=Template Tabledata
+Fine-Design_Basic_Tabledata_Source_Type_Template=Template Tabledata
 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_Template_Closed_Warn_Text=Template {} already closed.
+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
 Fine-Design_Report_Column_Warn_Text=Report Column Area Format Error
-Fine-Design_Template_File_Name_Duplicate=Template {} already exist
+Fine-Design_Basic_Template_File_Name_Duplicate=Template {} already exist
 Fine-Design_Basic_Button_Type_Parameter_Submit=Parameter Submit
-Fine-Design_Style_Indent_Right=Indent Right(PT)
+Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
-Fine-Design_Style_Indent_Left=Indent Left(PT)
+Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
 Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
-Fine-Design_Title_Style=Title Style
+Fine-Design_Form_Title_Style=Title Style
 Fine-Design_Form_Button_Name=Button Name
 Fine-Design_Basic_Button_Style=Button Style
-Fine-Design_Widget_Value=Widget Value
+Fine-Design_Form_Widget_Value=Widget Value
-Fine-Design_Widget_Choose_Type_All=Provide Choose All
+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=Widget Setting
 Fine-Design_Form_Hyperlink_Undefined=Undefined Hyperlink
 Fine-Design_Form_Hyperlink_Group_Count=Total has {} groups hyperlink
-Fine-Design_Widget_Alias_Name=Widget Alias Name
+Fine-Design_Form_Widget_Alias_Name=Widget Alias Name
-Fine-Design_Widget_Button_Setting=Button Setting
+Fine-Design_Form_Widget_Button_Setting=Button Setting
-Fine-Design_Widget_Icon=Widget Icon
+Fine-Design_Form_Widget_Icon=Widget Icon
-Fine-Design_Widget_Page_Navi_Text=Current/Total
+Fine-Design_Form_Widget_Page_Navi_Text=Current/Total
 Fine-Design_Report_Export_Excel_Simple=Excel(Simple)
-Fine-Design_Toolbar_Custom_Button=Custom Button
+Fine-Design_Form_Toolbar_Custom_Button=Custom Button
 Fine-Design_Form_Authority_Edit=Form Authority Edit
 Fine-Design_Form_Layout_2x2=2x2Layout Container
 Fine-Design_Form_Layout_2x3=2x3Layout Container
@ -2758,7 +2758,7 @@ Fine-Design_Chart_Category_Name=Category Name
 Fine-Design_Chart_Second_Value_Axis=Second Value Axis
 Fine-Design_Chart_Value_Define=Value Define
 Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh
-Fine-Design_Tabledata=Tabledata
+Fine-Design_Chart_Tabledata=Tabledata
 Fine-Design_Chart_Enable_Field_Name=Enable Field Name
 Fine-Design_Chart_Enable_Field_Value=Enable Field Value
 Fine-Design_Chart_Legend_Name=Legend(Series) Name
@ -2790,9 +2790,9 @@ Fine-Design_Chart_Map_Data=Map Data
 Fine-Design_Chart_Area_Value=Area Value
 Fine-Design_Chart_Area_Name=Area Name
 Fine-Design_Chart_Single_Layer_Map=Single Layer Map
-Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
+Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
-Fine-Design_Template_Global_Style_Missed=Global style {} missed
+Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
-Fine-Design_Write_Select_Cell_Count=Selected {} cells
+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_Format=Format
 Fine-Design_Basic_Illegal_Name_Tips=Please rename
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
@ -100,17 +100,17 @@ BackgroundTexture-Walnut=\uD638\uB450
 BackgroundTexture-WaterDroplets=\uBB3C\uBC29\uC6B8
 BackgroundTexture-WhiteMarble=\uD770\uC0C9\uB300\uB9AC\uC11D
 BackgroundTexture-WovenMat=\uD3B8\uC9C1\uBB3C
-Fine-Design_Style_Background_Setting=\uBC30\uACBD\uC124\uC815
+Fine-Design_Basic_Style_Background_Setting=\uBC30\uACBD\uC124\uC815
 BaiduMap=\uBC14\uC774\uB450\uC9C0\uB3C4
 BarCodeD-Drawing_Text=\uBC14\uCF54\uB4DC\uD14D\uC2A4\uD2B8\uBCF4\uC774\uAE30
 BarInside=\uCEEC\uB7FC\uC548\uCABD
 BarOutSide=\uCEEC\uB7FC\uBC14\uAE65\uCABD
 BarStyle=\uBC14\uD0C0\uC785
 Basic=\uAE30\uBCF8
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=\uC67C\uCABD\uD558\uB2E8\uC5D0\uC11C\uC624\uB978\uCABD\uC704\uB85C\uB098\uD0C0\uB0B4\uAE30
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\uC67C\uCABD\uD558\uB2E8\uC5D0\uC11C\uC624\uB978\uCABD\uC704\uB85C\uB098\uD0C0\uB0B4\uAE30
-Fine-Design_Slope_Line_Upper_Left_To_Lower_Right=\uC67C\uCABD\uC0C1\uB2E8\uC5D0\uC11C\uC624\uB978\uCABD\uC544\uB798\uB85C\uB098\uD0C0\uB0B4\uAE30
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\uC67C\uCABD\uC0C1\uB2E8\uC5D0\uC11C\uC624\uB978\uCABD\uC544\uB798\uB85C\uB098\uD0C0\uB0B4\uAE30
-Fine-Design_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_Slope_Line=\uC0AC\uC120
+Fine-Design_Report_Slope_Line=\uC0AC\uC120
 BindColumn-Bottom_N=\uB4A4N\uAC1C
 BindColumn-Custom_Data_Appearance=\uC0AC\uC6A9\uC790\uC815\uC758\uBCF4\uC774\uAE30
 BindColumn-Even_Selected_(2,4,6...)=\uC9DD\uC218\uC9D1\uD569(2,4,6...)\uC120\uD0DD
@ -671,7 +671,7 @@ List-Need_Head=\uB9AC\uC2A4\uD2B8\uD5E4\uB4DC\uAC00\uD544\uC694\uD569\uB2C8\uB2E
 Load=Loading
 Fine-Design_Basic_Loading=Loading
 Location=\uC704\uCE58
-Fine-Design_Template_Status_Locked={}\uC7A0\uAE40{}
+Fine-Design_Basic_Template_Status_Locked={}\uC7A0\uAE40{}
 Log=\uB85C\uADF8
 Logout=\uB098\uAC00\uAE30
 Low=\uB0AE\uC74C
@ -807,7 +807,7 @@ Opened=\uC5F4\uB824\uC788\uC2B5\uB2C8\uB2E4.
 Options=\uC635\uC158
 Or=\uB610\uB294
 Or-you=\uB610\uB294\uB2F9\uC2E0\uC774
-Fine-Design_Show_All_Oracle_Tables=\uBAA8\uB4E0\uD45C
+Fine-Design_Basic_Show_All_Oracle_Tables=\uBAA8\uB4E0\uD45C
 Fine-Design_Basic_Editor_Preference=Editor Preference
 Orange=\uC8FC\uD669
 Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
@ -933,7 +933,7 @@ RESTART=\uC7AC\uBD80\uD305
 RP_Authority_Edit=\uAD8C\uD55C\uD3B8\uC9D1
 RWA-Add_Field=\uD544\uB4DC\uCD94\uAC00
 RWA-Batch_Modify_Cells=\uB300\uB7C9\uC218\uC815\uC140
-Fine-Design_Submit_Type_Build_In_Sql=\uB0B4\uC7A5SQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=\uB0B4\uC7A5SQL
 RWA-Click_Cell_To_Edit_Value=\uD15C\uD50C\uB9BF\uC140\uC218\uC815\uAC12\uD074\uB9AD
 RWA-Column_Offset=\uC5F4\uC635\uC14B
 RWA-Help=\uBBF8\uC218\uC815, \uBBF8\uC5C5\uB370\uC774\uD2B8\uB85C\uC124\uC815\uD55C\uD6C4\uBBF8\uB9AC\uBCF4\uAE30\uBB38\uC11C\uB97C\uC791\uC131\uD558\uC5EC\uB808\uCF54\uB4DC\uB41C\uC140\uC5D0\uD3B8\uC9D1\uC218\uC815\uC0AC\uD56D\uC774\uC5C6\uC744\uACBD\uC6B0\uC774\uB808\uCF54\uB4DC\uB294\uD589\uC5C5\uB370\uC774\uD2B8\uB97C\uC9C4\uD589\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.\n\uB300\uC6A9\uB7C9\uB370\uC774\uD130\uB808\uCF54\uB4DC\uCC3E\uC544\uBCF4\uAE30\uBC0F\uAE30\uC785\uC0C1\uD669\uC5D0\uC11C\uD574\uB2F9\uC124\uC815\uC744\uD558\uBA74\uAE30\uC785\uC81C\uCD9C\uC131\uB2A5\uC744\uB192\uC77C\uC218\uC788\uC2B5\uB2C8\uB2E4.
@ -955,7 +955,7 @@ Recursion=\uADC0\uB0A9
 Red=\uBE68\uAC15
 Refresh=\uC0C8\uB85C\uACE0\uCE68
 Refresh_Database=\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC0C8\uB85C\uACE0\uCE68
-Fine-Design_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
 Registration-User_Name=\uC0AC\uC6A9\uC790\uC774\uB984
 Related=\uC5F0\uB3D9
 RelatedChart=\uCC28\uD2B8\uC5F0\uB3D9
@ -1036,7 +1036,7 @@ Second_Axis=\uBCF4\uC870\uC88C\uD45C\uCD95
 Select=\uC120\uD0DD
 Select_A_Tree_DataSource_To_Build=\uD2B8\uB9AC\uB370\uC774\uD130\uC138\uD2B8\uB97C\uC120\uD0DD\uD558\uC5EC\uC0DD\uC131\uD558\uC2ED\uC2DC\uC624.
 Select_DataColumn=\uB370\uC774\uD130\uC5F4\uC120\uD0DD
-Fine-Design_Tabledata_Select=\uB370\uC774\uD130\uC138\uD2B8\uC120\uD0DD
+Fine-Design_Chart_Tabledata_Select=\uB370\uC774\uD130\uC138\uD2B8\uC120\uD0DD
 Select_Specified_Grouping=\uC0AC\uC6A9\uC790\uC815\uC758\uADF8\uB8F9\uC120\uD0DD
 Select_The_Source_To_Save=\uC800\uC7A5\uD558\uB824\uB294\uD56D\uBAA9\uC120\uD0DD
 Select_sort_order=\uC815\uB82C\uC21C\uC11C\uC120\uD0DD
@ -1054,7 +1054,7 @@ Server-Embedded_Server=\uB0B4\uC7A5\uB41C\uC11C\uBC84
 Server-Open_Service_Manager=\uC11C\uBE44\uC2A4\uAD00\uB9AC\uC790\uC5F4\uAE30
 Server-Start=\uC2E4\uD589
 Server-Stop=\uC815\uC9C0
-Fine-Design_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_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
 Server-version-tip=\uD604\uC7AC\uC5F0\uACB0\uB41C\uC11C\uBC84\uBC84\uC804\uC774\uB2F9\uC2E0\uC774\uC0AC\uC6A9\uD558\uACE0\uC788\uB294\uC124\uACC4\uAE30\uBC84\uC804\uBC88\uD638\uBCF4\uB2E4\uB0AE\uC2B5\uB2C8\uB2E4.\uACC4\uC18D\uC5F0\uACB0\uD558\uBA74\uD3B8\uC9D1\uD558\uACE0\uC788\uB294\uC77C\uBD80\uC18D\uC131\uC774\uC800\uC7A5\uB418\uC9C0\uC54A\uC744\uC218\uC788\uC2B5\uB2C8\uB2E4.   \uC5F0\uACB0\uD574\uC57C\uD560\uACBD\uC6B0\uC124\uACC4\uAE30\uBC84\uC804\uACFC\uC11C\uBC84\uBC84\uC804\uC744\uC77C\uCE58\uC2DC\uCF1C\uC8FC\uC2ED\uC2DC\uC624.
 Server-version-tip-moreInfo=\uBC84\uC804\uBD88\uC77C\uCE58\uB85C\uC778\uD55C\uBB38\uC81C\uAC00\uBC1C\uC0DD\uD558\uC9C0\uC54A\uB3C4\uB85D\uC0AC\uC6A9\uD558\uACE0\uC788\uB294 FineReport\uC81C\uD488\uC758\uC124\uACC4\uAE30\uBC84\uC804\uBC0F\uC124\uCE58\uB41C\uC11C\uBC84\uBC84\uC804\uC774\uC77C\uCE58\uD558\uB294\uC9C0\uD655\uC778\uD574\uC8FC\uC2ED\uC2DC\uC624.\ N\uB354\uB192\uC740\uC124\uACC4\uAE30\uBC84\uC804\uC73C\uB85C\uC791\uC131\uB41C\uD15C\uD50C\uB9BF\uC744\uC5F4\uACBD\uC6B0\uC5F4\uAE30\uC624\uB958\uB85C\uC778\uD574\uAE30\uC874\uD15C\uD50C\uB9BF\uC18D\uC131\uC744\uC783\uC744\uC218\uC788\uC2B5\uB2C8\uB2E4. \uC791\uC131\uD55C\uD15C\uD50C\uB9BF\uC5D0\uC11C\uC0AC\uC6A9\uD558\uACE0\uC788\uB294\uC124\uACC4\uAE30\uBC84\uC804\uC774\uB2F9\uC2E0\uC758\uCD5C\uC885\uC124\uCE58\uC11C\uBC84\uBC84\uC804\uBCF4\uB2E4\uB192\uC744\uACBD\uC6B0\uC11C\uBC84\uB294\uB2F9\uC2E0\uC774\uC791\uC131\uD55C\uD15C\uD50C\uB9BF\uC744\uB85C\uB529\uD558\uC9C0\uBABB\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.
 ServerM-Predefined_Styles=\uC0AC\uC804\uC815\uC758\uB41C\uC591\uC2DD
@ -1344,7 +1344,7 @@ Yes=\uC608
 add=\uCD94\uAC00
 alert_word=\uBE44\uACE0\uC815\uD589\uB192\uC774\uB0B4\uBCF4\uB0B4\uAE30\uB97C\uC120\uD0DD\uD558\uBA74\uD3B8\uC9D1\uB0B4\uBCF4\uB0B4\uAE30\uC758 word, \uC140\uD589\uB192\uC774\uAC00\uB0B4\uC6A9\uC5D0\uB530\uB77C\uC790\uB3D9\uC73C\uB85C\uB298\uC5B4\uB098\uBA70,\uC774\uC0C1\uD669\uC5D0\uC11C\uB0B4\uBCF4\uB0B4\uAE30\uACB0\uACFC\uD398\uC774\uC9C0\uB098\uB204\uAE30\uC704\uCE58\uB294\uBBF8\uB9AC\uBCF4\uAE30\uACB0\uACFC\uC640\uC77C\uCE58\uD558\uC9C0\uC54A\uC744\uC218\uC788\uC2B5\uB2C8\uB2E4.
 alraedy_close=\uB2EB\uD614\uC2B5\uB2C8\uB2E4.
-Fine-Design_Template_Already_Saved=Template Already Saved {}.
+Fine-Design_Basic_Template_Already_Saved=Template Already Saved {}.
 already_exists=\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4.
 can_not_include_underline="_"\uB294\uD3EC\uD568\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
 check_communication=\uB124\uD2B8\uC6CC\uD06C\uD1B5\uC2E0\uC774\uC815\uC0C1\uC778\uC9C0\uB610\uB294\uC11C\uBC84\uAC00\uC815\uC0C1\uC801\uC73C\uB85C\uC2E4\uD589\uB418\uACE0\uC788\uB294\uC9C0\uD655\uC778\uD574\uC8FC\uC2ED\uC2DC\uC624.
@ -1367,7 +1367,7 @@ open-new-form-tip=\uD604\uC7AC\uD15C\uD50C\uB9BF\uC740711\uC774\uD558\uBC84\uC80
 paper=\uC885\uC774
 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_Workspace_Default=Default workspace
+Fine-Design_Basic_Workspace_Default=Default workspace
 Fine-Design_Basic_Extend_Class=Extend class:{}.
 period=.
 product_feedback=\uC81C\uD488\uD53C\uB4DC\uBC31
@ -1436,7 +1436,7 @@ FR-Base_Value=\uAC12
 FR-Base_Yes=\uC608
 FR-Base_sure_remove_item=\uC815\uB9D0\uB85C\uC120\uD0DD\uD55C\uD56D\uBAA9\uC744\uC0AD\uC81C\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 FR-ConditionB_Operator=\uC870\uC791\uBD80\uD638
-Fine-Design_Template_Custom_Style_Missed=\uC0AC\uC6A9\uC790\uC815\uC758\uC591\uC2DD\uC774\uC5C6\uC2B5\uB2C8\uB2E4.
+Fine-Design_Report_Template_Custom_Style_Missed=\uC0AC\uC6A9\uC790\uC815\uC758\uC591\uC2DD\uC774\uC5C6\uC2B5\uB2C8\uB2E4.
 FR-Designer-All_MSBold=\uB9C8\uC774\uD06C\uB85C\uC18C\uD504\uD2B8 Yahei
 FR-Designer-AlphaFine_NO_Result=
 FR-Designer-AlphaFine_SetShortcuts=
@ -2095,7 +2095,7 @@ FR-Designer_Move_Up=
 FR-Designer_Name=\uC774\uB984
 FR-Designer_New_Value=\uC0C8\uB85C\uC6B4\uAC12
 Fine-Design_Report_No=\uC544\uB2C8\uC624
-Fine-Design_Template_Permission_Denied=Permission_Denied
+Fine-Design_Basic_Template_Permission_Denied=Permission_Denied
 FR-Designer_NoResult=
 FR-Designer_No_Auto_Adjust=
 FR-Designer_No_Settings_Available=
@ -2292,7 +2292,7 @@ FR-Designer_Subscript=\uBC11\uC904
 FR-Designer_Superscript=\uC717\uC904
 FR-Designer_Support_Email=
 FR-Designer_Support_QQ=\uAE30\uC220QQ
-Fine-Design_Support_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB85C\uD3B8\uC9D1\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.
+Fine-Design_Report_Support_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB85C\uD3B8\uC9D1\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.
 FR-Designer_Swatch=\uC0D8\uD50C
 FR-Designer_System_default=\uC2DC\uC2A4\uD15C\uC774\uAE30\uBCF8\uC744
 FR-Designer_Sytle-FRFont=\uAE00\uAF34
@ -2424,7 +2424,7 @@ FR-Designer_XMLA_Password=\uC554\uD638
 FR-Designer_XMLA_UserName=\uC0AC\uC6A9\uC790\uC774\uB984
 FR-Designer_X_Coordinate=\uAC00\uB85C\uC88C\uD45C
 FR-Designer_Y_Coordinate=\uC138\uB85C\uC88C\uD45C
-Fine-Design_Yes=\uC608
+Fine-Design_Report_Yes=\uC608
 FR-Designer_Zoom_In_Logic=
 FR-Designer_Zoom_Out_Logic=
 FR-Designer_bold=\uAD75\uAC8C
@ -2640,100 +2640,100 @@ Fine-Plugin_Shop_Need_Install_Version=
 Fine-Design_Basic_Log_Level_Info=Info
 Fine-Design_Basic_Log_Level_Warn=Warn
 Fine-Design_Basic_Log_Level_Error=Error
-Fine-Design_Switch_Workspace_Failed=Switch Workspace Failed
+Fine-Design_Basic_Switch_Workspace_Failed=Switch Workspace Failed
-Fine-Design_Write_Smart_Submit=Smart submit
+Fine-Design_Basic_Write_Smart_Submit=Smart submit
-Fine-Design_Write_Delete_Submit=Delete submit
+Fine-Design_Basic_Write_Delete_Submit=Delete submit
-Fine-Design_Write_Update_Submit=Update submit
+Fine-Design_Basic_Write_Update_Submit=Update submit
-Fine-Design_Write_Choose_Submit_Type=Choose submit type
+Fine-Design_Report_Write_Choose_Submit_Type=Choose submit type
-Fine-Design_Write_Submit_Type=Submit type
+Fine-Design_Report_Write_Submit_Type=Submit type
-Fine-Design_Write_Submit_Event=Submit event
+Fine-Design_Basic_Write_Submit_Event=Submit event
-Fine-Design_Write_Custom_Event=Custom event
+Fine-Design_Basic_Write_Custom_Event=Custom event
-Fine-Design_Style_Font_Size=Font size
+Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size: {} px
-Fine-Design_Style_Background_Gradient_Area=Gradient Area
+Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
-Fine-Design_Style_Background_Gradient_Repeat_Show=Repeat Show
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
-Fine-Design_Style_Background_Choose_Gradient_Color=Choose Color
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
-Fine-Design_Style_Background_Gradient_Current_Area=Current Area
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
-Fine-Design_Style_Background_Gradient_Custom_Area=Custom Area
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
-Fine-Design_Style_Add_Icon=Add icon
+Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_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_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_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_Tabledata_Type_File=File
+Fine-Design_Basic_Tabledata_Type_File=File
-Fine-Design_Tabledata_Select_To_Merge=Select TD to merge
+Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
-Fine-Design_Tabledata_Default_Parameter=TD default parameter
+Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
-Fine-Design_Tabledata_Type_Tree=Tree
+Fine-Design_Basic_Tabledata_Type_Tree=Tree
-Fine-Design_Tabledata_Type_Database_Query=Database Query
+Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=Class
-Fine-Design_Tabledata_Type_Embedded=Embedded
+Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
-Fine-Design_Tabledata_Type_Relation=Relation
+Fine-Design_Basic_Tabledata_Type_Relation=Relation
-Fine-Design_Tabledata_Type_Stored_Procedure=Stored Procedure
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_TableData_Select_One=Select one TD
+Fine-Design_Basic_TableData_Select_One=Select one TD
-Fine-Design_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
+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_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_Template_Select=Select Template
+Fine-Design_Basic_Template_Select=Select Template
 Fine-Design_Basic_Parameter_UI_Display=Display parameter UI
-Fine-Design_Template_Parameter=Template parameter
+Fine-Design_Basic_Template_Parameter=Template parameter
-Fine-Design_Submit_Type_Custom=Custom submit
+Fine-Design_Report_Submit_Type_Custom=Custom submit
 Fine-Design_Basic_Parameter_Duplicate_Name=Duplicate name
-Fine-Design_Report_Engine_Attribute=Report engine attribute
+Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Basic_Authority_Edit_Status=Authority edit status
 Fine-Design_Report_Decimal_Digits=Decimal digits
-Fine-Design_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date
-Fine-Design_Widget_Type_Checkbox_Group=Checkbox Group
+Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
-Fine-Design_Widget_Type_Radio_Group=Radio Group
+Fine-Design_Basic_Widget_Type_Radio_Group=Radio Group
-Fine-Design_Widget_Type_Number=Number
+Fine-Design_Basic_Widget_Type_Number=Number
-Fine-Design_Widget_Type_Label=Label
+Fine-Design_Basic_Widget_Type_Label=Label
-Fine-Design_Widget_Type_Button=Button
+Fine-Design_Basic_Widget_Type_Button=Button
-Fine-Design_Widget_Type_File=File
+Fine-Design_Basic_Widget_Type_File=File
-Fine-Design_Widget_Type_Combo_Box=Combobox
+Fine-Design_Basic_Widget_Type_Combo_Box=Combobox
-Fine-Design_Widget_Type_Combo_Checkbox=Combo Checkbox
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=Combo Checkbox
-Fine-Design_Widget_Type_Checkbox=Checkbox
+Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
-Fine-Design_Widget_Type_List=List
+Fine-Design_Basic_Widget_Type_List=List
-Fine-Design_Widget_Type_Textarea=Textarea
+Fine-Design_Basic_Widget_Type_Textarea=Textarea
-Fine-Design_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password
-Fine-Design_Widget_Type_Text=Text
+Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_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_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_DS_Column=DS Column
-Fine-Design_Tabledata_Embedded_Table_Design=Table Design
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
-Fine-Design_Tabledata_Embedded_Column_Setting=Columns Setting
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
 Fine-Design_Basic_Database_Select_Table=Select Database Table
-Fine-Design_Tabledata_Source_Type_Template=Template Tabledata
+Fine-Design_Basic_Tabledata_Source_Type_Template=Template Tabledata
 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_Template_Closed_Warn_Text=Template {} already closed.
+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
 Fine-Design_Report_Column_Warn_Text=Report Column Area Format Error
-Fine-Design_Template_File_Name_Duplicate=Template {} already exist
+Fine-Design_Basic_Template_File_Name_Duplicate=Template {} already exist
 Fine-Design_Basic_Button_Type_Parameter_Submit=Parameter Submit
-Fine-Design_Style_Indent_Right=Indent Right(PT)
+Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
-Fine-Design_Style_Indent_Left=Indent Left(PT)
+Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
 Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
-Fine-Design_Title_Style=Title Style
+Fine-Design_Form_Title_Style=Title Style
 Fine-Design_Form_Button_Name=Button Name
 Fine-Design_Basic_Button_Style=Button Style
-Fine-Design_Widget_Value=Widget Value
+Fine-Design_Form_Widget_Value=Widget Value
-Fine-Design_Widget_Choose_Type_All=Provide Choose All
+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=Widget Setting
 Fine-Design_Form_Hyperlink_Undefined=Undefined Hyperlink
 Fine-Design_Form_Hyperlink_Group_Count=Total has {} groups hyperlink
-Fine-Design_Widget_Alias_Name=Widget Alias Name
+Fine-Design_Form_Widget_Alias_Name=Widget Alias Name
-Fine-Design_Widget_Button_Setting=Button Setting
+Fine-Design_Form_Widget_Button_Setting=Button Setting
-Fine-Design_Widget_Icon=Widget Icon
+Fine-Design_Form_Widget_Icon=Widget Icon
-Fine-Design_Widget_Page_Navi_Text=Current/Total
+Fine-Design_Form_Widget_Page_Navi_Text=Current/Total
 Fine-Design_Report_Export_Excel_Simple=Excel(Simple)
-Fine-Design_Toolbar_Custom_Button=Custom Button
+Fine-Design_Form_Toolbar_Custom_Button=Custom Button
 Fine-Design_Form_Authority_Edit=Form Authority Edit
 Fine-Design_Form_Layout_2x2=2x2Layout Container
 Fine-Design_Form_Layout_2x3=2x3Layout Container
@ -2756,7 +2756,7 @@ Fine-Design_Chart_Category_Name=Category Name
 Fine-Design_Chart_Second_Value_Axis=Second Value Axis
 Fine-Design_Chart_Value_Define=Value Define
 Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh
-Fine-Design_Tabledata=Tabledata
+Fine-Design_Chart_Tabledata=Tabledata
 Fine-Design_Chart_Enable_Field_Name=Enable Field Name
 Fine-Design_Chart_Enable_Field_Value=Enable Field Value
 Fine-Design_Chart_Legend_Name=Legend(Series) Name
@ -2788,9 +2788,9 @@ Fine-Design_Chart_Map_Data=Map Data
 Fine-Design_Chart_Area_Value=Area Value
 Fine-Design_Chart_Area_Name=Area Name
 Fine-Design_Chart_Single_Layer_Map=Single Layer Map
-Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
+Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
-Fine-Design_Template_Global_Style_Missed=Global style {} missed
+Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
-Fine-Design_Write_Select_Cell_Count=Selected {} cells
+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_Format=Format
 Fine-Design_Basic_Illegal_Name_Tips=Please rename
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
@ -100,17 +100,17 @@ BackgroundTexture-Walnut=\u80E1\u6843
 BackgroundTexture-WaterDroplets=\u6C34\u6EF4
 BackgroundTexture-WhiteMarble=\u767D\u8272\u5927\u7406\u77F3
 BackgroundTexture-WovenMat=\u7F16\u7EC7\u7269
-Fine-Design_Style_Background_Setting=\u80CC\u666F\u8BBE\u7F6E
+Fine-Design_Basic_Style_Background_Setting=\u80CC\u666F\u8BBE\u7F6E
 BaiduMap=\u767E\u5EA6\u5730\u56FE
 BarCodeD-Drawing_Text=\u663E\u793A\u6761\u5F62\u7801\u7684\u6587\u672C
 BarInside=\u67F1\u5B50\u5185\u4FA7
 BarOutSide=\u67F1\u5B50\u5916\u4FA7
 BarStyle=\u6761\u5F62
 Basic=\u57FA\u672C
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=\u4ECE\u5DE6\u4E0B\u5230\u53F3\u4E0A\u53D1\u6563
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\u4ECE\u5DE6\u4E0B\u5230\u53F3\u4E0A\u53D1\u6563
-Fine-Design_Slope_Line_Upper_Left_To_Lower_Right=\u4ECE\u5DE6\u4E0A\u5230\u53F3\u4E0B\u53D1\u6563
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\u4ECE\u5DE6\u4E0A\u5230\u53F3\u4E0B\u53D1\u6563
-Fine-Design_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_Slope_Line=\u659C\u7EBF
+Fine-Design_Report_Slope_Line=\u659C\u7EBF
 BindColumn-Bottom_N=\u540EN\u4E2A
 BindColumn-Custom_Data_Appearance=\u81EA\u5B9A\u4E49\u663E\u793A
 BindColumn-Even_Selected_(2,4,6...)=\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...)
@ -671,7 +671,7 @@ List-Need_Head=\u9700\u8981\u5217\u8868\u5934
 Load=\u52A0\u8F7D
 Fine-Design_Basic_Loading=\u6B63\u5728\u52A0\u8F7D
 Location=\u4F4D\u7F6E
-Fine-Design_Template_Status_Locked={}\u5DF2\u9501\u5B9A{}
+Fine-Design_Basic_Template_Status_Locked={}\u5DF2\u9501\u5B9A{}
 Log=\u65E5\u5FD7
 Logout=\u9000\u51FA
 Low=\u4F4E
@ -807,7 +807,7 @@ Opened=\u5DF2\u5F00\u542F
 Options=\u9009\u9879
 Or=\u6216
 Or-you=\u6216\u8005\u60A8
-Fine-Design_Show_All_Oracle_Tables=\u663E\u793AOracle\u6240\u6709\u8868
+Fine-Design_Basic_Show_All_Oracle_Tables=\u663E\u793AOracle\u6240\u6709\u8868
 Fine-Design_Basic_Editor_Preference=\u7F16\u8F91\u5668\u8BBE\u7F6E
 Orange=\u6A58\u9EC4
 Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
@ -881,7 +881,7 @@ Please_Drag_ParaPane=
 Please_Input_The_Key=\u8BF7\u8F93\u5165\u5BF9\u5E94\u5730\u56FE\u4F7F\u7528\u7684key
 Please_Rename=\u8BF7\u91CD\u547D\u540D
 Please_Select=\u8BF7\u9009\u62E9
-Fine-Design_TableData_Select_One=\u8BF7\u9009\u62E9\u4E00\u4E2A\u6570\u636E\u96C6
+Fine-Design_Basic_TableData_Select_One=\u8BF7\u9009\u62E9\u4E00\u4E2A\u6570\u636E\u96C6
 Please_Set_Repeat_First=\u8BF7\u5148\u8BBE\u7F6E\u91CD\u590D\u6807\u9898\u884C\u548C\u5217
 Pointer-A-Tick-Order=\u6307\u9488\u503C\u53CA\u523B\u5EA6\u503C\u6570\u91CF\u7EA7
 Poly=\u805A\u5408\u62A5\u8868
@ -934,7 +934,7 @@ RESTART=\u91CD\u542F
 RP_Authority_Edit=\u6743\u9650\u7F16\u8F91
 RWA-Add_Field=\u6DFB\u52A0\u5B57\u6BB5
 RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5355\u5143\u683C
-Fine-Design_Submit_Type_Build_In_Sql=\u5185\u7F6ESQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=\u5185\u7F6ESQL
 RWA-Click_Cell_To_Edit_Value=\u5355\u51FB\u6A21\u677F\u5355\u5143\u683C\u4FEE\u6539\u503C
 RWA-Column_Offset=\u5217\u504F\u79FB
 RWA-Help=\u8BBE\u7F6E\u672A\u4FEE\u6539\u4E0D\u66F4\u65B0\u540E\uFF0C\u586B\u62A5\u9884\u89C8\u62A5\u8868\uFF0C\u8BB0\u5F55\u6240\u5728\u5355\u5143\u683C\u6CA1\u6709\u88AB\u7F16\u8F91\u4FEE\u6539\uFF0C\u5219\u6B64\u8BB0\u5F55\u4E0D\u4F1A\u8FDB\u884C\u66F4\u65B0\uFF1B\n\u5728\u5927\u6570\u636E\u91CF\u8BB0\u5F55\u67E5\u8BE2\u5E76\u56DE\u586B\u60C5\u51B5\u4E0B\uFF0C\u542F\u7528\u8BE5\u8BBE\u7F6E\uFF0C\u53EF\u4EE5\u63D0\u9AD8\u586B\u62A5\u63D0\u4EA4\u6027\u80FD\u3002
@ -956,7 +956,7 @@ Recursion=\u9012\u5F52
 Red=\u7EA2\u8272
 Refresh=\u5237\u65B0
 Refresh_Database=\u5237\u65B0\u6570\u636E\u5E93
-Fine-Design_Template_File_Tree_Refresh_Successfully=\u6A21\u677F\u6587\u4EF6\u6811\u5237\u65B0\u6210\u529F
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=\u6A21\u677F\u6587\u4EF6\u6811\u5237\u65B0\u6210\u529F
 Registration-User_Name=\u7528\u6237\u540D
 Related=\u8054\u52A8
 RelatedChart=\u56FE\u8868\u8054\u52A8
@ -1037,7 +1037,7 @@ Second_Axis=\u6B21\u5750\u6807\u8F74
 Select=\u9009\u62E9
 Select_A_Tree_DataSource_To_Build=\u9009\u62E9\u4E00\u4E2A\u6811\u6570\u636E\u96C6\u6765\u6784\u5EFA
 Select_DataColumn=\u9009\u62E9\u6570\u636E\u5217
-Fine-Design_Tabledata_Select=\u9009\u62E9\u6570\u636E\u96C6
+Fine-Design_Chart_Tabledata_Select=\u9009\u62E9\u6570\u636E\u96C6
 Select_Specified_Grouping=\u9009\u62E9\u81EA\u5B9A\u4E49\u5206\u7EC4
 Select_The_Source_To_Save=\u9009\u62E9\u8981\u5B58\u50A8\u7684\u9879\u76EE
 Select_sort_order=\u9009\u62E9\u6392\u5217\u987A\u5E8F
@ -1055,7 +1055,7 @@ Server-Embedded_Server=\u5167\u7F6E\u7684\u670D\u52A1\u5668
 Server-Open_Service_Manager=\u6253\u5F00\u670D\u52A1\u7BA1\u7406\u5668
 Server-Start=\u542F\u52A8
 Server-Stop=\u505C\u6B62
-Fine-Design_Template_Version_Not_Match=\u60A8\u5F53\u524D\u6253\u5F00\u7684\u6A21\u677F\u6587\u4EF6\u662F\u7531\u66F4\u9AD8\u7248\u672C\u7684\u8BBE\u8BA1\u5668\u5236\u4F5C\u7684\uFF0C\u6253\u5F00\u4F1A\u6709\u51FA\u9519\u6216\u8005\u4E22\u5931\u539F\u6709\u6A21\u677F\u5C5E\u6027\u7684\u98CE\u9669\u3002\u5047\u5982\u9700\u8981\u6253\u5F00\u6B64\u6A21\u677F\u8BF7\u60A8\u5C06\u60A8\u7684\u8BBE\u8BA1\u5668\u5347\u7EA7\u81F3{}\u3002
+Fine-Design_Report_Template_Version_Not_Match=\u60A8\u5F53\u524D\u6253\u5F00\u7684\u6A21\u677F\u6587\u4EF6\u662F\u7531\u66F4\u9AD8\u7248\u672C\u7684\u8BBE\u8BA1\u5668\u5236\u4F5C\u7684\uFF0C\u6253\u5F00\u4F1A\u6709\u51FA\u9519\u6216\u8005\u4E22\u5931\u539F\u6709\u6A21\u677F\u5C5E\u6027\u7684\u98CE\u9669\u3002\u5047\u5982\u9700\u8981\u6253\u5F00\u6B64\u6A21\u677F\u8BF7\u60A8\u5C06\u60A8\u7684\u8BBE\u8BA1\u5668\u5347\u7EA7\u81F3{}\u3002
 Server-version-tip=\u60A8\u5F53\u524D\u8FDE\u63A5\u7684\u670D\u52A1\u5668\u7248\u672C\u4F4E\u4E8E\u60A8\u4F7F\u7528\u7684\u8BBE\u8BA1\u5668\u7248\u672C\u53F7\uFF0C\u7EE7\u7EED\u8FDE\u63A5\uFF0C\u60A8\u7F16\u8F91\u7684\u4E00\u4E9B\u5C5E\u6027\u53EF\u80FD\u65E0\u6CD5\u6709\u6548\u4FDD\u5B58\u3002  \u5047\u5982\u9700\u8981\u8FDE\u63A5\u8BF7\u5C06\u60A8\u7684\u8BBE\u8BA1\u5668\u7248\u672C\u4E0E\u670D\u52A1\u5668\u7248\u672C\u4FDD\u6301\u4E00\u81F4
 Server-version-tip-moreInfo=\u5EFA\u8BAE\u60A8\u6240\u5C5E\u56E2\u961F\u4F7F\u7528\u7684\u6211\u65B9FineReport\u4EA7\u54C1\u7684\u8BBE\u8BA1\u5668\u7248\u672C\u53F7\u4EE5\u53CA\u90E8\u7F72\u7684\u670D\u52A1\u5668\u7248\u672C\u53F7\u4FDD\u6301\u4E00\u81F4\uFF0C\u4EE5\u907F\u514D\u7248\u672C\u4E0D\u4E00\u81F4\u9020\u6210\u7684\u95EE\u9898\u98CE\u9669\u3002\n\u5047\u5982\u60A8\u6253\u5F00\u66F4\u9AD8\u8BBE\u8BA1\u5668\u7248\u672C\u5236\u4F5C\u7684\u6A21\u677F\uFF0C\u53EF\u80FD\u6253\u5F00\u51FA\u9519\uFF0C\u4E5F\u53EF\u80FD\u4E22\u5931\u539F\u6709\u6A21\u677F\u5C5E\u6027\u3002\u5047\u5982\u60A8\u5236\u4F5C\u7684\u6A21\u677F\u4F7F\u7528\u7684\u8BBE\u8BA1\u5668\u7248\u672C\u9AD8\u4E8E\u60A8\u6700\u7EC8\u90E8\u7F72\u6240\u7528\u7684\u670D\u52A1\u5668\u7248\u672C\uFF0C\u670D\u52A1\u5668\u53EF\u80FD\u65E0\u6CD5\u6B63\u5E38\u8F7D\u5165\u60A8\u5236\u4F5C\u7684\u6A21\u677F\u3002
 ServerM-Predefined_Styles=\u9884\u5B9A\u4E49\u6837\u5F0F
@ -1345,7 +1345,7 @@ Yes=\u662F
 add=\u6DFB\u52A0
 alert_word=\u9009\u62E9\u4E0D\u56FA\u5B9A\u884C\u9AD8\u5BFC\u51FA\u65F6, \u7F16\u8F91\u5BFC\u51FA\u7684word, \u5355\u5143\u683C\u884C\u9AD8\u4F1A\u968F\u7740\u5185\u5BB9\u81EA\u52A8\u62C9\u4F38, \u6B64\u60C5\u51B5\u4E0B\u5BFC\u51FA\u7ED3\u679C\u5206\u9875\u4F4D\u7F6E\u4E0E\u9884\u89C8\u7ED3\u679C\u53EF\u80FD\u4F1A\u4E0D\u518D\u4E00\u81F4.
 alraedy_close=\u5DF2\u7ECF\u5173\u95ED
-Fine-Design_Template_Already_Saved=\u6A21\u677F\u5DF2\u7ECF\u4FDD\u5B58{}.
+Fine-Design_Basic_Template_Already_Saved=\u6A21\u677F\u5DF2\u7ECF\u4FDD\u5B58{}.
 already_exists=\u5DF2\u7ECF\u5B58\u5728
 can_not_include_underline=\u4E0D\u80FD\u5305\u542B"_"
 check_communication=\u8BF7\u68C0\u67E5\u7F51\u7EDC\u901A\u8BAF\u662F\u5426\u6B63\u5E38\u53CA\u670D\u52A1\u5668\u662F\u5426\u6B63\u5E38\u8FD0\u884C
@ -1368,7 +1368,7 @@ open-new-form-tip=\u5F53\u524D\u6A21\u677F\u4E3A711\u4EE5\u4E0B\u7248\u672C\u523
 paper=\u7EB8\u5F20
 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_Workspace_Default=\u9ED8\u8BA4\u5DE5\u4F5C\u76EE\u5F55
+Fine-Design_Basic_Workspace_Default=\u9ED8\u8BA4\u5DE5\u4F5C\u76EE\u5F55
 Fine-Design_Basic_Extend_Class=\u7EE7\u627F\u7C7B:{}\u3002
 period=\u3002
 product_feedback=\u4EA7\u54C1\u53CD\u9988
@ -1437,7 +1437,7 @@ FR-Base_Value=\u503C
 FR-Base_Yes=\u662F
 FR-Base_sure_remove_item=\u4F60\u786E\u5B9E\u51B3\u5B9A\u5220\u9664\u9009\u4E2D\u7684\u9879
 FR-ConditionB_Operator=\u64CD\u4F5C\u7B26
-Fine-Design_Template_Custom_Style_Missed=\u81EA\u5B9A\u4E49\u6837\u5F0F\u5DF2\u4E22\u5931
+Fine-Design_Report_Template_Custom_Style_Missed=\u81EA\u5B9A\u4E49\u6837\u5F0F\u5DF2\u4E22\u5931
 FR-Designer-All_MSBold=\u5FAE\u8F6F\u96C5\u9ED1
 FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C
 FR-Designer-AlphaFine_SetShortcuts=\u8BF7\u76F4\u63A5\u5728\u952E\u76D8\u4E0A\u6309\u4E24\u4E2A\u7EC4\u5408\u952E
@ -2097,7 +2097,7 @@ FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C42(F)
 FR-Designer_Name=\u540D\u5B57
 FR-Designer_New_Value=\u65B0\u503C
 Fine-Design_Report_No=\u5426
-Fine-Design_Template_Permission_Denied=\u6CA1\u6709\u6743\u9650
+Fine-Design_Basic_Template_Permission_Denied=\u6CA1\u6709\u6743\u9650
 FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A
 FR-Designer_No_Auto_Adjust=\u4E0D\u81EA\u52A8\u8C03\u6574
 FR-Designer_No_Settings_Available=\u65E0\u53EF\u7528\u914D\u7F6E\u9879\uFF01
@ -2294,7 +2294,7 @@ FR-Designer_Subscript=\u4E0B\u6807
 FR-Designer_Superscript=\u4E0A\u6807
 FR-Designer_Support_Email=\u652F\u6301\u90AE\u7BB1\uFF1A
 FR-Designer_Support_QQ=\u6280\u672FQQ
-Fine-Design_Support_String_To_Formula=\u652F\u6301\u5B57\u7B26\u4E32\u7F16\u8F91\u4E3A\u516C\u5F0F
+Fine-Design_Report_Support_String_To_Formula=\u652F\u6301\u5B57\u7B26\u4E32\u7F16\u8F91\u4E3A\u516C\u5F0F
 FR-Designer_Swatch=\u6837\u54C1
 FR-Designer_System_default=\u7CFB\u7EDF\u5C06\u9ED8\u8BA4
 FR-Designer_Sytle-FRFont=\u5B57\u4F53
@ -2426,7 +2426,7 @@ FR-Designer_XMLA_Password=\u5BC6\u7801
 FR-Designer_XMLA_UserName=\u7528\u6237\u540D
 FR-Designer_X_Coordinate=\u6A2A\u5750\u6807
 FR-Designer_Y_Coordinate=\u7EB5\u5750\u6807
-Fine-Design_Yes=\u662F
+Fine-Design_Report_Yes=\u662F
 FR-Designer_Zoom_In_Logic=\u653E\u5927\u903B\u8F91
 FR-Designer_Zoom_Out_Logic=\u7F29\u5C0F\u903B\u8F91
 FR-Designer_bold=\u52A0\u7C97
@ -2647,70 +2647,70 @@ Fine-Designer_Allow_Full_Screen=\u5141\u8BB8\u5168\u5C4F
 Fine-Design_Basic_Log_Level_Info=\u6D88\u606F
 Fine-Design_Basic_Log_Level_Warn=\u8B66\u544A
 Fine-Design_Basic_Log_Level_Error=\u9519\u8BEF
-Fine-Design_Switch_Workspace_Failed=\u5207\u6362\u5DE5\u4F5C\u76EE\u5F55\u5931\u8D25
+Fine-Design_Basic_Switch_Workspace_Failed=\u5207\u6362\u5DE5\u4F5C\u76EE\u5F55\u5931\u8D25
-Fine-Design_Write_Smart_Submit=\u667A\u80FD\u63D0\u4EA4
+Fine-Design_Basic_Write_Smart_Submit=\u667A\u80FD\u63D0\u4EA4
-Fine-Design_Write_Delete_Submit=\u5220\u9664\u63D0\u4EA4
+Fine-Design_Basic_Write_Delete_Submit=\u5220\u9664\u63D0\u4EA4
-Fine-Design_Write_Update_Submit=\u66F4\u65B0\u63D0\u4EA4
+Fine-Design_Basic_Write_Update_Submit=\u66F4\u65B0\u63D0\u4EA4
-Fine-Design_Write_Choose_Submit_Type=\u9009\u62E9\u63D0\u4EA4\u7C7B\u578B
+Fine-Design_Report_Write_Choose_Submit_Type=\u9009\u62E9\u63D0\u4EA4\u7C7B\u578B
-Fine-Design_Write_Submit_Type=\u63D0\u4EA4\u7C7B\u578B
+Fine-Design_Report_Write_Submit_Type=\u63D0\u4EA4\u7C7B\u578B
-Fine-Design_Write_Submit_Event=\u63D0\u4EA4\u4E8B\u4EF6
+Fine-Design_Basic_Write_Submit_Event=\u63D0\u4EA4\u4E8B\u4EF6
-Fine-Design_Write_Custom_Event=\u81EA\u5B9A\u4E49\u4E8B\u4EF6
+Fine-Design_Basic_Write_Custom_Event=\u81EA\u5B9A\u4E49\u4E8B\u4EF6
-Fine-Design_Style_Font_Size=\u5B57\u4F53\u5927\u5C0F
+Fine-Design_Basic_Style_Font_Size=\u5B57\u4F53\u5927\u5C0F
-Fine-Design_Style_Size_Detail=\u5927\u5C0F\uFF1A{}\u50CF\u7D20
+Fine-Design_Basic_Style_Size_Detail=\u5927\u5C0F\uFF1A{}\u50CF\u7D20
-Fine-Design_Style_Background_Gradient_Area=\u6E10\u53D8\u533A\u57DF
+Fine-Design_Basic_Style_Background_Gradient_Area=\u6E10\u53D8\u533A\u57DF
-Fine-Design_Style_Background_Gradient_Repeat_Show=\u91CD\u590D\u5C55\u793A
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=\u91CD\u590D\u5C55\u793A
-Fine-Design_Style_Background_Choose_Gradient_Color=\u9009\u62E9\u6E10\u53D8\u8272
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=\u9009\u62E9\u6E10\u53D8\u8272
-Fine-Design_Style_Background_Gradient_Current_Area=\u5F53\u524D\u9009\u62E9\u533A\u57DF
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=\u5F53\u524D\u9009\u62E9\u533A\u57DF
-Fine-Design_Style_Background_Gradient_Custom_Area=\u81EA\u5B9A\u4E49\u533A\u57DF
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=\u81EA\u5B9A\u4E49\u533A\u57DF
-Fine-Design_Style_Add_Icon=\u6DFB\u52A0\u56FE\u6807
+Fine-Design_Basic_Style_Add_Icon=\u6DFB\u52A0\u56FE\u6807
-Fine-Design_Table_Data_Empty_Name_Tips=\u6570\u636E\u96C6\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u8BBE\u7F6E\u4E00\u4E2A\u540D\u5B57\uFF01
+Fine-Design_Basic_Table_Data_Empty_Name_Tips=\u6570\u636E\u96C6\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u8BBE\u7F6E\u4E00\u4E2A\u540D\u5B57\uFF01
-Fine-Design_Table_Data_Duplicate_Name_Tips=\u540D\u5B57\u4E3A{}\u7684\u6570\u636E\u96C6\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u66F4\u6362\u4E00\u4E2A\u540D\u5B57\uFF01
+Fine-Design_Basic_Table_Data_Duplicate_Name_Tips=\u540D\u5B57\u4E3A{}\u7684\u6570\u636E\u96C6\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u66F4\u6362\u4E00\u4E2A\u540D\u5B57\uFF01
-Fine-Design_Stored_Procedure_Name_Tips=\u5B58\u50A8\u8FC7\u7A0B\u540D\u5B57\u4E0D\u80FD\u5305\u542B\u4E0B\u5212\u7EBF\uFF01
+Fine-Design_Basic_Stored_Procedure_Name_Tips=\u5B58\u50A8\u8FC7\u7A0B\u540D\u5B57\u4E0D\u80FD\u5305\u542B\u4E0B\u5212\u7EBF\uFF01
 Fine-Design_Basic_Class_Location_Description=class\u6587\u4EF6\u5FC5\u987B\u4F4D\u76EE\u5F55{}\u4E0B\u3002
-Fine-Design_Tabledata_Type_File=\u6587\u4EF6\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_File=\u6587\u4EF6\u6570\u636E\u96C6
-Fine-Design_Tabledata_Select_To_Merge=\u9009\u62E9\u8981\u5408\u5E76\u7684\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Select_To_Merge=\u9009\u62E9\u8981\u5408\u5E76\u7684\u6570\u636E\u96C6
-Fine-Design_Tabledata_Default_Parameter=\u6570\u636E\u96C6\u9ED8\u8BA4\u53C2\u6570
+Fine-Design_Basic_Tabledata_Default_Parameter=\u6570\u636E\u96C6\u9ED8\u8BA4\u53C2\u6570
-Fine-Design_Tabledata_Type_Tree=\u6811\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Tree=\u6811\u6570\u636E\u96C6
-Fine-Design_Tabledata_Type_Database_Query=\u6570\u636E\u67E5\u8BE2\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Database_Query=\u6570\u636E\u67E5\u8BE2\u6570\u636E\u96C6
-Fine-Design_Tabledata_Type_Class=\u7A0B\u5E8F\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Class=\u7A0B\u5E8F\u6570\u636E\u96C6
-Fine-Design_Tabledata_Type_Embedded=\u5185\u7F6E\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Embedded=\u5185\u7F6E\u6570\u636E\u96C6
-Fine-Design_Tabledata_Type_Relation=\u5173\u8054\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Type_Relation=\u5173\u8054\u6570\u636E\u96C6
-Fine-Design_Tabledata_Type_Stored_Procedure=\u5B58\u50A8\u8FC7\u7A0B
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=\u5B58\u50A8\u8FC7\u7A0B
-Fine-Design_Tabledata_Preview_Warn_Text=\u7B2C{}\u5217\u4E0D\u5B58\u5728\uFF0C\u603B\u8BA1{}\u5217\uFF01
+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_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_Template_Select=\u9009\u62E9\u6A21\u677F
+Fine-Design_Basic_Template_Select=\u9009\u62E9\u6A21\u677F
 Fine-Design_Basic_Parameter_UI_Display=\u5C55\u793A\u53C2\u6570\u754C\u9762
-Fine-Design_Template_Parameter=\u6A21\u677F\u53C2\u6570
+Fine-Design_Basic_Template_Parameter=\u6A21\u677F\u53C2\u6570
-Fine-Design_Submit_Type_Custom=\u81EA\u5B9A\u4E49\u63D0\u4EA4
+Fine-Design_Report_Submit_Type_Custom=\u81EA\u5B9A\u4E49\u63D0\u4EA4
 Fine-Design_Basic_Parameter_Duplicate_Name=\u91CD\u590D\u7684\u53C2\u6570\u540D\u5B57
-Fine-Design_Report_Engine_Attribute=\u62A5\u8868\u5F15\u64CE\u5C5E\u6027
+Fine-Design_Basic_Engine_Attribute=\u62A5\u8868\u5F15\u64CE\u5C5E\u6027
 Fine-Design_Basic_Authority_Edit_Status=\u8FDB\u5165\u6743\u9650\u7F16\u8F91
 Fine-Design_Basic_Authority_Edit_Status_Exit=\u9000\u51FA\u6743\u9650\u7F16\u8F91
 Fine-Design_Report_Decimal_Digits=\u5C0F\u6570\u4F4D\u6570
-Fine-Design_Widget_Type_Date=\u65E5\u671F\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Date=\u65E5\u671F\u63A7\u4EF6
-Fine-Design_Widget_Type_Checkbox_Group=\u590D\u9009\u6309\u94AE\u7EC4\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Checkbox_Group=\u590D\u9009\u6309\u94AE\u7EC4\u63A7\u4EF6
-Fine-Design_Widget_Type_Radio_Group=\u5355\u9009\u6309\u94AE\u7EC4\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Radio_Group=\u5355\u9009\u6309\u94AE\u7EC4\u63A7\u4EF6
-Fine-Design_Widget_Type_Number=\u6570\u5B57\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Number=\u6570\u5B57\u63A7\u4EF6
-Fine-Design_Widget_Type_Label=\u6807\u7B7E\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Label=\u6807\u7B7E\u63A7\u4EF6
-Fine-Design_Widget_Type_Button=\u6309\u94AE\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Button=\u6309\u94AE\u63A7\u4EF6
-Fine-Design_Widget_Type_File=\u6587\u4EF6\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_File=\u6587\u4EF6\u63A7\u4EF6
-Fine-Design_Widget_Type_Combo_Box=\u4E0B\u62C9\u6846\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Combo_Box=\u4E0B\u62C9\u6846\u63A7\u4EF6
-Fine-Design_Widget_Type_Combo_Checkbox=\u4E0B\u62C9\u590D\u9009\u6846\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=\u4E0B\u62C9\u590D\u9009\u6846\u63A7\u4EF6
-Fine-Design_Widget_Type_Checkbox=\u590D\u9009\u6309\u94AE\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Checkbox=\u590D\u9009\u6309\u94AE\u63A7\u4EF6
-Fine-Design_Widget_Type_List=\u5217\u8868\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_List=\u5217\u8868\u63A7\u4EF6
-Fine-Design_Widget_Type_Textarea=\u6587\u672C\u57DF\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Textarea=\u6587\u672C\u57DF\u63A7\u4EF6
-Fine-Design_Widget_Type_Password=\u5BC6\u7801\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Password=\u5BC6\u7801\u63A7\u4EF6
-Fine-Design_Widget_Type_Text=\u6587\u672C\u63A7\u4EF6
+Fine-Design_Basic_Widget_Type_Text=\u6587\u672C\u63A7\u4EF6
-Fine-Design_Workspace_Empty_Name_Warn_Text=\u5F53\u524D\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u8BBE\u7F6E\u4E00\u4E2A\u540D\u5B57
+Fine-Design_Basic_Workspace_Empty_Name_Warn_Text=\u5F53\u524D\u540D\u5B57\u4E3A\u7A7A\uFF0C\u8BF7\u8BBE\u7F6E\u4E00\u4E2A\u540D\u5B57
-Fine-Design_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_Template_Closed_Warn_Text=\u6A21\u677F{}\u5DF2\u7ECF\u5173\u95ED\u3002
+Fine-Design_Basic_Template_Closed_Warn_Text=\u6A21\u677F{}\u5DF2\u7ECF\u5173\u95ED\u3002
 Fine-Design_Basic_DS_Column=\u6570\u636E\u5217
-Fine-Design_Tabledata_Embedded_Table_Design=\u8868\u8BBE\u8BA1
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=\u8868\u8BBE\u8BA1
-Fine-Design_Tabledata_Embedded_Column_Setting=\u5217\u8BBE\u7F6E
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=\u5217\u8BBE\u7F6E
 Fine-Design_Basic_Database_Select_Table=\u9009\u62E9\u6570\u636E\u5E93\u8868
-Fine-Design_Tabledata_Source_Type_Template=\u6A21\u677F\u6570\u636E\u96C6
+Fine-Design_Basic_Tabledata_Source_Type_Template=\u6A21\u677F\u6570\u636E\u96C6
 Fine-Design_Basic_Connection_Pool_Max_Wait_Time=\u6700\u5927\u7B49\u5F85\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 Fine-Design_Report_Privilege_Poly_Block_Edit=\u805A\u5408\u5757\u6743\u9650\u7F16\u8F91
 Fine-Design_Basic_Parameter_Source_Type_Tabledata=\u6570\u636E\u96C6\u53C2\u6570
@ -2719,27 +2719,27 @@ Fine-Design_Report_Column_Style=\u5206\u680F\u6837\u5F0F
 Fine-Design_Report_Column_Area=\u5206\u680F\u533A\u57DF
 Fine-Design_Report_Column_Data=\u5206\u680F\u6570\u636E
 Fine-Design_Report_Column_Warn_Text=\u5206\u680F\u533A\u57DF\u683C\u5F0F\u9519\u8BEF
-Fine-Design_Template_File_Name_Duplicate=\u6A21\u677F\u540D\u5B57{}\u5DF2\u7ECF\u5B58\u5728
+Fine-Design_Basic_Template_File_Name_Duplicate=\u6A21\u677F\u540D\u5B57{}\u5DF2\u7ECF\u5B58\u5728
 Fine-Design_Basic_Button_Type_Parameter_Submit=\u53C2\u6570\u63D0\u4EA4\u6309\u94AE
-Fine-Design_Style_Indent_Right=\u53F3\u7F29\u8FDB\uFF08PT\uFF09
+Fine-Design_Basic_Style_Indent_Right=\u53F3\u7F29\u8FDB\uFF08PT\uFF09
-Fine-Design_Style_Indent_Left=\u5DE6\u7F29\u8FDB\uFF08PT\uFF09
+Fine-Design_Basic_Style_Indent_Left=\u5DE6\u7F29\u8FDB\uFF08PT\uFF09
-Fine-Design_Title_Style=\u6807\u9898\u6837\u5F0F
+Fine-Design_Form_Title_Style=\u6807\u9898\u6837\u5F0F
 Fine-Design_Form_Button_Name=\u6309\u94AE\u540D\u5B57
 Fine-Design_Basic_Button_Style=\u6309\u94AE\u6837\u5F0F
-Fine-Design_Widget_Value=\u63A7\u4EF6\u503C
+Fine-Design_Form_Widget_Value=\u63A7\u4EF6\u503C
-Fine-Design_Widget_Choose_Type_All=\u652F\u6301\u5168\u9009
+Fine-Design_Form_Widget_Choose_Type_All=\u652F\u6301\u5168\u9009
 Fine-Design_Form_Layout_Style=\u5E03\u5C40\u6837\u5F0F
 Fine-Design_Form_Query_Button=\u67E5\u8BE2\u6309\u94AE
 Fine-Design_Form_Toolbar_Setting=\u8868\u5355\u5DE5\u5177\u680F\u8BBE\u7F6E
 Fine-Design_Form_Widget_Setting=\u63A7\u4EF6\u8BBE\u7F6E
 Fine-Design_Form_Hyperlink_Undefined=\u6CA1\u6709\u5B9A\u4E49\u8D85\u7EA7\u94FE\u63A5
 Fine-Design_Form_Hyperlink_Group_Count=\u603B\u8BA1{}\u7EC4\u8D85\u7EA7\u94FE\u63A5
-Fine-Design_Widget_Alias_Name=\u63A7\u4EF6\u522B\u540D
+Fine-Design_Form_Widget_Alias_Name=\u63A7\u4EF6\u522B\u540D
-Fine-Design_Widget_Button_Setting=\u6309\u94AE\u5C5E\u6027\u8BBE\u7F6E
+Fine-Design_Form_Widget_Button_Setting=\u6309\u94AE\u5C5E\u6027\u8BBE\u7F6E
-Fine-Design_Widget_Icon=\u63A7\u4EF6\u56FE\u6807
+Fine-Design_Form_Widget_Icon=\u63A7\u4EF6\u56FE\u6807
-Fine-Design_Widget_Page_Navi_Text=\u5F53\u524D\u9875/\u603B\u9875\u6570
+Fine-Design_Form_Widget_Page_Navi_Text=\u5F53\u524D\u9875/\u603B\u9875\u6570
 Fine-Design_Report_Export_Excel_Simple=Excel(\u539F\u6837\u5BFC\u51FA)
-Fine-Design_Toolbar_Custom_Button=\u81EA\u5B9A\u4E49\u6309\u94AE
+Fine-Design_Form_Toolbar_Custom_Button=\u81EA\u5B9A\u4E49\u6309\u94AE
 Fine-Design_Form_Authority_Edit=\u51B3\u7B56\u62A5\u8868\u6743\u9650\u7F16\u8F91
 Fine-Design_Form_Layout_2x2=2\u884C2\u5217\u5E03\u5C40\u5BB9\u5668
 Fine-Design_Form_Layout_2x3=2\u884C3\u5217\u5E03\u5C40\u5BB9\u5668
@ -2762,7 +2762,7 @@ 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_Tabledata=\u6570\u636E\u96C6
+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
 Fine-Design_Chart_Legend_Name=\u56FE\u4F8B\u9879(\u7CFB\u5217)\u540D
@ -2794,9 +2794,9 @@ Fine-Design_Chart_Map_Data=\u5730\u56FE\u6570\u636E
 Fine-Design_Chart_Area_Value=\u533A\u57DF\u503C
 Fine-Design_Chart_Area_Name=\u533A\u57DF\u540D
 Fine-Design_Chart_Single_Layer_Map=\u5355\u5C42\u5730\u56FE
-Fine-Design_Template_Opening_And_Waiting=\u6B63\u5728\u6253\u5F00{}\uFF0C\u8BF7\u7B49\u5F85
+Fine-Design_Report_Template_Opening_And_Waiting=\u6B63\u5728\u6253\u5F00{}\uFF0C\u8BF7\u7B49\u5F85
-Fine-Design_Template_Global_Style_Missed=\u6A21\u677F\u6240\u4F7F\u7528\u7684\u5168\u5C40\u6837\u5F0F{}\u5DF2\u4E22\u5931
+Fine-Design_Report_Template_Global_Style_Missed=\u6A21\u677F\u6240\u4F7F\u7528\u7684\u5168\u5C40\u6837\u5F0F{}\u5DF2\u4E22\u5931
-Fine-Design_Write_Select_Cell_Count=\u5DF2\u7ECF\u9009\u62E9\u4E86{}\u4E2A\u5355\u5143\u683C
+Fine-Design_Report_Write_Select_Cell_Count=\u5DF2\u7ECF\u9009\u62E9\u4E86{}\u4E2A\u5355\u5143\u683C
 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
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
@ -100,17 +100,17 @@ BackgroundTexture-Walnut=\u8B77\u5957
 BackgroundTexture-WaterDroplets=\u6C34\u6EF4
 BackgroundTexture-WhiteMarble=\u767D\u8272\u5927\u7406\u77F3
 BackgroundTexture-WovenMat=\u7DE8\u7E54\u7269
-Fine-Design_Style_Background_Setting=\u80CC\u666F\u8A2D\u5B9A
+Fine-Design_Basic_Style_Background_Setting=\u80CC\u666F\u8A2D\u5B9A
 BaiduMap=\u767E\u5EA6\u5730\u5716
 BarCodeD-Drawing_Text=\u986F\u793A\u689D\u78BC\u7684\u6587\u672C
 BarInside=\u67F1\u5B50\u5167\u5074
 BarOutSide=\u67F1\u5B50\u5916\u5074
 BarStyle=\u689D\u5F62
 Basic=\u57FA\u672C
-Fine-Design_Slope_Line_Lower_Left_To_Upper_Right=\u7E3D\u5DE6\u4E0B\u5230\u53F3\u4E0A\u767C\u6563
+Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right=\u7E3D\u5DE6\u4E0B\u5230\u53F3\u4E0A\u767C\u6563
-Fine-Design_Slope_Line_Upper_Left_To_Lower_Right=\u5F9E\u5DE6\u4E0A\u5230\u53F3\u4E0B\u767C\u6563
+Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right=\u5F9E\u5DE6\u4E0A\u5230\u53F3\u4E0B\u767C\u6563
-Fine-Design_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_Slope_Line=\u659C\u7DDA
+Fine-Design_Report_Slope_Line=\u659C\u7DDA
 BindColumn-Bottom_N=\u5F8CN\u500B
 BindColumn-Custom_Data_Appearance=\u81EA\u5B9A\u7FA9\u986F\u793A
 BindColumn-Even_Selected_(2,4,6...)=\u9078\u64C7\u4E86\u5076\u6578\u7D1A(2,4,6...)
@ -671,7 +671,7 @@ List-Need_Head=\u9700\u8981\u6B04\u8868\u982D
 Load=\u52A0\u8F09
 Fine-Design_Basic_Loading=\u6B63\u5728\u52A0\u8F09
 Location=\u4F4D\u7F6E
-Fine-Design_Template_Status_Locked={}\u5DF2\u9396\u5B9A{}
+Fine-Design_Basic_Template_Status_Locked={}\u5DF2\u9396\u5B9A{}
 Log=\u65E5\u8A8C
 Logout=\u9000\u51FA
 Low=\u4F4E
@ -807,7 +807,7 @@ Opened=\u5DF2\u958B\u5553
 Options=\u9078\u9805
 Or=\u6216
 Or-you=\u6216\u8005\u60A8
-Fine-Design_Show_All_Oracle_Tables=\u6240\u6709\u8868
+Fine-Design_Basic_Show_All_Oracle_Tables=\u6240\u6709\u8868
 Fine-Design_Basic_Editor_Preference=Editor Preference
 Orange=\u6854\u9EC3
 Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
@ -933,7 +933,7 @@ RESTART=\u91CD\u5553
 RP_Authority_Edit=\u6B0A\u9650\u7DE8\u8F2F
 RWA-Add_Field=\u65B0\u589E\u6B04\u4F4D
 RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5132\u5B58\u683C
-Fine-Design_Submit_Type_Build_In_Sql=\u5167\u7F6ESQL
+Fine-Design_Report_Submit_Type_Build_In_Sql=\u5167\u7F6ESQL
 RWA-Click_Cell_To_Edit_Value=\u55AE\u64CA\u6A21\u677F\u5132\u5B58\u683C\u4FEE\u6539\u503C
 RWA-Column_Offset=\u6B04\u504F\u79FB
 RWA-Help=\u8A2D\u5B9A\u672A\u4FEE\u6539\u4E0D\u66F4\u65B0\u5F8C\uFF0C\u586B\u5831\u9810\u89BD\u5831\u8868\uFF0C\u8A18\u9304\u6240\u5728\u5132\u5B58\u683C\u6C92\u6709\u88AB\u7DE8\u8F2F\u4FEE\u6539\uFF0C\u5247\u6B64\u8A18\u9304\u4E0D\u6703\u9032\u884C\u66F4\u65B0\uFF1B\n\u5728\u5927\u8CC7\u6599\u91CF\u8A18\u9304\u67E5\u8A62\u4E26\u56DE\u586B\u60C5\u6CC1\u4E0B\uFF0C\u555F\u7528\u8A72\u8A2D\u5B9A\uFF0C\u53EF\u4EE5\u63D0\u9AD8\u586B\u5831\u63D0\u4EA4\u6027\u80FD\u3002
@ -955,7 +955,7 @@ Recursion=\u905E\u6B78
 Red=\u7D05\u8272
 Refresh=\u91CD\u65B0\u6574\u7406
 Refresh_Database=\u91CD\u65B0\u6574\u7406\u8CC7\u6599\u5EAB
-Fine-Design_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
+Fine-Design_Basic_Template_File_Tree_Refresh_Successfully=Template File Tree Refresh Successfully
 Registration-User_Name=\u5E33\u865F
 Related=\u806F\u52D5
 RelatedChart=\u5716\u8868\u806F\u52D5
@ -1036,7 +1036,7 @@ Second_Axis=\u6B21\u5750\u6A19\u8EF8
 Select=\u9078\u64C7
 Select_A_Tree_DataSource_To_Build=\u9078\u64C7\u4E00\u500B\u6A39\u72C0\u8CC7\u6599\u96C6\u4F86\u69CB\u5EFA
 Select_DataColumn=\u9078\u64C7\u8CC7\u6599\u6B04
-Fine-Design_Tabledata_Select=\u9078\u64C7\u8CC7\u6599\u96C6
+Fine-Design_Chart_Tabledata_Select=\u9078\u64C7\u8CC7\u6599\u96C6
 Select_Specified_Grouping=\u9078\u64C7\u81EA\u5B9A\u7FA9\u5206\u7D44
 Select_The_Source_To_Save=\u9078\u64C7\u8981\u5B58\u5132\u7684\u9805\u76EE
 Select_sort_order=\u9078\u64C7\u6392\u6B04\u9806\u5E8F
@ -1054,7 +1054,7 @@ Server-Embedded_Server=\u5167\u7F6E\u7684\u4F3A\u670D\u5668
 Server-Open_Service_Manager=\u6253\u958B\u4F3A\u670D\u5668\u7BA1\u7406\u5668
 Server-Start=\u555F\u52D5
 Server-Stop=\u505C\u6B62
-Fine-Design_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_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
 Server-version-tip=\u60A8\u7576\u524D\u9023\u63A5\u7684\u4F3A\u670D\u5668\u7248\u672C\u4F4E\u65BC\u60A8\u4F7F\u7528\u7684\u8A2D\u8A08\u5668\u7248\u672C\u865F\uFF0C\u7E7C\u7E8C\u9023\u63A5\uFF0C\u60A8\u7DE8\u8F2F\u7684\u4E00\u4E9B\u5C6C\u6027\u53EF\u80FD\u7121\u6CD5\u6709\u6548\u5132\u5B58\u3002\u5047\u5982\u9700\u8981\u9023\u63A5\u8ACB\u5C07\u60A8\u7684\u8A2D\u8A08\u5668\u7248\u672C\u8207\u4F3A\u670D\u5668\u7248\u672C\u4FDD\u6301\u4E00\u81F4
 Server-version-tip-moreInfo=\u5EFA\u8B70\u60A8\u6240\u5C6C\u5718\u968A\u4F7F\u7528\u7684\u6211\u65B9FineReport\u7522\u54C1\u7684\u8A2D\u8A08\u5668\u7248\u672C\u865F\u4EE5\u53CA\u90E8\u7F72\u7684\u4F3A\u670D\u5668\u7248\u672C\u865F\u4FDD\u6301\u4E00\u81F4\uFF0C\u4EE5\u907F\u514D\u7248\u672C\u4E0D\u4E00\u81F4\u9020\u6210\u7684\u554F\u984C\u98A8\u96AA\u3002\u5047\u5982\u60A8\u6253\u958B\u66F4\u9AD8\u8A2D\u8A08\u5668\u7248\u672C\u88FD\u4F5C\u7684\u6A21\u677F\uFF0C\u53EF\u80FD\u6253\u958B\u51FA\u932F\uFF0C\u4E5F\u53EF\u80FD\u4E1F\u5931\u539F\u6709\u6A21\u677F\u5C6C\u6027\u3002\u5047\u5982\u60A8\u88FD\u4F5C\u7684\u6A21\u677F\u4F7F\u7528\u7684\u8A2D\u8A08\u5668\u7248\u672C\u9AD8\u65BC\u60A8\u6700\u7D42\u90E8\u7F72\u6240\u7528\u7684\u4F3A\u670D\u5668\u7248\u672C\uFF0C\u4F3A\u670D\u5668\u53EF\u80FD\u7121\u6CD5\u6B63\u5E38\u8F09\u5165\u60A8\u88FD\u4F5C\u7684\u6A21\u677F
 ServerM-Predefined_Styles=\u9810\u5B9A\u7FA9\u6A23\u5F0F
@ -1344,7 +1344,7 @@ Yes=\u662F
 add=\u65B0\u589E
 alert_word=\u9078\u64C7\u4E0D\u56FA\u5B9A\u5217\u9AD8\u532F\u51FA\u6642, \u7DE8\u8F2F\u532F\u51FA\u7684word, \u5132\u5B58\u683C\u5217\u9AD8\u6703\u96A8\u8457\u5167\u5BB9\u81EA\u52D5\u62C9\u4F38, \u6B64\u60C5\u6CC1\u4E0B\u532F\u51FA\u7D50\u679C\u8207\u9810\u89BD\u7D50\u679C\u53EF\u80FD\u6703\u4E0D\u518D\u4E00\u81F4.
 alraedy_close=\u5DF2\u7D93\u95DC\u9589
-Fine-Design_Template_Already_Saved=Template Already Saved {}.
+Fine-Design_Basic_Template_Already_Saved=Template Already Saved {}.
 already_exists=\u5DF2\u7D93\u5B58\u5728
 can_not_include_underline=\u4E0D\u80FD\u5305\u542B"_"
 check_communication=\u8ACB\u6AA2\u67E5\u7DB2\u8DEF\u901A\u8A0A\u662F\u5426\u6B63\u5E38\u53CA\u4F3A\u670D\u5668\u662F\u5426\u6B63\u5E38\u904B\u884C
@ -1367,7 +1367,7 @@ open-new-form-tip=\u7576\u524D\u6A21\u677F\u70BA711\u4EE5\u4E0B\u7248\u672C\u88F
 paper=\u7D19\u5F35
 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_Workspace_Default=Default workspace
+Fine-Design_Basic_Workspace_Default=Default workspace
 Fine-Design_Basic_Extend_Class=Extend class:{}.
 period=\u3002
 product_feedback=\u554F\u984C\u53CD\u994B
@ -1436,7 +1436,7 @@ FR-Base_Value=\u503C
 FR-Base_Yes=\u662F
 FR-Base_sure_remove_item=\u4F60\u78BA\u5BE6\u6C7A\u5B9A\u522A\u9664\u9078\u4E2D\u7684\u9805
 FR-ConditionB_Operator=\u64CD\u4F5C\u7B26
-Fine-Design_Template_Custom_Style_Missed=\u81EA\u5B9A\u7FA9\u6A23\u5F0F\u5DF2\u4E1F\u5931
+Fine-Design_Report_Template_Custom_Style_Missed=\u81EA\u5B9A\u7FA9\u6A23\u5F0F\u5DF2\u4E1F\u5931
 FR-Designer-All_MSBold=\u5FAE\u8EDF\u96C5\u9ED1
 FR-Designer-AlphaFine_NO_Result=\u7121\u641C\u7D22\u7D50\u679C
 FR-Designer-AlphaFine_SetShortcuts=\u8ACB\u76F4\u63A5\u5728\u9375\u76E4\u4E0A\u6309\u5169\u500B\u7D44\u5408\u9375
@ -2096,7 +2096,7 @@ FR-Designer_Move_Up=\u4E0A\u79FB\u4E00\u5C64(F)
 FR-Designer_Name=\u540D\u5B57
 FR-Designer_New_Value=\u65B0\u503C
 Fine-Design_Report_No=\u5426
-Fine-Design_Template_Permission_Denied=Permission_Denied
+Fine-Design_Basic_Template_Permission_Denied=Permission_Denied
 FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A
 FR-Designer_No_Auto_Adjust=\u4E0D\u81EA\u52D5\u8ABF\u6574
 FR-Designer_No_Settings_Available=\u7121\u53EF\u7528\u914D\u5BD8\u9805\uFF01
@ -2293,7 +2293,7 @@ FR-Designer_Subscript=\u4E0B\u6A19
 FR-Designer_Superscript=\u4E0A\u6A19
 FR-Designer_Support_Email=\u652F\u6301\u90F5\u7BB1\uFF1A
 FR-Designer_Support_QQ=\u652F\u63F4QQ
-Fine-Design_Support_String_To_Formula=\u652F\u6301\u5B57\u5143\u4E32\u7DE8\u8F2F\u70BA\u516C\u5F0F
+Fine-Design_Report_Support_String_To_Formula=\u652F\u6301\u5B57\u5143\u4E32\u7DE8\u8F2F\u70BA\u516C\u5F0F
 FR-Designer_Swatch=\u6A23\u54C1
 FR-Designer_System_default=\u7CFB\u7D71\u5C07\u9810\u8A2D
 FR-Designer_Sytle-FRFont=\u5B57\u9AD4
@ -2425,7 +2425,7 @@ FR-Designer_XMLA_Password=\u5BC6\u78BC
 FR-Designer_XMLA_UserName=\u5E33\u865F
 FR-Designer_X_Coordinate=\u6A6B\u5EA7\u6A19
 FR-Designer_Y_Coordinate=\u7E31\u5EA7\u6A19
-Fine-Design_Yes=\u662F
+Fine-Design_Report_Yes=\u662F
 FR-Designer_Zoom_In_Logic=\u653E\u5927\u908F\u8F2F
 FR-Designer_Zoom_Out_Logic=\u7E2E\u5C0F\u908F\u8F2F
 FR-Designer_bold=\u7C97\u9AD4
@ -2644,100 +2644,100 @@ Fine-Designer_Allow_Full_Screen=\u5141\u8A31\u5168\u5C4F
 Fine-Design_Basic_Log_Level_Info=Info
 Fine-Design_Basic_Log_Level_Warn=Warn
 Fine-Design_Basic_Log_Level_Error=Error
-Fine-Design_Switch_Workspace_Failed=Switch Workspace Failed
+Fine-Design_Basic_Switch_Workspace_Failed=Switch Workspace Failed
-Fine-Design_Write_Smart_Submit=Smart submit
+Fine-Design_Basic_Write_Smart_Submit=Smart submit
-Fine-Design_Write_Delete_Submit=Delete submit
+Fine-Design_Basic_Write_Delete_Submit=Delete submit
-Fine-Design_Write_Update_Submit=Update submit
+Fine-Design_Basic_Write_Update_Submit=Update submit
-Fine-Design_Write_Choose_Submit_Type=Choose submit type
+Fine-Design_Report_Write_Choose_Submit_Type=Choose submit type
-Fine-Design_Write_Submit_Type=Submit type
+Fine-Design_Report_Write_Submit_Type=Submit type
-Fine-Design_Write_Submit_Event=Submit event
+Fine-Design_Basic_Write_Submit_Event=Submit event
-Fine-Design_Write_Custom_Event=Custom event
+Fine-Design_Basic_Write_Custom_Event=Custom event
-Fine-Design_Style_Font_Size=Font size
+Fine-Design_Basic_Style_Font_Size=Font size
-Fine-Design_Style_Size_Detail=Size: {} px
+Fine-Design_Basic_Style_Size_Detail=Size: {} px
-Fine-Design_Style_Background_Gradient_Area=Gradient Area
+Fine-Design_Basic_Style_Background_Gradient_Area=Gradient Area
-Fine-Design_Style_Background_Gradient_Repeat_Show=Repeat Show
+Fine-Design_Basic_Style_Background_Gradient_Repeat_Show=Repeat Show
-Fine-Design_Style_Background_Choose_Gradient_Color=Choose Color
+Fine-Design_Basic_Style_Background_Choose_Gradient_Color=Choose Color
-Fine-Design_Style_Background_Gradient_Current_Area=Current Area
+Fine-Design_Basic_Style_Background_Gradient_Current_Area=Current Area
-Fine-Design_Style_Background_Gradient_Custom_Area=Custom Area
+Fine-Design_Basic_Style_Background_Gradient_Custom_Area=Custom Area
-Fine-Design_Style_Add_Icon=Add icon
+Fine-Design_Basic_Style_Add_Icon=Add icon
-Fine-Design_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_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_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_Tabledata_Type_File=File
+Fine-Design_Basic_Tabledata_Type_File=File
-Fine-Design_Tabledata_Select_To_Merge=Select TD to merge
+Fine-Design_Basic_Tabledata_Select_To_Merge=Select TD to merge
-Fine-Design_Tabledata_Default_Parameter=TD default parameter
+Fine-Design_Basic_Tabledata_Default_Parameter=TD default parameter
-Fine-Design_Tabledata_Type_Tree=Tree
+Fine-Design_Basic_Tabledata_Type_Tree=Tree
-Fine-Design_Tabledata_Type_Database_Query=Database Query
+Fine-Design_Basic_Tabledata_Type_Database_Query=Database Query
-Fine-Design_Tabledata_Type_Class=Class
+Fine-Design_Basic_Tabledata_Type_Class=Class
-Fine-Design_Tabledata_Type_Embedded=Embedded
+Fine-Design_Basic_Tabledata_Type_Embedded=Embedded
-Fine-Design_Tabledata_Type_Relation=Relation
+Fine-Design_Basic_Tabledata_Type_Relation=Relation
-Fine-Design_Tabledata_Type_Stored_Procedure=Stored Procedure
+Fine-Design_Basic_Tabledata_Type_Stored_Procedure=Stored Procedure
-Fine-Design_TableData_Select_One=Select one TD
+Fine-Design_Basic_TableData_Select_One=Select one TD
-Fine-Design_Tabledata_Preview_Warn_Text={} column does not exist,total {} columns.
+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_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_Template_Select=Select Template
+Fine-Design_Basic_Template_Select=Select Template
 Fine-Design_Basic_Parameter_UI_Display=Display parameter UI
-Fine-Design_Template_Parameter=Template parameter
+Fine-Design_Basic_Template_Parameter=Template parameter
-Fine-Design_Submit_Type_Custom=Custom submit
+Fine-Design_Report_Submit_Type_Custom=Custom submit
 Fine-Design_Basic_Parameter_Duplicate_Name=Duplicate name
-Fine-Design_Report_Engine_Attribute=Report engine attribute
+Fine-Design_Basic_Engine_Attribute=Report engine attribute
 Fine-Design_Basic_Authority_Edit_Status=Authority edit status
 Fine-Design_Report_Decimal_Digits=Decimal digits
-Fine-Design_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date
-Fine-Design_Widget_Type_Checkbox_Group=Checkbox Group
+Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
-Fine-Design_Widget_Type_Radio_Group=Radio Group
+Fine-Design_Basic_Widget_Type_Radio_Group=Radio Group
-Fine-Design_Widget_Type_Number=Number
+Fine-Design_Basic_Widget_Type_Number=Number
-Fine-Design_Widget_Type_Label=Label
+Fine-Design_Basic_Widget_Type_Label=Label
-Fine-Design_Widget_Type_Button=Button
+Fine-Design_Basic_Widget_Type_Button=Button
-Fine-Design_Widget_Type_File=File
+Fine-Design_Basic_Widget_Type_File=File
-Fine-Design_Widget_Type_Combo_Box=Combobox
+Fine-Design_Basic_Widget_Type_Combo_Box=Combobox
-Fine-Design_Widget_Type_Combo_Checkbox=Combo Checkbox
+Fine-Design_Basic_Widget_Type_Combo_Checkbox=Combo Checkbox
-Fine-Design_Widget_Type_Checkbox=Checkbox
+Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
-Fine-Design_Widget_Type_List=List
+Fine-Design_Basic_Widget_Type_List=List
-Fine-Design_Widget_Type_Textarea=Textarea
+Fine-Design_Basic_Widget_Type_Textarea=Textarea
-Fine-Design_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password
-Fine-Design_Widget_Type_Text=Text
+Fine-Design_Basic_Widget_Type_Text=Text
-Fine-Design_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_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_DS_Column=DS Column
-Fine-Design_Tabledata_Embedded_Table_Design=Table Design
+Fine-Design_Basic_Tabledata_Embedded_Table_Design=Table Design
-Fine-Design_Tabledata_Embedded_Column_Setting=Columns Setting
+Fine-Design_Basic_Tabledata_Embedded_Column_Setting=Columns Setting
 Fine-Design_Basic_Database_Select_Table=Select Database Table
-Fine-Design_Tabledata_Source_Type_Template=Template Tabledata
+Fine-Design_Basic_Tabledata_Source_Type_Template=Template Tabledata
 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_Template_Closed_Warn_Text=Template {} already closed.
+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
 Fine-Design_Report_Column_Warn_Text=Report Column Area Format Error
-Fine-Design_Template_File_Name_Duplicate=Template {} already exist
+Fine-Design_Basic_Template_File_Name_Duplicate=Template {} already exist
 Fine-Design_Basic_Button_Type_Parameter_Submit=Parameter Submit
-Fine-Design_Style_Indent_Right=Indent Right(PT)
+Fine-Design_Basic_Style_Indent_Right=Indent Right(PT)
-Fine-Design_Style_Indent_Left=Indent Left(PT)
+Fine-Design_Basic_Style_Indent_Left=Indent Left(PT)
 Fine-Design_Basic_Authority_Edit_Status_Exit=Exit Privilege Edit
-Fine-Design_Title_Style=Title Style
+Fine-Design_Form_Title_Style=Title Style
 Fine-Design_Form_Button_Name=Button Name
 Fine-Design_Basic_Button_Style=Button Style
-Fine-Design_Widget_Value=Widget Value
+Fine-Design_Form_Widget_Value=Widget Value
-Fine-Design_Widget_Choose_Type_All=Provide Choose All
+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=Widget Setting
 Fine-Design_Form_Hyperlink_Undefined=Undefined Hyperlink
 Fine-Design_Form_Hyperlink_Group_Count=Total has {} groups hyperlink
-Fine-Design_Widget_Alias_Name=Widget Alias Name
+Fine-Design_Form_Widget_Alias_Name=Widget Alias Name
-Fine-Design_Widget_Button_Setting=Button Setting
+Fine-Design_Form_Widget_Button_Setting=Button Setting
-Fine-Design_Widget_Icon=Widget Icon
+Fine-Design_Form_Widget_Icon=Widget Icon
-Fine-Design_Widget_Page_Navi_Text=Current/Total
+Fine-Design_Form_Widget_Page_Navi_Text=Current/Total
 Fine-Design_Report_Export_Excel_Simple=Excel(Simple)
-Fine-Design_Toolbar_Custom_Button=Custom Button
+Fine-Design_Form_Toolbar_Custom_Button=Custom Button
 Fine-Design_Form_Authority_Edit=Form Authority Edit
 Fine-Design_Form_Layout_2x2=2x2Layout Container
 Fine-Design_Form_Layout_2x3=2x3Layout Container
@ -2760,7 +2760,7 @@ Fine-Design_Chart_Category_Name=Category Name
 Fine-Design_Chart_Second_Value_Axis=Second Value Axis
 Fine-Design_Chart_Value_Define=Value Define
 Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh
-Fine-Design_Tabledata=Tabledata
+Fine-Design_Chart_Tabledata=Tabledata
 Fine-Design_Chart_Enable_Field_Name=Enable Field Name
 Fine-Design_Chart_Enable_Field_Value=Enable Field Value
 Fine-Design_Chart_Legend_Name=Legend(Series) Name
@ -2792,9 +2792,9 @@ Fine-Design_Chart_Map_Data=Map Data
 Fine-Design_Chart_Area_Value=Area Value
 Fine-Design_Chart_Area_Name=Area Name
 Fine-Design_Chart_Single_Layer_Map=Single Layer Map
-Fine-Design_Template_Opening_And_Waiting=Opening {}, please wait for a moment
+Fine-Design_Report_Template_Opening_And_Waiting=Opening {}, please wait for a moment
-Fine-Design_Template_Global_Style_Missed=Global style {} missed
+Fine-Design_Report_Template_Global_Style_Missed=Global style {} missed
-Fine-Design_Write_Select_Cell_Count=Selected {} cells
+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_Format=Format
 Fine-Design_Basic_Illegal_Name_Tips=Please rename