Merge pull request #900 in BA/design from ~NEIL/design:dev to dev

* commit '8a4830d5e2f8144f4b557b6177390defaa177b2b':
  1
  1
  无JIRA任务，国际化冲突修正.

designer_base/src/com/fr/design/locale/designer.properties

@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=
 FR-Designer-BBSLogin_Connection-Failure=
 FR-Designer-BBSLogin_Connection-Failure-Tip=
@@ -12,7 +11,7 @@ FR-Designer-BBSLogin_Switch-Account=
 FR-Designer-BBSLogin_Privite-Message=
 FR-Designer-BBSLogin_Times=
 FR-Designer-BBSLogin_Username-Empty-Tip=
-FR-Designer-Basic_More_Color=
+FR-Designer-Basic_More_Color=More colors
 FR-Designer-Estate_Any=
 FR-Designer-Estate_Default_Font=
 FR-Designer-Estate_Default_Null=
@@ -87,18 +86,18 @@ FR-Designer_Currency_Line=
 FR-Designer_Current_tab=
 FR-Designer_Custom=
 FR-Designer_Custom-Angle=
-FR-Designer_DS-Dictionary=
+FR-Designer_DS-Dictionary=Dictionary
 FR-Designer_Data-confusion=
 FR-Designer_Data_Type=
 FR-Designer_Double_Click_Edit_OR_Clear=
-FR-Designer_Email=
+FR-Designer_Email=email
 FR-Designer_Enabled=
 FR-Designer_End-Date=
 FR-Designer_ExportAndOutput=
 FR-Designer_FRFont=
-FR-Designer_FS_Close_Other_Templates=
-FR-Designer_File=
-FR-Designer_Filter_Conditions=
+FR-Designer_FS_Close_Other_Templates=close other templates
+FR-Designer_File=File
+FR-Designer_Filter_Conditions=Filter Conditions
 FR-Designer_Finish-Modify-Share=
 FR-Designer_Fit=
 FR-Designer_Fit-App=
@@ -106,7 +105,7 @@ FR-Designer_Font-Family=
 FR-Designer_Font-Size=
 FR-Designer_Forbid_Drag_into_Adapt_Pane=Forbid Drag into Para Pane
 FR-Designer_Forbid_Drag_into_Para_Pane=Forbid Drag into Para Pane
-FR-Designer_Foreground=
+FR-Designer_Foreground=Foreground
 FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=Form authority editing can not be supported
 FR-Designer_Form-Report=
 FR-Designer_Form_EmbeddedTD=
@@ -117,12 +116,12 @@ FR-Designer_Forum=
 FR-Designer_Get-Cube=
 FR-Designer_Help=
 FR-Designer_Hide=
-FR-Designer_Hyperlink=
+FR-Designer_Hyperlink=Hyperlink
 FR-Designer_Hyperlink-Form_link=
 FR-Designer_IDCard=
 FR-Designer_Icon=
 FR-Designer_Index=
-FR-Designer_Input_Rule=
+FR-Designer_Input_Rule=Input Rule
 FR-Designer_Language_Default=
 FR-Designer_Layout=
 FR-Designer_Layout-HBox=
@@ -143,7 +142,7 @@ FR-Designer_M_Help-Tutorial=
 FR-Designer_Max_Value=
 FR-Designer_Min_Value=
 FR-Designer_MobilePhone=
-FR-Designer_New_Value=
+FR-Designer_New_Value=New_Value
 FR-Designer_None=
 FR-Designer_PaperSize-Mobile=
 FR-Designer_PaperSize-Mobile-Large=
@@ -152,12 +151,12 @@ FR-Designer_Para-Body=
 FR-Designer_Parameters=
 FR-Designer_Phone=
 FR-Designer_PostCode=
-FR-Designer_Present=
-FR-Designer_Preview=
+FR-Designer_Present=Present
+FR-Designer_Preview=Preview
 FR-Designer_Preview-Data-Confusion=
 FR-Designer_Product_Demo=
 FR-Designer_Query_Type=
-FR-Designer_Refresh=
+FR-Designer_Refresh=Refresh
 FR-Designer_Refresh_Parameter_In_SQL=
 FR-Designer_Reg_Expressions=
 FR-Designer_Reg_Max_Length=
@@ -195,8 +194,8 @@ FR-Designer_Vertical-RightToLeft=
 FR-Designer_VerticalBoxLayout=
 FR-Designer_Visible=
 FR-Designer_WLayout-Border-ToolTips=
-FR-Designer_WaterMark=
-FR-Designer_Widget=
+FR-Designer_WaterMark=WaterMark
+FR-Designer_Widget=Widget
 FR-Designer_Widget-Settings=
 FR-Designer_Widget-Visible=
 FR-Designer_XMLA_Explain=
@@ -401,14 +400,14 @@ FR-Designer_Choose_Language=
 FR-Designer_Work_After_Restart_Designer=
 FR-Designer_Setting-Ruler-Units=
 FR-Designer_PageSetup-mm=
-FR-Designer_Unit_CM=
+FR-Designer_Unit_CM=CM
 FR-Designer_Page-Setup-Scale-Units=
 FR-Designer_Report-Design-Ruler-Units=
 FR-Designer_Web_Preview_Port_Setting=
 FR-Designer_Designer_Language=
-FR-Designer_Unit_INCH=
+FR-Designer_Unit_INCH=INCH
 FR-Designer_Web_Preview_Port=
-FR-Designer_Unit_PT=
+FR-Designer_Unit_PT=PT
 FR-Designer-Write_Auto_Stash=auto stash
 FR-Designer_Printer_Native_Button=
 FR-Designer_Event_ShowWidgets=
@@ -483,10 +482,10 @@ FR-Designer_Browser_Background=Browser Background
 FR-Designer_Import_Css=Import Css
 FR-Designer_Import_JavaScript=Import JavaScript
 FR-Designer-Datasource-Param_DES=<html>&nbsp;you can type "${abc}" as a parameter, here, abc is a parameter name. <br/>&nbsp;for example\: select * from table where id\=${abc}.<br/>&nbsp;select * from table where id\='${abc}'.(if the field id is typeof string)</html>
-FR-Designer-DS-Database_Query=
-FR-Designer_Is_Share_DBTableData=
-FR-Designer-LayerPageReport_PageQuery=
-FR-Designer-LayerPageReport_Define_PageQuerySQL=
+FR-Designer-DS-Database_Query=Database Query
+FR-Designer_Is_Share_DBTableData=Is_Share_DBTableData
+FR-Designer-LayerPageReport_PageQuery=Query for page
+FR-Designer-LayerPageReport_Define_PageQuerySQL=Define sql for page
 FR-Designer_Event=
 FR-Designer_Properties=
 FR-Designer_Permissions_Edition=Permissions Edition
@@ -512,7 +511,7 @@ FR-Designer_Attribute=
 FR-Designer_Form_Editing_Listeners=
 FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
-FR-Designer_Create_Tree=
+FR-Designer_Create_Tree=Create Tree
 FR-Designer_Set_Callback_Function=
 FR-Designer_ConfirmDialog_Content=
 FR-Designer_ConfirmDialog_Title=
@@ -558,11 +557,7 @@ FR-Designer_Auto_Adjust_Size=Auto adjust
 FR-Designer_Show_As_Download=Display the binary content using download link
 FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
-FR-Designer_Pagination=Page Break
-FR-Designer-Move_Tab_First=move to first
-FR-Designer-Move_Tab_End=move to end
-FR-Designer-Move_Tab_Next=move to next
-FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_Pagination=Pagination
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
 FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
@@ -830,7 +825,7 @@ Form-TextArea=TextArea
 FR-Designer_Https_Enable=
 Widget-Custom_Widget_Config=Custom Widget
 already_exists=already exists
-FR-Designer_Original_Marked_Filed=Original Marked Filed
+Original_Marked_Filed=Original Marked Filed
 BackgroundTexture-Sand=Beach
 Values=Values
 Not_use_a_cell_attribute_table_editing=You may not use a cell attribute table editing
@@ -862,7 +857,7 @@ RP_Authority_Edit=Authority
 Warnning=Warning
 RoleName_Can_Not_Be_Null=RoleName_Can_Not_Be_Null
 Application=Applications
-Formula_Dictionary_Display_Examples_Html=<html>the real value is \
+Formula_Dictionary_Display_Examples_Html=<html>the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$, <br>the result is 1, 2, ..., 100 and -1, -2, ..., -100.<br></html>
 ECP-error_pwd=
 FR-Hyperlink_ChartHyperlink=
 M_Edit-FormatBrush=Format Painter
@@ -993,7 +988,7 @@ Background-Background_is_NULL=No Background
 FR-Designer_Sytle-FRFont=Font
 Gradation=Gradation
 The_current_list_is_empty=The current list is empty
-Formula_Dictionary_Display_Examples=the real value is \
+Formula_Dictionary_Display_Examples=the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$, \nthe result is 1, 2, ..., 100 and -1, -2, ..., -100.
 Schedule-Template_Parameter=Template Parameter
 JSShow=Show In Action
 Level_coordinates=Level coordinates
@@ -1158,7 +1153,7 @@ Multiline=Multiline
 Datasource-Convert_Charset=Convert Char Set
 DashBoard-ConnectionList=ConnectionList
 Utils-Submit_Forcibly=Submit Forcibly
-FR-Designer_Parent_Marked_Field=Parent Marked Field
+Parent_Marked_Field=Parent Marked Field
 Logout=Logout
 FR-Designer_Show_Blank_Row=
 FR-Base_Format=
@@ -1197,7 +1192,7 @@ Privilege-Selected_None_Of_Any_Items=Selected None Of Any Items
 FRFont-Size=Size
 Function-J2EE_server=J2EE server
 FR-Designer_Allow_Blank=All Blank
-FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
+Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
 Preference-Horizontal_Scroll_Bar_Visible=Horizontal Scroll Bar Visible
 Scope=Scope
 Save_All_Records_In_Memory=Save All Records in Memory
@@ -1266,7 +1261,7 @@ DateFormat-Custom_Warning=Note\: Custom date format does not support the format
 Unit_MM=MM
 Server-Start=Start
 CellPage-Can_Break_On_Paginate=Can Break On Paginate
-FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
+Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
 ComboCheckBox-Start_Symbol=Start Symbol
 Real=Real
 RWA-Batch_Modify_Cells=Batch Modify Cells
@@ -1375,7 +1370,7 @@ Not_Exsit=not exist in WorkSheet.
 Utils-Insert_Row=Insert Row
 Utils-Delete_Row=Delete Row
 not_support_authority_edit=this element does not support authority edit
-Formula_Tips=The formula must be from the beginning of the "\
+Formula_Tips=The formula must be from the beginning of the "\="\!
 FR-Action_Copy=
 Compile_Success=Compile Success
 BackgroundTexture-RecycledPaper=Recycled Paper
@@ -1540,7 +1535,7 @@ FR-Designer_Cancel=
 Button-Group-Display-Columns=Display Column Count
 Widget-Height=Height
 Examples=Examples
-Formula_Dictionary_Display_Example=the real value is \
+Formula_Dictionary_Display_Example=the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$, \nthe result is 1, 2, ..., 100 and -1, -2, ..., -100.
 StyleAlignment-Horizontal=Horizontal
 HyperLink_Must_Alone_Reset=HyperLink_Must_Alone_Reset
 ExpandD-Expand_Direction=Display Data Direction
@@ -1714,7 +1709,7 @@ Condition_Display=Condition Display
 FR-Server-Design_template_unopened=
 Function-Function_Class_Name=Function Class Name
 Schedule-Template=Template
-FR-Designer_Tree_Data_Field=Tree Data Field
+Tree_Data_Field=Tree Data Field
 Border-Style-Normal=Rectangular
 Top_And_Double_Bottom_Border_Line=Top And Double Bottom Border Line
 FR-Server_Embedded_Server_Start=Server in Design-Start
@@ -1991,4 +1986,18 @@ FR-Designer_Role=Role
 FR-Designer_Permissions=Permissions
 FR-Designer_Form_Button=Button
 FR-Designer_WF_Name=Name
+FR-Designer_Double=Double
+FR-Designer_Query=
+FR-Designer_Font=Font
+FR-Designer_Confirm=
+FR-Designer_Parameter=
+FR-Designer-Plugin_Plugin=Plugin
+FR-Designer_Background=Background
+Template=Template
+
+FR-Designer_Parent_Marked_Field=Parent Marked Field
+FR-Designer_Original_Marked_Filed=Original Marked Filed
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
 FR-Product_Demo=Demo
+FR-Designer_Tree_Data_Field=Tree Data Field

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=User name
 FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status
 FR-Designer-BBSLogin_Connection-Failure-Tip=Tip
@@ -9,10 +8,10 @@ FR-Designer-BBSLogin_Password=Password
 FR-Designer-BBSLogin_Password-Empty-Tip=Password can not be null
 FR-Designer-BBSLogin_Register-Account=Register Account
 FR-Designer-BBSLogin_Switch-Account=Switch Account
-FR-Designer-BBSLogin_Privite-Message=Privite Message
+FR-Designer-BBSLogin_Privite-Message=Private Message
 FR-Designer-BBSLogin_Times=times
 FR-Designer-BBSLogin_Username-Empty-Tip=User name can not be null
-FR-Designer-Basic_More_Color=More Color...
+FR-Designer-Basic_More_Color=More colors
 FR-Designer-Estate_Any=Any
 FR-Designer-Estate_Default_Font=Default font
 FR-Designer-Estate_Default_Null=Default null
@@ -21,7 +20,7 @@ FR-Designer-Estate_Parameter_Null_Text=Parameter is null, then display as
 FR-Designer-Estate_Radio-Group=Common button group controls of real estate
 FR-Designer-Estate_Selected_Font=Selected font
 FR-Designer-Estate_Widget_Value=Control value
-FR-Designer-Layout_Adaptive_Layout=Adaptive layout
+FR-Designer-Layout_Adaptive_Layout=Adaptive Layout
 FR-Designer-Output_Background_Set=Background set
 FR-Designer-Output_Default_Background=Default background
 FR-Designer-Output_Excel_Page=Excel Export(page break)
@@ -29,7 +28,7 @@ FR-Designer-Output_Excel_Sheet=Excel Export(one page per sheet)
 FR-Designer-Output_Excel_Simple=Excel Export(original)
 FR-Designer-Plugin_PluginMarket_Coding=Plugin store is developing, stay tuned
 FR-Desinger-Plugin_Updater_UpdateAndUpgrade=Update&Upgrade
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=Checking jarpackage update
+FR-Desinger-Plugin_Updater_Checking_Jar_Update=Checking JARpackage update
 FR-Desinger-Plugin_Updater_Checking_Version_Update=Checking version update
 FR-Desinger-Plugin_Updater_Update=update
 FR-Desinger-Plugin_Updater_Upgrade=upgrade
@@ -91,14 +90,14 @@ FR-Designer_DS-Dictionary=Data Dictionary
 FR-Designer_Data-confusion=Data Confusion
 FR-Designer_Data_Type=Data type
 FR-Designer_Double_Click_Edit_OR_Clear=Double Click to Edit or Clear
-FR-Designer_Email=Mail
+FR-Designer_Email=Email
 FR-Designer_Enabled=Enabled
 FR-Designer_End-Date=End Date
 FR-Designer_ExportAndOutput=Export
 FR-Designer_FRFont=Font
 FR-Designer_FS_Close_Other_Templates=Close other templates
-FR-Designer_File=file
-FR-Designer_Filter_Conditions=Filter condition
+FR-Designer_File=File
+FR-Designer_Filter_Conditions=Filter Conditions
 FR-Designer_Finish-Modify-Share=Finish Modification And Share
 FR-Designer_Fit-App=App self-adaption
 FR-Designer_Fit=self-adaption
@@ -115,7 +114,6 @@ FR-Designer_Format_explan=Format explain
 FR-Designer_Allow-Blank=Allow Blank
 FR-Designer_Formula=Formula
 FR-Designer_Forum=Forum
-FR-Designer_Get-CubeGetting cube=
 FR-Designer_Help=Help
 FR-Designer_Hide=Hide
 FR-Designer_Hyperlink=Hyperlink
@@ -144,7 +142,7 @@ FR-Designer_M_Help-Tutorial=Help tutorial
 FR-Designer_Max_Value=max value
 FR-Designer_Min_Value=min value
 FR-Designer_MobilePhone=Mobile phone
-FR-Designer_New_Value=new value
+FR-Designer_New_Value=New Value
 FR-Designer_None=none
 FR-Designer_PaperSize-Mobile=Mobile
 FR-Designer_PaperSize-Mobile-Large=Large screen
@@ -153,7 +151,7 @@ FR-Designer_Para-Body=Parameter interface
 FR-Designer_Parameters=Parameters
 FR-Designer_Phone=Phone
 FR-Designer_PostCode=Postcode
-FR-Designer_Present=present
+FR-Designer_Present=Present
 FR-Designer_Preview=Preview
 FR-Designer_Preview-Data-Confusion=Preview Data After Confusion
 FR-Designer_Product_Demo=Demo
@@ -163,7 +161,7 @@ FR-Designer_Refresh_Parameter_In_SQL=Whether to refresh parameters in the SQL
 FR-Designer_Reg_Expressions=Regular expressions
 FR-Designer_Reg_Max_Length=max length
 FR-Designer_Reg_Min_Length=min length
-FR-Designer_ReportColumns-Columns=Multi-columns/lines
+FR-Designer_ReportColumns-Columns=Fixed columns per line
 FR-Designer_Return-Date=Return Date
 FR-Designer_RichText=Insert Rich Text
 FR-Designer_RichTextEditor=Rich Text Editor
@@ -174,7 +172,7 @@ FR-Designer_Search=Search
 FR-Designer_Set=Set
 FR-Designer_Share-Template=Share Template
 FR-Designer_Simple_general=Simple custom query
-FR-Designer_Song_TypeFace=Song typeface
+FR-Designer_Song_TypeFace=Song TypeFace
 FR-Designer_Start-Date=Start Date
 FR-Designer_Subscript=Subscript
 FR-Designer_Superscript=Superscript
@@ -183,7 +181,7 @@ FR-Designer_Swatch=Sample
 FR-Designer_Tab_title=Tab title
 FR-Designer_TableData=Data set
 FR-Designer_Thank_guest=Special thanks to
-FR-Designer_Thanks-To=Thanks
+FR-Designer_Thanks-To=Thanks To
 FR-Designer_Title=Title
 FR-Designer_Total=Total
 FR-Designer_UnSignIn=Not Sign In
@@ -241,7 +239,7 @@ FR-Designer_Refresh_Successfully=Refresh successfully
 FR-Designer_SQL-Table=Tab
 FR-Designer_SQL-View=View
 FR-Designer_Failed=Failed
-FR-Designer_Chart_Field_Name=FieldName
+FR-Designer_Chart_Field_Name=Field Name
 FR-Designer_FormulaD-Text=Text
 FR-Designer_FormulaD-Logical=Logical Function
 FR-Designer_FormulaD-Array=Array
@@ -250,13 +248,13 @@ FR-Designer_FormulaD-Other=Other Functions
 FR-Designer_FormulaD-All=All Functions
 FR-Designer_Function=Function
 FR-Designer_Select=Sel
-FR-Designer_Edit=Edit
+FR-Designer_Edit=Edt
 FR-Designer_Description=Description
 FR-Designer_Role_changed_isRefresh=Roles change, whether to refresh
 FR-Designer_FS_Name=FineBI
 FR-Designer_Datasource-Parameter=Datasource Parameter
-FR-Designer_Tree-ComboBox=Tree Combobox
-FR-Designer_Form-Iframe=Iframe
+FR-Designer_Tree-ComboBox=Drop-down Tree
+FR-Designer_Form-Iframe=WebView
 FR-Designer_Type=Type
 FR-Designer_User-defined=User_defined
 FR-Designer_Simple_general_forV6=Simple general for Version6+
@@ -268,11 +266,11 @@ FR-Designer_Parameters_name=parameters name
 FR-Designer_SAP_datatype=SAP datatype
 FR-Designer_Return_set_name=Return set
 FR-Designer_Datatype=Datatype
-FR-Designer_Corre_parameter=Corresponse parameter
+FR-Designer_Corre_parameter=Corresponding parameter
 FR-Designer_Default_value=Default value
 FR-Designer_SAP_column_name=Column name
 FR-Designer_Table_name=Table name
-FR-Designer_Columns_choosed=Columns choosed
+FR-Designer_Columns_choosed=Columns chosen
 FR-Designer_Where_claus=Where claus
 FR-Designer_PreStyle=Pre Style
 FR-Designer_Loading=Loading
@@ -288,18 +286,18 @@ FR-Designer_file-is-locked=File is locked by others.
 FR-Designer_Custom_Icon_Message1=The 16 * 16 standard PNG image is better.
 FR-Designer_Add=Add
 FR-Designer_Custom_Icon_Message2=The icon name is already exist or your operation is unreasonable.
-FR-Designer_Tooltips=Tooltips
-FR-Designer_Remove=Remove
+FR-Designer_Tooltips=Tip
+FR-Designer_Remove=Delete
 FR-Designer_Custom_Icon_SelectIcon=Select icon
 FR-Designer_Click_this_button=Click this button to set path
 FR-Designer_Custom_Icon_Message3=The icon name is already exist.
-FR-Designer_Set_default_browser=Cannot find the default browser, please set default browser in Intenet options .
+FR-Designer_Set_default_browser=Cannot find the default browser, please set default browser in Internet options .
 FR-Designer_Open=Open
 FR-Designer_Utils-OpenDemoEnv=To open the demo, it needs to switch to the workspace\:
 FR-Designer_Utils-switch=\nThe current unsaved editing files will be saved under current environment?\nGo on?
 FR-Designer_Utils-NewDemoEnv=To open the demo,it needs to create the workspace\:
 FR-Designer_Save_As_Global_Style=Save as Global Style
-FR-Designer_Input_The_Name_Of_Gloabel_Style=Input the name of gloabel style
+FR-Designer_Input_The_Name_Of_Gloabel_Style=Input the name of global style
 FR-Designer_This_Name_Has_Exsit=This name has existed
 FR-Designer_Shortcut_Set=Shortcut Setting
 FR-Designer_Feature_Name=Feature Name\:
@@ -358,7 +356,7 @@ FR-Designer-Series_Dismenber_As_Single=Regard consecutive separators as one
 FR-Designer_KeyPoint=KeyPoint
 FR-Designer_loadedTreeModel=loadedTreeModel
 FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\:
-FR-Designer-Plugin_Please_Update_Jar=Please Update Jar
+FR-Designer-Plugin_Please_Update_Jar=Please Update Jar To\:
 FR-Designer-Invalid_Page_Number=Invalid Page Number
 FR-Designer_XMLA_Database=DB
 FR-Designer_XMLA_UserName=User name
@@ -381,7 +379,7 @@ FR-Designer_Clear_All=Clear All
 FR-Designer_Log=Log
 FR-Designer-Plugin_Expire_Dialog_Title=Plug expired
 FR-Designer-Plugin_Expire_Dialog_Text=Plugin expired, go sail soft application center to make a purchase.
-FR-Designer-Plugin_Finerest_Addon=Fineres Addon
+FR-Designer-Plugin_Finerest_Addon=Fineres Plugins
 FR-Designer_Performance_First=Performance First
 FR-Designer_Total_N_Grade=Total\:${N}Layer
 FR-Designer-BBSLogin_Login-Title=BBS Login
@@ -394,7 +392,7 @@ FR-Designer_Product_improve=Product improvement
 FR-Designer_Join_Product_improve=Join product improvement plan
 FR-Designer_Preference-Function=Function
 FR-Designer_max_undo_limit=Max
-FR-Designer_Surport_String_To_Formula=Surport String To Formula
+FR-Designer_Surport_String_To_Formula=Support String To Formula
 FR-Designer_Always=Default execute this operation
 FR-Designer_Export_Setting=Export Configuration
 FR-Designer_Select_Export_Log_Directory=Select Export Log Directory
@@ -559,10 +557,6 @@ FR-Designer_Show_As_Download=Display the binary content using download link
 FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
 FR-Designer_Pagination=Page Break
-FR-Designer-Move_Tab_First=move to first
-FR-Designer-Move_Tab_End=move to end
-FR-Designer-Move_Tab_Next=move to next
-FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
 FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
@@ -831,7 +825,7 @@ Form-TextArea=Text Fields
 FR-Designer_Https_Enable=Start https
 Widget-Custom_Widget_Config=Custom control
 already_exists=Already exists
-FR-Designer_Original_Marked_Filed=Original Tag Field
+Original_Marked_Filed=Original Tag Field
 BackgroundTexture-Sand=Beach
 Values=Values
 Not_use_a_cell_attribute_table_editing=You may not use a cell attribute table editing
@@ -863,7 +857,7 @@ RP_Authority_Edit=Permission
 Warnning=Warning
 RoleName_Can_Not_Be_Null=Role name can not be null or duplicate
 Application=Applications
-Formula_Dictionary_Display_Examples_Html=<html>Real value range is \
+Formula_Dictionary_Display_Examples_Html=<html>Real value range is \=range(100), displayed formula of every $$$ in the range is \=0 - $$$, <br> the real result is 1, 2, ..., 100 and diaplay result is -1, -2, ..., -100.<br>&nbsp;</html>
 ECP-error_pwd=Password Error
 FR-Hyperlink_ChartHyperlink=Chart Hyperlink
 M_Edit-FormatBrush=Format Painter
@@ -994,7 +988,7 @@ Background-Background_is_NULL=No Background
 FR-Designer_Sytle-FRFont=Font
 Gradation=Gradation
 The_current_list_is_empty=The current list is empty
-Formula_Dictionary_Display_Examples=\Real value range is \
+Formula_Dictionary_Display_Examples=\Real value range is \=range(100), displayed formula of every $$$ in the range is \=0 - $$$, \n the real result is 1, 2, ..., 100 and diaplay result is -1, -2, ..., -100.
 Schedule-Template_Parameter=Template Parameter
 JSShow=Dynamic display
 Level_coordinates=Hierarchy coordinate
@@ -1159,7 +1153,7 @@ Multiline=Multi-line edit
 Datasource-Convert_Charset=Encoding Conversion
 DashBoard-ConnectionList=Data Connection
 Utils-Submit_Forcibly=Submit forcibly
-FR-Designer_Parent_Marked_Field=Parent Tag Field
+Parent_Marked_Field=Parent Tag Field
 Logout=Logout
 FR-Designer_Show_Blank_Row=Supplement blank line
 FR-Base_Format=Format
@@ -1198,7 +1192,7 @@ Privilege-Selected_None_Of_Any_Items=Selected None
 FRFont-Size=Size
 Function-J2EE_server=J2EE server
 FR-Designer_Allow_Blank=Allow NULLs
-FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
+Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
 Preference-Horizontal_Scroll_Bar_Visible=Horizontal Scroll Bar Visible
 Scope=Scope
 Save_All_Records_In_Memory=Save All Records in Memory
@@ -1267,7 +1261,7 @@ DateFormat-Custom_Warning=Note\: Custom date format does not support the format
 Unit_MM=MM
 Server-Start=Start
 CellPage-Can_Break_On_Paginate=Can break when paging
-FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
+Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
 ComboCheckBox-Start_Symbol=Initializer
 Real=Real
 RWA-Batch_Modify_Cells=Batch Modify Cells
@@ -1376,7 +1370,7 @@ Not_Exsit=Not exist in report
 Utils-Insert_Row=Insert Row
 Utils-Delete_Row=Delete Row
 not_support_authority_edit=this element does not support authority edit
-Formula_Tips=The formula must be begin with "\
+Formula_Tips=The formula must be begin with "\="\!
 FR-Action_Copy=Copy
 Compile_Success=Compile Successfully
 BackgroundTexture-RecycledPaper=Recycled Paper
@@ -1541,7 +1535,7 @@ FR-Designer_Cancel=Cancel
 Button-Group-Display-Columns=Number of columns displayed
 Widget-Height=Control Height
 Examples=Examples
-Formula_Dictionary_Display_Example=Real value range is \
+Formula_Dictionary_Display_Example=Real value range is \=range(100), displayed formula of every $$$ in the range is \=0 - $$$, \n the real result is 1, 2, ..., 100 and diaplay result is -1, -2, ..., -100.
 StyleAlignment-Horizontal=Horizontal
 HyperLink_Must_Alone_Reset=Multiple hyperlink
 ExpandD-Expand_Direction=Extension Direction
@@ -1715,7 +1709,7 @@ Condition_Display=Condition Display
 FR-Server-Design_template_unopened=Can't open the template
 Function-Function_Class_Name=Function Class Name
 Schedule-Template=Template name
-FR-Designer_Tree_Data_Field=Tree Data Field
+Tree_Data_Field=Tree Data Field
 Border-Style-Normal=Rectangular Border
 Top_And_Double_Bottom_Border_Line=Top and bottom double border
 FR-Server_Embedded_Server_Start=Built-in server-Open
@@ -1792,7 +1786,7 @@ Form-DataTable=DataTable
 Sub_Report_ToolTips=Sub Report ToolTips
 Right_Top=Upper right
 M_Edit-Merge_Cell=Merge Cell
-FR-Designer_Restore_Default=Back to default\
+FR-Designer_Restore_Default=Back to default
 Component_Interval=Components Interval
 Cover_None=Override None
 Datasource-From_Database=DB table
@@ -1803,7 +1797,7 @@ ParentCell_Setting=Parent Cell Setting
 Only_selected_cell_can_paste_only=Paste when cell is selected
 M_Report-Report_Columns=Multi-columns/lines
 Unit_Hundred=Hundred
-FR-Designer_DataTable-Build=
+FR-Designer_DataTable-Build=Quick build (hierarchical)
 Widget-Form_Widget_Config=Form control
 Server-version-tip-moreInfo=Conform the version numbers of FineReport Designer and the deployment server are consistent, in order to avoid the problems caused by inconsistent versions. If you open the template produced by higher designer vision, error may occurs or the original template properties missed. If the Designer Version you used to create the template is higher than the final deployment server version, the server may not be able to properly load the template.
 Actions=Task
@@ -1823,7 +1817,7 @@ BackgroundTexture-Cork=Cork
 M_Format-Data_Map=Data Dictionary
 FR-mobile_native_analysis=native analysis
 HighLight=High Light
-FR-Designer_Dropdown-More-Preview=
+FR-Designer_Dropdown-More-Preview=Drop down for more
 local=local
 FR-Designer_Gradation=Gradation
 PageSetup-Finis_Start_Column=Duplicate Last Column
@@ -1900,7 +1894,7 @@ All_Border_Line=All Border
 FR-Utils-Please_Input_a_New_Name=Input a New Name
 FR-Base_Formula_Plugin=Plugin Function
 Two_Rows_Of_Three_Grid=A grid with 2 rows and 3 columns
-FR-Designer_Certificate_Pass=Certificate Password\
+FR-Designer_Certificate_Pass=Certificate Password
 Bubble-Series_Name=Series Name
 M-New_Multi_Report=New Aggregate Report
 BackgroundTexture-PinkTissuePaper=Pink Sandpaper
@@ -1946,7 +1940,7 @@ Widget-User_Defined=Predefine
 Url_location=Absolute path
 Disk_File=Disk File
 Inside=Inside
-FR-Designer_filedChosen=
+FR-Designer_filedChosen=Dependent fields
 ServerM-Predefined_Styles=Predefined Styles
 is_need_word_adjust=Word Auto Adjust
 Background-Null=No Background
@@ -1992,4 +1986,18 @@ FR-Designer_Role=Role
 FR-Designer_Permissions=Permissions
 FR-Designer_Form_Button=Button
 FR-Designer_WF_Name=Name
+FR-Designer_Double=Decimal
+FR-Designer_Query=Query
+FR-Designer_Font=Font
+FR-Designer_Confirm=OK
+FR-Designer_Parameter=Parameter
+FR-Designer-Plugin_Plugin=Plugin
+FR-Designer_Background=BG
+Template=Template
+
+FR-Designer_Original_Marked_Filed=Original Tag Field
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
+FR-Designer_Tree_Data_Field=Tree Data Field
+FR-Designer_Parent_Marked_Field=Parent Tag Field
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
 FR-Product_Demo=Demo

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D
 FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624.
 FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC
@@ -12,7 +11,7 @@ FR-Designer-BBSLogin_Switch-Account=\uC804\uD658\uACC4\uC815\uBC88\uD638
 FR-Designer-BBSLogin_Privite-Message=\uAC1C\uC778\u0020\uBA54\uC2DC\uC9C0
 FR-Designer-BBSLogin_Times=\uD68C
 FR-Designer-BBSLogin_Username-Empty-Tip=\uC0AC\uC6A9\uC790\uC774\uB984\uC740\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
-FR-Designer-Basic_More_Color=\uC0C9\uB354\uBCF4\uAE30...
+FR-Designer-Basic_More_Color=\uB354\uBCF4\uAE30\uC0C9
 FR-Designer-Estate_Any=\uC81C\uD55C\uC5C6\uC74C
 FR-Designer-Estate_Default_Font=\uAE30\uBCF8\uAE00\uAF34
 FR-Designer-Estate_Default_Null=\uAE30\uBCF8\uBE44\uC5B4\uC788\uC74C
@@ -106,7 +105,7 @@ FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D
 FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.
 FR-Designer_Forbid_Drag_into_Para_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uB9E4\uAC1C\uBCC0\uC218\uD328\uB110\uC744\uB4DC\uB798\uADF8\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
-FR-Designer_Foreground=\uC0C9
+FR-Designer_Foreground=\uBE44\uC804
 FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\uD3FC\uAD8C\uD55C\uD3B8\uC9D1\uC744\uC9C0\uC6D0\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.
 FR-Designer_Form-Report=\uBB38\uC11C\uBE14\uB7ED
 FR-Designer_Form_EmbeddedTD=\uD3FC(\uB0B4\uC7A5\uB370\uC774\uD130)
@@ -162,7 +161,7 @@ FR-Designer_Refresh_Parameter_In_SQL=SQL\uC758\uB9E4\uAC1C\uBCC0\uC218\uB97C\uC0
 FR-Designer_Reg_Expressions=\uC815\uADDC\uD45C\uD604\uC2DD
 FR-Designer_Reg_Max_Length=\uCD5C\uB300\uAE38\uC774
 FR-Designer_Reg_Min_Length=\uCD5C\uC18C\uAE38\uC774
-FR-Designer_ReportColumns-Columns=\uC140\uB098\uB204\uAE30
+FR-Designer_ReportColumns-Columns=\uC5F4\uC140\uB098\uB204\uAE30
 FR-Designer_Return-Date=\uB0A0\uC9DC\uB3CC\uC544\uAC00\uAE30
 FR-Designer_RichText=\uB9AC\uCE58\uD14D\uC2A4\uD2B8\uBC15\uC2A4\uC0BD\uC785
 FR-Designer_RichTextEditor=\uB9AC\uCE58\uD14D\uC2A4\uD2B8\uBC15\uC2A4\uD3B8\uC9D1\uAE30
@@ -446,7 +445,6 @@ FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3
 FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00
 FR-Designer_Reset=
 FR-Designer_Language_Change_Successful=
-FR-Designer_Template_Web_Attributes=
 FR-Designer_Basic=\uAE30\uBCF8
 FR-Designer_Printers(Server)=\uD504\uB9B0\uD130(\uC11C\uBC84)
 FR-Designer_Pagination_Setting=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uBBF8\uB9AC\uBCF4\uAE30\uC124\uC815
@@ -472,7 +470,7 @@ FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911
 FR-Designer_Export-PDF=PDF\uC11C\uC2DD
 FR-Designer_Button_OK=\uD655\uC778
 FR-Designer_Button_Cancel=\uCDE8\uC18C
-FR-Designer_JavaScript=
+FR-Designer_JavaScript=\uC790\uBC14\uC2A4\uD06C\uB9BD\uD2B8
 FR-Designer_JavaScript_Form_Submit=
 FR-Designer_JavaScript_Commit_to_Database=
 FR-Designer_JavaScript_Custom=
@@ -485,7 +483,7 @@ FR-Designer_Attribute=
 FR-Designer_Form_Editing_Listeners=
 FR-Designer_Form_Basic_Properties=
 FR-Designer_DS_Dictionary=
-FR-Designer_Create_Tree=
+FR-Designer_Create_Tree=\uD2B8\uB9AC\uC0DD\uC131
 FR-Designer_Set_Callback_Function=
 FR-Designer_ConfirmDialog_Content=
 FR-Designer_ConfirmDialog_Title=
@@ -827,7 +825,7 @@ Form-TextArea=\uD14D\uC2A4\uD2B8\uC601\uC5ED
 FR-Designer_Https_Enable=\uC2E4\uD589https
 Widget-Custom_Widget_Config=\uC0AC\uC6A9\uC790\uC815\uC758\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4
 already_exists=\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4.
-FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
+Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
 BackgroundTexture-Sand=\uBAA8\uB798\uC0AC\uC7A5
 Values=\uAC12
 Not_use_a_cell_attribute_table_editing=\uC140\uC18D\uC131\uC73C\uB85C\uD45C\uB97C\uD3B8\uC9D1\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
@@ -859,7 +857,7 @@ RP_Authority_Edit=\uAD8C\uD55C\uD3B8\uC9D1
 Warnning=\uC54C\uB9BC
 RoleName_Can_Not_Be_Null=\uC5ED\uD560\uC774\uB984\uC740\uBE44\uC5B4\uC788\uAC70\uB098\uC911\uBCF5\uB418\uC5B4\uC11C\uB294\uC548\uB429\uB2C8\uB2E4.
 Application=\uC560\uD50C\uB9AC\uCF00\uC774\uC158
-Formula_Dictionary_Display_Examples_Html=<html>\uC2E4\uC81C\uAC12\uBC94\uC704:\
+Formula_Dictionary_Display_Examples_Html=<html>\uC2E4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C<br>\uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100,\uD45C\uC2DC\uAC12: -1, -2, ... , -100. <br>&nbsp;</html>
 ECP-error_pwd=\uBE44\uBC00\uBC88\uD638\uC785\uB825\uC624\uB958
 FR-Hyperlink_ChartHyperlink=\uCC28\uD2B8\uD558\uC774\uD37C\uB9C1\uD06C
 M_Edit-FormatBrush=\uC11C\uC2DD\uD504\uB9B0\uD2B8(B)
@@ -990,7 +988,7 @@ Background-Background_is_NULL=\uBC30\uACBD\uC5C6\uC74C
 FR-Designer_Sytle-FRFont=\uAE00\uAF34
 Gradation=\uB2E8\uACC4
 The_current_list_is_empty=\uD604\uC7AC\uB9AC\uC2A4\uD2B8\uBE44\uC5B4\uC788\uC74C
-Formula_Dictionary_Display_Examples=\\uc2e4\uC81C\uAC12\uBC94\uC704:\
+Formula_Dictionary_Display_Examples=\\uc2e4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C\n \uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100, \n \uD45C\uC2DC\uAC12: -1, -2, ... , -100.
 Schedule-Template_Parameter=\uD15C\uD50C\uB9BF\uB9E4\uAC1C\uBCC0\uC218
 JSShow=\uB3D9\uC801\uB514\uC2A4\uD50C\uB808\uC774
 Level_coordinates=\uACC4\uCE35\uBCF4\uC870\uC88C\uD45C
@@ -1155,7 +1153,7 @@ Multiline=\uC5EC\uB7EC\uD589\uD3B8\uC9D1
 Datasource-Convert_Charset=\uCF54\uB529\uC804\uD658
 DashBoard-ConnectionList=\uB370\uC774\uD130\uB9C1\uD06C
 Utils-Submit_Forcibly=\uC81C\uCD9C\uAC15\uD589
-FR-Designer_Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
+Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
 Logout=\uB098\uAC00\uAE30
 FR-Designer_Show_Blank_Row=\uACF5\uBC31\uD589\uBCF4\uCDA9
 FR-Base_Format=\uC11C\uC2DD
@@ -1194,7 +1192,7 @@ Privilege-Selected_None_Of_Any_Items=\uC120\uD0DD\uD55C\uD56D\uC774\uC5C6\uC2B5\
 FRFont-Size=\uD06C\uAE30
 Function-J2EE_server=J2EE\uC11C\uBC84
 FR-Designer_Allow_Blank=\uBE48\uCE78\uD5C8\uC6A9
-FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
+Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 Preference-Horizontal_Scroll_Bar_Visible=\uC218\uD3C9\uC2A4\uD06C\uB864\uBC14\uB97C\uBCFC\uC218\uC788\uC2B5\uB2C8\uB2E4.
 Scope=\uBC94\uC704
 Save_All_Records_In_Memory=\uBAA8\uB4E0\uB808\uCF54\uB4DC\uAC00\uBA54\uBAA8\uB9AC\uC5D0\uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
@@ -1263,7 +1261,7 @@ DateFormat-Custom_Warning=\uBE44\uACE0\uFF1A\uC0AC\uC6A9\uC790\uC815\uC758\uB0A0
 Unit_MM=\uBC00\uB9AC\uBBF8\uD130
 Server-Start=\uC2E4\uD589
 CellPage-Can_Break_On_Paginate=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uC2DC\uB098\uB20C\uC218\uC788\uC74C
-FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
+Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 ComboCheckBox-Start_Symbol=\uC2DC\uC791\uBD80\uD638
 Real=\uC2E4\uC81C
 RWA-Batch_Modify_Cells=\uB300\uB7C9\uC218\uC815\uC140
@@ -1537,7 +1535,7 @@ FR-Designer_Cancel=\uCDE8\uC18C
 Button-Group-Display-Columns=\uC5F4\uC758\uC218\uB97C\uB098\uD0C0\uB0C4
 Widget-Height=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB192\uC774
 Examples=\uC608\uC2DC
-Formula_Dictionary_Display_Example=\uC2E4\uC81C\uAC12\uBC94\uC704:\
+Formula_Dictionary_Display_Example=\uC2E4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C\n\uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100, \uD45C\uC2DC\uAC12: -1, -2, ... , -100.
 StyleAlignment-Horizontal=\uC218\uD3C9\uC815\uB82C
 HyperLink_Must_Alone_Reset=\uC5EC\uB7EC\uAC1C\uD558\uC774\uD37C\uB9C1\uD06C
 ExpandD-Expand_Direction=\uD655\uB300\uBC29\uD5A5
@@ -1711,7 +1709,7 @@ Condition_Display=\uC870\uAC74\uBCF4\uC774\uAE30
 FR-Server-Design_template_unopened=\uD15C\uD50C\uB9BF\uC744\uC5F4\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
 Function-Function_Class_Name=\uD568\uC218\uD074\uB798\uC2A4\uB124\uC784
 Schedule-Template=\uD15C\uD50C\uB9BF\uBA85\uCE6D
-FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
+Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
 Border-Style-Normal=\uC9C1\uAC01\uD14C\uB450\uB9AC
 Top_And_Double_Bottom_Border_Line=\uC704\uD14C\uB450\uB9AC\uC120\uACFC\uB450\uC904\uBC11\uD14C\uB450\uB9AC\uC120
 FR-Server_Embedded_Server_Start=\uB0B4\uC7A5\uB41C\uC11C\uBC84-\uC5F4\uAE30
@@ -1984,4 +1982,22 @@ FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D
 Every=\uAC01
 CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30
 FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
+FR-Designer_Permissions=
+FR-Designer_Form_Button=
+FR-Designer_WF_Name=
+FR-Designer_Role=
+FR-Designer_Double=\uC18C\uC218
+FR-Designer_Query=\uCC3E\uC544\uBCF4\uAE30
+FR-Designer_Font=\uAE00\uAF34
+FR-Designer_Confirm=\uD655\uC778
+FR-Designer_Parameter=\uB9E4\uAC1C\uBCC0\uC218
+FR-Designer-Plugin_Plugin=\uD50C\uB7EC\uADF8\uC778
+FR-Designer_Background=\uBC30\uACBD
+Template=\uD15C\uD50C\uB9BF
+
+FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
+FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
+FR-Designer_Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D
 FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001
 FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A
@@ -12,7 +11,7 @@ FR-Designer-BBSLogin_Switch-Account=\u5207\u6362\u8D26\u53F7
 FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u6D88\u606F
 FR-Designer-BBSLogin_Times=\u6B21
 FR-Designer-BBSLogin_Username-Empty-Tip=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A
-FR-Designer-Basic_More_Color=\u66F4\u591A\u989C\u8272...
+FR-Designer-Basic_More_Color=\u66F4\u591A\u989C\u8272
 FR-Designer-Estate_Any=\u4E0D\u9650
 FR-Designer-Estate_Default_Font=\u9ED8\u8BA4\u5B57\u4F53
 FR-Designer-Estate_Default_Null=\u9ED8\u8BA4\u4E3A\u7A7A
@@ -96,7 +95,7 @@ FR-Designer_Enabled=\u53EF\u7528
 FR-Designer_End-Date=\u7ED3\u675F\u65E5\u671F
 FR-Designer_ExportAndOutput=\u5BFC\u51FA
 FR-Designer_FRFont=\u5B57\u4F53
-FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u677F
+FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u7248
 FR-Designer_File=\u6587\u4EF6
 FR-Designer_Filter_Conditions=\u8FC7\u6EE4\u6761\u4EF6
 FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u5E76\u5206\u4EAB
@@ -106,7 +105,7 @@ FR-Designer_Font-Family=\u5B57\u4F53\u540D\u79F0
 FR-Designer_Font-Size=\u5B57\u4F53\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u5141\u8BB8\u62D6\u5165\u8868\u5355\u4E3B\u4F53
 FR-Designer_Forbid_Drag_into_Para_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u80FD\u62D6\u5165\u53C2\u6570\u9762\u677F
-FR-Designer_Foreground=\u989C\u8272
+FR-Designer_Foreground=\u524D\u666F
 FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u6682\u4E0D\u652F\u6301\u8868\u5355\u6743\u9650\u7F16\u8F91
 FR-Designer_Form-Report=\u62A5\u8868\u5757
 FR-Designer_Form_EmbeddedTD=\u8868\u5355(\u5185\u7F6E\u6570\u636E)
@@ -163,7 +162,7 @@ FR-Designer_Refresh_Parameter_In_SQL=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53
 FR-Designer_Reg_Expressions=\u6B63\u5219\u8868\u8FBE\u5F0F
 FR-Designer_Reg_Max_Length=\u6700\u5927\u957F\u5EA6
 FR-Designer_Reg_Min_Length=\u6700\u5C0F\u957F\u5EA6
-FR-Designer_ReportColumns-Columns=\u5206\u680F
+FR-Designer_ReportColumns-Columns=\u5217\u5206\u680F
 FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F
 FR-Designer_RichText=\u63D2\u5165\u5BCC\u6587\u672C
 FR-Designer_RichTextEditor=\u5BCC\u6587\u672C\u7F16\u8F91\u5668
@@ -358,7 +357,7 @@ FR-Designer-Series_Dismenber_As_Single=\u8FDE\u7EED\u5206\u9694\u7B26\u89C6\u4E3
 FR-Designer_KeyPoint=\u5173\u952E\u8282\u70B9
 FR-Designer_loadedTreeModel=\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
 FR-Designer-Failed_to_load_the_plugin=\u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6\uFF0C\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF1A
-FR-Designer-Plugin_Please_Update_Jar=\u8BF7\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C
+FR-Designer-Plugin_Please_Update_Jar=\u8BF7\u66F4\u65B0Jar\u5305\u81F3\:
 FR-Designer-Invalid_Page_Number=\u65E0\u6548\u9875\u7801
 FR-Designer_Get-CubeGetting=\u83B7\u53D6cube
 FR-Designer_XMLA_Database=\u6570\u636E\u5E93
@@ -826,7 +825,7 @@ Form-TextArea=\u6587\u672C\u57DF
 FR-Designer_Https_Enable=\u542F\u7528https
 Widget-Custom_Widget_Config=\u81EA\u5B9A\u4E49\u63A7\u4EF6
 already_exists=\u5DF2\u7ECF\u5B58\u5728
-FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
+Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
 BackgroundTexture-Sand=\u6C99\u6EE9
 Values=\u503C
 Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u5355\u5143\u683C\u5C5E\u6027\u8868\u7F16\u8F91
@@ -858,7 +857,7 @@ RP_Authority_Edit=\u6743\u9650\u7F16\u8F91
 Warnning=\u63D0\u9192
 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8BB8\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u91CD\u590D
 Application=\u5E94\u7528\u7A0B\u5E8F
-Formula_Dictionary_Display_Examples_Html=<html>\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \
+Formula_Dictionary_Display_Examples_Html=<html>\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100),\u5BF9\u5B9E\u9645\u503C\u8303\u56F4\u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C<br>\u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100,\u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002<br>&nbsp;</html>
 ECP-error_pwd=\u5BC6\u7801\u9519\u8BEF
 FR-Hyperlink_ChartHyperlink=\u56FE\u8868\u8D85\u94FE
 M_Edit-FormatBrush=\u683C\u5F0F\u5237(B)
@@ -989,7 +988,7 @@ Background-Background_is_NULL=\u6CA1\u6709\u80CC\u666F
 FR-Designer_Sytle-FRFont=\u5B57\u4F53
 Gradation=\u5C42\u6B21
 The_current_list_is_empty=\u5F53\u524D\u5217\u8868\u4E3A\u7A7A
-Formula_Dictionary_Display_Examples=\ \u5B9E\u9645\u503C\u8303\u56F4\u4E3A \
+Formula_Dictionary_Display_Examples=\ \u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100),\u5BF9\u5B9E\u9645\u503C\u8303\u56F4\n \u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C\n \u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100, \n \u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002
 Schedule-Template_Parameter=\u6A21\u677F\u53C2\u6570
 JSShow=\u52A8\u6001\u5C55\u793A
 Level_coordinates=\u5C42\u6B21\u5750\u6807
@@ -1154,7 +1153,7 @@ Multiline=\u591A\u884C\u7F16\u8F91
 Datasource-Convert_Charset=\u7F16\u7801\u8F6C\u6362
 DashBoard-ConnectionList=\u6570\u636E\u8FDE\u63A5
 Utils-Submit_Forcibly=\u5F3A\u884C\u63D0\u4EA4
-FR-Designer_Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
+Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
 Logout=\u9000\u51FA
 FR-Designer_Show_Blank_Row=\u8865\u5145\u7A7A\u767D\u884C
 FR-Base_Format=\u683C\u5F0F
@@ -1193,7 +1192,7 @@ Privilege-Selected_None_Of_Any_Items=\u6CA1\u6709\u9009\u4E2D\u4EFB\u4F55\u4E00\
 FRFont-Size=\u5927\u5C0F
 Function-J2EE_server=J2EE\u670D\u52A1\u5668
 FR-Designer_Allow_Blank=\u5141\u8BB8\u4E3A\u7A7A
-FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
+Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
 Preference-Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u6EDA\u52A8\u6761\u53EF\u89C1
 Scope=\u8303\u56F4
 Save_All_Records_In_Memory=\u6240\u6709\u8BB0\u5F55\u90FD\u4FDD\u5B58\u5728\u5185\u5B58\u4E2D
@@ -1262,7 +1261,7 @@ DateFormat-Custom_Warning=\u6CE8\uFF1A\u81EA\u5B9A\u4E49\u65E5\u671F\u683C\u5F0F
 Unit_MM=\u6BEB\u7C73
 Server-Start=\u542F\u52A8
 CellPage-Can_Break_On_Paginate=\u5206\u9875\u65F6\u53EF\u4EE5\u65AD\u5F00
-FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
+Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
 ComboCheckBox-Start_Symbol=\u8D77\u59CB\u7B26
 Real=\u5B9E\u9645
 RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5355\u5143\u683C
@@ -1371,7 +1370,7 @@ Not_Exsit=\u4E0D\u5B58\u5728\u4E8E\u62A5\u8868
 Utils-Insert_Row=\u63D2\u5165\u884C
 Utils-Delete_Row=\u5220\u9664\u884C
 not_support_authority_edit=\u8BE5\u5143\u7D20\u4E0D\u652F\u6301\u6743\u9650\u63A7\u5236
-Formula_Tips=\u516C\u5F0F\u5FC5\u987B\u4EE5"\
+Formula_Tips=\u516C\u5F0F\u5FC5\u987B\u4EE5"\="\u53F7\u5F00\u5934\uFF01
 FR-Action_Copy=\u590D\u5236
 Compile_Success=\u7F16\u8BD1\u6210\u529F
 BackgroundTexture-RecycledPaper=\u518D\u751F\u7EB8
@@ -1536,7 +1535,7 @@ FR-Designer_Cancel=\u53D6\u6D88
 Button-Group-Display-Columns=\u5C55\u793A\u5217\u6570
 Widget-Height=\u63A7\u4EF6\u9AD8\u5EA6
 Examples=\u4F8B\u5B50
-Formula_Dictionary_Display_Example=\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \
+Formula_Dictionary_Display_Example=\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100), \u5BF9\u5B9E\u9645\u503C\u8303\u56F4\u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C\n\u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100, \u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002
 StyleAlignment-Horizontal=\u6C34\u5E73\u5BF9\u9F50
 HyperLink_Must_Alone_Reset=\u591A\u4E2A\u8D85\u94FE
 ExpandD-Expand_Direction=\u6269\u5C55\u65B9\u5411
@@ -1710,7 +1709,7 @@ Condition_Display=\u6761\u4EF6\u663E\u793A
 FR-Server-Design_template_unopened=\u65E0\u6CD5\u6253\u5F00\u6A21\u7248
 Function-Function_Class_Name=\u51FD\u6570\u7C7B\u540D
 Schedule-Template=\u6A21\u677F\u540D\u79F0
-FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
+Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
 Border-Style-Normal=\u76F4\u89D2\u8FB9\u6846
 Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u53CC\u4E0B\u6846\u7EBF
 FR-Server_Embedded_Server_Start=\u5167\u7F6E\u7684\u670D\u52A1\u5668-\u6253\u5F00
@@ -1987,4 +1986,18 @@ FR-Designer_Role=\u89D2\u8272
 FR-Designer_Permissions=\u6743\u9650
 FR-Designer_Form_Button=\u6309\u94AE
 FR-Designer_WF_Name=\u540D\u79F0
+FR-Designer_Double=\u5C0F\u6570
+FR-Designer_Query=\u67E5\u8BE2
+FR-Designer_Font=\u5B57\u4F53
+FR-Designer_Confirm=\u786E\u8BA4
+FR-Designer_Parameter=\u53C2\u6570
+FR-Designer-Plugin_Plugin=\u63D2\u4EF6
+FR-Designer_Background=\u80CC\u666F
+Template=\u6A21\u7248
+
+FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
+FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
+FR-Designer_Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
 FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1,4 +1,3 @@
-# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016
 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F
 FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B
 FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A
@@ -9,10 +8,10 @@ FR-Designer-BBSLogin_Password=\u5BC6  \u78BC
 FR-Designer-BBSLogin_Password-Empty-Tip=\u5BC6\u78BC\u4E0D\u80FD\u70BA\u7A7A
 FR-Designer-BBSLogin_Register-Account=\u8A3B\u518A\u5E33\u865F
 FR-Designer-BBSLogin_Switch-Account=\u5207\u63DB\u5E33\u865F
-FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u6D88\u606F
+FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u8A0A\u606F
 FR-Designer-BBSLogin_Times=\u6B21
 FR-Designer-BBSLogin_Username-Empty-Tip=\u4F7F\u7528\u8005\u70BA\u7A7A\u63D0\u793A
-FR-Designer-Basic_More_Color=\u66F4\u591A\u984F\u8272...
+FR-Designer-Basic_More_Color=\u66F4\u591A\u984F\u8272
 FR-Designer-Estate_Any=\u4E0D\u9650
 FR-Designer-Estate_Default_Font=\u9810\u8A2D\u5B57\u9AD4
 FR-Designer-Estate_Default_Null=\u9810\u8A2D\u70BA\u7A7A
@@ -106,7 +105,7 @@ FR-Designer_Font-Family=\u5B57\u9AD4\u540D\u7A31
 FR-Designer_Font-Size=\u5B57\u9AD4\u5927\u5C0F
 FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8A72\u5C0D\u8C61\u4E0D\u5141\u8A31\u62D6\u5165\u8868\u55AE\u4E3B\u9AD4
 FR-Designer_Forbid_Drag_into_Para_Pane=\u8A72\u5C0D\u8C61\u4E0D\u80FD\u62D6\u5165\u53C3\u6578\u9762\u677F
-FR-Designer_Foreground=\u984F\u8272
+FR-Designer_Foreground=\u5B57\u5F62\u8272\u5F69
 FR-Designer_Form-AuthorityEdited_Cannot_be_Supported=\u66AB\u4E0D\u652F\u6301\u8868\u55AE\u6B0A\u9650\u7DE8\u8F2F
 FR-Designer_Form-Report=\u5831\u8868\u683C\u5F0F
 FR-Designer_Form_EmbeddedTD=\u5167\u5D01\u683C\u5F0F
@@ -122,7 +121,7 @@ FR-Designer_Hyperlink-Form_link=\u7576\u524D\u8868\u55AE\u5C0D\u8C61
 FR-Designer_IDCard=\u8EAB\u4EFD\u8B49
 FR-Designer_Icon=\u5716\u793A
 FR-Designer_Index=\u7D22\u5F15
-FR-Designer_Input_Rule=\u8F38\u5165\u898F\u5247
+FR-Designer_Input_Rule=\u586B\u5BEB\u898F\u5247
 FR-Designer_Language_Default=\u9810\u8A2D\u8A9E\u8A00
 FR-Designer_Layout=\u5E03\u5C40\u3001\u898F\u5283
 FR-Designer_Layout-HBox=\u6C34\u5E73\u76D2\u5B50\u5E03\u5C40
@@ -152,7 +151,7 @@ FR-Designer_Para-Body=\u53C3\u6578\u672C\u6587
 FR-Designer_Parameters=\u53C3\u6578
 FR-Designer_Phone=\u96FB\u8A71
 FR-Designer_PostCode=\u90F5\u905E\u5340\u865F
-FR-Designer_Present=\u7576\u4E0B
+FR-Designer_Present=\u6A21\u5F0F
 FR-Designer_Preview=\u9810\u89BD
 FR-Designer_Preview-Data-Confusion=\u6DF7\u6DC6\u8CC7\u6599\u9810\u89BD
 FR-Designer_Product_Demo=\u7522\u54C1\u5C55\u793A
@@ -162,9 +161,9 @@ FR-Designer_Refresh_Parameter_In_SQL=\u5728SQL\u4E2D\u91CD\u65B0\u6574\u7406\u76
 FR-Designer_Reg_Expressions=\u6B63\u5247\u8868\u9054\u5F0F
 FR-Designer_Reg_Max_Length=\u6700\u5927\u9577\u5EA6
 FR-Designer_Reg_Min_Length=\u6700\u5C0F\u9577\u5EA6
-FR-Designer_ReportColumns-Columns=\u5831\u8868\u6B04\u4F4D
+FR-Designer_ReportColumns-Columns=\u6B04\u5206\u6B04
 FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F
-FR-Designer_RichText= RTF
+FR-Designer_RichText=RTF
 FR-Designer_RichTextEditor=RTF\u7DE8\u8F2F\u5668
 FR-Designer_Row=\u5217
 FR-Designer_Row_Dimension=\u5217\u7DAD\u5EA6
@@ -195,7 +194,7 @@ FR-Designer_VerticalBoxLayout=\u6A6B\u5411\u4F48\u5C40
 FR-Designer_Visible=\u53EF\u898B
 FR-Designer_WLayout-Border-ToolTips=\u908A\u754C\u4F48\u5C40
 FR-Designer_WaterMark=\u6C34\u5370
-FR-Designer_Widget=\u5C0F\u5DE5\u5177
+FR-Designer_Widget=\u63A7\u5236\u9805
 FR-Designer_Widget-Settings=\u8A2D\u5B9A
 FR-Designer_Widget-Visible=\u53EF\u898B
 FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7DAD\u8CC7\u6599\u96C6\u53D6\u6578\u524D\uFF0C\u60A8\u9996\u5148\u9700\u8981\u4E00\u500B\u53EF\u6210\u529F\u9023\u63A5\u7684\u591A\u7DAD\u8CC7\u6599\u5EAB\u9023\u63A5\u3002\n\u8A2D\u5B9A\u5B8C\u8CC7\u6599\u9023\u63A5\u5F8C\uFF0C\u67E5\u8A62\u8CC7\u6599\u6642,\u6709\u5169\u7A2E\u4E0D\u540C\u7684\u53D6\u6578\u624B\u6BB5\u3002\n1.\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF1A\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u9069\u7528\u65BCFineBI\u53CA\u5176\u4ED6\u591A\u7DAD\u8CC7\u6599\u5EAB\u3002\n\u4F7F\u7528\u7C21\u55AE\u901A\u7528\u67E5\u8A62\uFF0CFR\u5C07\u81EA\u52D5\u8B80\u53D6\u9078\u64C7cube\u7684\u5C64\u6B21\u7D50\u69CB\uFF0C\u60A8\u53EF\u4EE5\u76F4\u63A5\u9078\u64C7\u6240\u9700\u7684\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\uFF0C\u4E26\u6DFB\u52A0\u7BE9\u9078\u689D\u4EF6\uFF0CFR\u6703\u6839\u64DA\u60A8\u7684\u9078\u64C7\u81EA\u52D5\u67E5\u8A62\u8CC7\u6599\u3002\n\u7C21\u55AE\u901A\u7528\u67E5\u8A62\u50C5\u652F\u6301\u7DAD\u5EA6\u53CA\u5EA6\u91CF\u503C\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u5728\u5EA6\u91CF\u503C\u53CA\u7DAD\u5EA6\u8A2D\u5B9A\u4E2D\uFF0C\u76EE\u524D\u60A8\u53EA\u80FD\u9078\u64C7\u6240\u9700\u7DAD\u5EA6\uFF0C\u7121\u6CD5\u624B\u52D5\u4FEE\u6539\u3002\n\u904E\u6FFE\u689D\u4EF6\u63A1\u7528OPEN SQL\u8A9E\u6CD5\uFF0C\u60A8\u53EF\u4EE5\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\n2.\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF1A\n\u4F7F\u7528\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\uFF0C\u60A8\u53EF\u4EE5\u81EA\u5B9A\u7FA9\u7FA9MDX\u8A9E\u53E5\u67E5\u8A62\u6240\u9700\u7D50\u679C\u3002\n\u6CE8\u610F\uFF0C\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62\u4E5F\u53EA\u652F\u6301\u5169\u500B\u8EF8\u7684\u67E5\u8A62\u3002\n\u60A8\u53EF\u9375\u5165${abc}\u4F5C\u70BA\u4E00\u500B\u53C3\u6578\uFF0C\u7528\u6CD5\u540C\u8CC7\u6599\u5EAB\u8CC7\u6599\u96C6\u3002\nFineBI\u7684cube\u4E0D\u652F\u6301MDX\u67E5\u8A62\u3002
@@ -357,7 +356,7 @@ FR-Designer-Series_Dismenber_As_Single=\u9023\u7E8C\u5206\u9694\u7B26\u8996\u70B
 FR-Designer_KeyPoint=\u95DC\u9375\u7BC0\u9EDE
 FR-Designer_loadedTreeModel=\u52A0\u8F09\u5931\u6557,\u8ACB\u6AA2\u67E5\u5F8C\u91CD\u8A66
 FR-Designer-Failed_to_load_the_plugin=\u7121\u6CD5\u52A0\u8F09\u63D2\u4EF6\uFF0C\u8ACB\u66F4\u65B0\u63D2\u4EF6\uFF1A
-FR-Designer-Plugin_Please_Update_Jar=\u8ACB\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C
+FR-Designer-Plugin_Please_Update_Jar=\u8ACB\u66F4\u65B0Jar\u5305\u81F3\:
 FR-Designer-Invalid_Page_Number=\u7121\u6548\u9801\u78BC
 FR-Designer_Get-CubeGetting=\u7372\u53D6cube
 FR-Designer_XMLA_Database=\u8CC7\u6599\u5EAB
@@ -561,19 +560,19 @@ FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u633F\u4EF6\u7248\u67
 FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
 FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\u3002
 FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548\u3002
-FR-Designer_Background_Null=
-FR-Designer_Background_Color=
-FR-Designer_Background_Texture=
-FR-Designer_Background_Pattern=
-FR-Designer_Background_Gradient_Color=
-FR-Designer_Background_Image=
-FR-Designer_Background_Clear=
-FR-Designer_Background_Image_Select=
+FR-Designer_Background_Null=\u6C92\u6709\u80CC\u666F
+FR-Designer_Background_Color=\u984F\u8272
+FR-Designer_Background_Texture=\u7D0B\u7406
+FR-Designer_Background_Pattern=\u5716\u6848
+FR-Designer_Background_Gradient_Color=\u6F38\u8B8A\u8272
+FR-Designer_Background_Image=\u5716\u7247
+FR-Designer_Background_Clear=\u6E05\u9664
+FR-Designer_Background_Image_Select=\u9078\u64C7\u5716\u7247
 FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\uFF0C\u7121\u6CD5\u7C98\u8CBC\uFF01
 FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
-FR-Designer_Initial_Background_Tips=
-FR-Designer_Mouse_Move_Tips=
-FR-Designer_Mouse_Click_Tips=
+FR-Designer_Initial_Background_Tips=\u6309\u9215\u7684\u521D\u59CB\u80CC\u666F
+FR-Designer_Mouse_Move_Tips=\u6ED1\u9F20\u79FB\u52D5\u5230\u6309\u9215\u4E0A\u7684\u80CC\u666F\uFF0C\u82E5\u7121\u5247\u4E0D\u6539\u8B8A\u80CC\u666F
+FR-Designer_Mouse_Click_Tips=\u6ED1\u9F20\u9EDE\u64CA\u6309\u9215\u6642\u80CC\u666F\uFF0C\u82E5\u7121\u5247\u4E0D\u6539\u8B8A\u80CC\u666F
 FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
 FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
 FR-Designer_Chart_Log_Base=\u5E95\u6578
@@ -582,20 +581,20 @@ FR-Designer_Style=\u6A23\u5F0F
 FR-Designer_Color=\u984F\u8272
 FR-Designer_Border=\u6846\u7DDA
 FR-Designer_Background-Pattern=\u5716\u6848
-FR-Designer_SimpleDetail_Report=
-FR-Designer_Reset=
-FR-Designer_AllCategories=
-FR-Designer-Selected_Widget=
-FR-Designer_SimpleCross_Report=
-FR-Designer_LocalWidget=
+FR-Designer_SimpleDetail_Report=\u7C21\u55AE\u660E\u7D30\u8868
+FR-Designer_Reset=\u53D6\u6D88\u522A\u9664
+FR-Designer_AllCategories=\u6240\u6709\u5206\u985E
+FR-Designer-Selected_Widget=\u7576\u524D\u63A7\u5236\u9805
+FR-Designer_SimpleCross_Report=\u7C21\u55AE\u4EA4\u53C9\u8868
+FR-Designer_LocalWidget=\u672C\u5730\u7D44\u4EF6\u5EAB
 FR-Designer_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
-FR-Designer_Install_Template=
-FR-Designer_Allow-Blank=
-FR-Designer_Delete_Template=
-FR-Designer_Download_Template=
-FR-Designer_DoubleLayer_Report=
-FR-Designer_Validate=
+FR-Designer_Install_Template=\u5B89\u88DD\u7D44\u4EF6
+FR-Designer_Allow-Blank=\u5141\u8A31\u70BA\u7A7A
+FR-Designer_Delete_Template=\u522A\u9664\u7D44\u4EF6
+FR-Designer_Download_Template=\u4E0B\u8F09\u7D44\u4EF6
+FR-Designer_DoubleLayer_Report=\u96D9\u5C64\u8868\u982D
+FR-Designer_Validate=\u6821\u9A57
 CellWrite-InsertRow_NULL=\u7A7A\u503C
 DashBoard-ChartFloat=\u5716\u8868
 contact_info=\u806F\u7E6B\u8A0A\u606F(\u9078\u586B)
@@ -611,7 +610,7 @@ FR-Designer_Number=\u6578\u5B57
 FR-Designer-Widget-Style_Common=\u666E\u901A
 M-Save_As=\u53E6\u5B58\u70BA
 Following_parameters_are_not_generated=\u4EE5\u4E0B\u53C3\u6578\u672A\u751F\u6210
-FR-Designer-Basic_Activation_Key_Copy_OK=Key has been copy to clipboard
+FR-Designer-Basic_Activation_Key_Copy_OK=\u5DF2\u8907\u88FD\u5230\u526A\u8CBC\u677F
 Utils-Current_Sheet=\u7576\u524D\u7684Sheet
 ConditionB-is_less_than=\u5C0F\u65BC
 BorderLayout-West=\u897F
@@ -624,13 +623,13 @@ M-Page_Setup=\u9801\u9762\u8A2D\u5B9A
 DashBoard-FormBook=\u8868\u55AE
 X-Coordinate=\u6A6B\u5EA7\u6A19
 Style-Line_Spacing=\u5217\u9593\u8DDD
-FR-Designer_Plugin_Should_Update_Title=Warning
+FR-Designer_Plugin_Should_Update_Title=\u63D2\u4EF6\u5347\u7D1A\u63D0\u9192
 Server-Define_Data_Connection=\u5B9A\u7FA9\u8CC7\u6599\u9023\u63A5
 BarInside=\u67F1\u5B50\u5167\u5074
 Border-Color=\u6846\u7DDA\u984F\u8272
 NotAllow=\u4E0D\u5408\u6CD5
 Utils-File_type=\u6A94\u6848\u985E\u578B
-FR-Designer-Plugin_Install_From_Local=Install plugin from local file
+FR-Designer-Plugin_Install_From_Local=\u5F9E\u672C\u5730\u6587\u4EF6\u5B89\u88DD
 Summary_Method=\u532F\u7E3D\u65B9\u5F0F
 Select_Specified_Grouping=\u9078\u64C7\u81EA\u5B9A\u7FA9\u5206\u7D44
 HF-Number_of_Page=\u7E3D\u9801\u6578
@@ -638,13 +637,13 @@ FR-Designer-Tree_Height=\u9AD8\u5EA6
 Owner=\u4E3B
 Home=\u4E3B\u9801
 FR-Server_Embedded_Server_Stop=\u5167\u7F6E\u7684\u4F3A\u670D\u5668-\u505C\u6B62
-FR-Designer-Plugin_Detecting_Update=Detecting update
+FR-Designer-Plugin_Detecting_Update=\u6B63\u5728\u6AA2\u6E2C\u66F4\u65B0
 HF-Whether_to_define_the_selected_type=\u662F\u5426\u5B9A\u7FA9\u9078\u4E2D\u7684\u985E\u578B
 StyleAlignment-Right=\u9760\u53F3\u5C0D\u9F4A
 FR-Designer_Alignment-Style=\u5C0D\u9F4A\u65B9\u5F0F
 PageSetup-Title_Start_Column=\u91CD\u8907\u6A19\u984C\u6B04
 Tree-Mutiple_Selection_Or_Not=\u591A\u9078
-FR-Designer-Plugin_Search=Search
+FR-Designer-Plugin_Search=\u641C\u7D22
 Choose_Role=\u6B0A\u9650\u63A7\u5236
 Append_Delete_Row_Message=\u6CE8\u610F\uFF01\u6307\u5B9A\u7684\u5132\u5B58\u683C\u9700\u8981\u8A2D\u5B9A\u64F4\u5C55\u5C6C\u6027
 Form-ComboBox=\u4E0B\u62C9\u6846
@@ -676,7 +675,7 @@ Need_Min_Value=\u9700\u8981\u6700\u5C0F\u503C
 Allow_Blank=\u5141\u8A31\u70BA\u7A7A\u767D
 CellWrite-InsertRow_DEFAULT=\u9810\u8A2D\u503C
 Widget-Load_By_Complete=\u5B8C\u5168\u8F09\u5165
-FR-Designer-Basic_Only_Submit_Current_Sheet=
+FR-Designer-Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u7576\u524Dsheet
 Sort-Sort_Order=\u6392\u5217\u9806\u5E8F
 File-File_Size_Limit=\u6A94\u6848\u5927\u5C0F\u9650\u5236
 PrintP-Print=\u5217\u5370(T)
@@ -685,7 +684,7 @@ Preference-Setting_Colors=\u984F\u8272\u914D\u7F6E
 Judge=\u5224\u65B7
 Image-Adjust=\u9069\u61C9
 Collect-User_Information_DES=\u7528\u6236\u8A0A\u606F\u78BC\u53EA\u662F\u7528\u4F86\u6536\u96C6\u4F7F\u7528\u8005\u8A0A\u606F\u7684\uFF0C\u53EA\u8981\u9EDE\u64CA\u4E0A\u9762\u7684"\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC"\u6309\u9215\uFF0C\u5C31\u6703\u5F48\u51FA\u4E00\u500B\u65B0\u7684\u700F\u89BD\u5668\u7A97\u9AD4\uFF0C\u767B\u9304\u5230\u7522\u54C1\u5B98\u65B9\u7DB2\u7AD9\u7372\u5F97\u9019\u500B\u7528\u6236\u8A0A\u606F\u78BC\uFF0C\u6574\u500B\u7A0B\u5E8F\u53EA\u9700\u89813\u5206\u9418\uFF0C\u53EA\u9700\u8981\u64CD\u4F5C\u4E00\u6B21\uFF0C\u800C\u4E14\u5B8C\u5168\u514D\u8CBB\u3002
-FR-Designer_Plugin_Normal_Update_From_Local=Update from local file
+FR-Designer_Plugin_Normal_Update_From_Local=\u5F9E\u672C\u5730\u6A94\u6848\u66F4\u65B0
 BackgroundTexture-Canvas=\u756B\u5E03
 BarOutSide=\u67F1\u5B50\u5916\u5074
 Preview_ToolTips=\u9810\u89BD\u63D0\u793A
@@ -715,7 +714,7 @@ FR-Designer_Indent-Pixel=\u50CF\u7D20
 FR-Designer_Unit_MM=\u516C\u5398
 IDLE=\u7A7A\u9592
 FRFont-Underline=\u4E0B\u5283\u7DAB
-FR-Designer-Plugin_Read_Plugin_List_Error=Error to read plugin list
+FR-Designer-Plugin_Read_Plugin_List_Error=\u53BB\u8B80\u63D2\u4EF6\u5217\u8868\u6642\u767C\u751F\u932F\u8AA4
 Type_Set=\u985E\u578B\u8A2D\u5B9A
 M_Format_A-Cell_Attributes=\u5176\u4ED6\u5C6C\u6027
 CellWrite-Show_As_Image=\u7528\u5716\u7247\u986F\u793A\u5167\u5BB9
@@ -740,7 +739,7 @@ Hgap=\u6C34\u5E73\u9593\u9699
 FR-Designer_Enter-New-FileName=\u8ACB\u8F38\u5165\u65B0\u7684\u6A94\u6848\u540D
 Verify_Fail=\u6821\u9A57\u5931\u6557
 CellWrite-InsertRow_Policy=\u63D2\u5165\u5217\u7B56\u7565
-FR-Designer-Plugin_Illegal_Plugin_Zip=Illegal plugin zip
+FR-Designer-Plugin_Illegal_Plugin_Zip=\u4E0D\u662F\u5408\u6CD5\u7684\u63D2\u4EF6\u5305
 RCodeVersion=\u7248\u672C
 Convert=\u8F49\u63DB
 Please_Drag=\u8ACB\u62D6\u5165\u5217\u6B04\u6B04\u4F4D\u3001\u532F\u7E3D\u6B04\u4F4D
@@ -795,7 +794,7 @@ read_time_out=\u52A0\u8F09\u8D85\u6642
 JavaScript-Commit_to_Database=\u63D0\u4EA4\u5165\u5EAB
 DS-Relation_TableData=\u95DC\u806F\u8CC7\u6599\u96C6
 CellWrite-Page_Before_Row=\u5217\u524D\u5206\u9801
-FR-Designer-Plugin_Load_Plugins_From_Server=Loading plugins from store
+FR-Designer-Plugin_Load_Plugins_From_Server=\u6B63\u5728\u5F9E\u63D2\u4EF6\u5546\u5E97\u7372\u53D6\u6578\u64DA
 D-Dispaly_Divide_Result_Set_into_Groups=\u5C07\u7D50\u679C\u96C6\u9032\u884C\u5206\u7D44
 Closed=\u5DF2\u95DC\u9589
 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
@@ -810,7 +809,7 @@ No-Privilege=\u6C92\u6709\u6B0A\u9650
 ReportColumns-Repeat_Column=\u91CD\u8907\u6B04\u5E8F\u6B04
 SecondGraduationUnit=\u6B21\u8981\u523B\u5EA6\u55AE\u4F4D
 Form-Widget_Property_Value=\u5C6C\u6027\u503C
-GIVE-NAME=Give Name
+GIVE-NAME=\u547D\u540D
 FR-Designer_Rename=\u91CD\u547D\u540D
 Utils-Merge_Cell=\u5408\u5E76\u5132\u5B58\u683C
 Style-Spacing_After=\u6BB5\u5F8C
@@ -826,14 +825,14 @@ Form-TextArea=\u6587\u672C\u57DF
 FR-Designer_Https_Enable=\u555F\u7528https
 Widget-Custom_Widget_Config=\u81EA\u5B9A\u7FA9\u63A7\u5236\u9805
 already_exists=\u5DF2\u7D93\u5B58\u5728
-FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
+Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
 BackgroundTexture-Sand=\u6C99\u7058
 Values=\u503C
 Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u5132\u5B58\u683C\u5C6C\u6027\u8868\u7DE8\u8F2F
 Root=\u6839\u7BC0\u9EDE
 cycle=\u5468\u671F
 open-new-form-tip=\u7576\u524D\u6A21\u677F\u70BA711\u4EE5\u4E0B\u7248\u672C\u88FD\u4F5C, \u7121\u6CD5\u517C\u5BB9, \u4E0D\u80FD\u6253\u958B. \u5047\u5982\u60F3\u6253\u958B\u4FEE\u6539\u6B64\u8868\u55AE, \u8ACB\u4F7F\u7528\u5C0D\u61C9\u7248\u672C\u8A2D\u8A08\u5668\u6253\u958B.
-Support-Current_Auto_Complete_Shortcut=Current Shortcut
+Support-Current_Auto_Complete_Shortcut=\u7576\u524D\u5FEB\u6377\u9375
 GROUPING_MODE=\u666E\u901A\u5206\u7D44
 DBCP_MAX_IDLE=\u6700\u5927\u7A7A\u9591\u9023\u63A5\u6578
 BackgroundTexture-BlueTissuePaper=\u85CD\u8272\u7802\u7D19
@@ -845,7 +844,7 @@ PageSetup-Placement_Center_on_Page=\u7F6E\u4E2D\u65B9\u5F0F
 sure_to_delete=\u78BA\u8A8D\u522A\u9664
 Already_exists_not_add_repeat=\u5DF2\u7D93\u5B58\u5728\uFF0C\u8ACB\u4E0D\u8981\u91CD\u8907\u65B0\u589E
 Axis_Title=\u8EF8\u6A19\u984C
-FR-Designer-Plugin_Install_Failed=Install failed
+FR-Designer-Plugin_Install_Failed=\u63D2\u4EF6\u5B89\u88DD\u5931\u6557
 FR-Designer-Widget-Style_Frame=\u6846\u67B6
 MainGraduationUnit=\u4E3B\u8981\u523B\u5EA6\u55AE\u4F4D
 Second_Axis=\u6B21\u5750\u6A19\u8EF8
@@ -858,7 +857,7 @@ RP_Authority_Edit=\u6B0A\u9650\u7DE8\u8F2F
 Warnning=\u63D0\u9192
 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8A31\u70BA\u7A7A\u4E14\u4E0D\u80FD\u91CD\u8907
 Application=\u61C9\u7528\u7A0B\u5F0F
-Formula_Dictionary_Display_Examples_Html=
+Formula_Dictionary_Display_Examples_Html=<html>\u5BE6\u969B\u503C\u7BC4\u570D\u70BA \=range(100),\u5C0D\u5BE6\u969B\u503C\u7BC4\u570D\u5167\u7684\u6BCF\u500B$$$\u7684\u986F\u793A\u516C\u5F0F\u70BA \=0 - $$$\uFF0C<br>\u5247\u6700\u7D42\u7684\u7D50\u679C\u5BE6\u969B\u503C\u70BA1, 2, ..., 100,\u986F\u793A\u503C\u70BA-1, -2, ... , -100\u3002<br>&nbsp;</html>
 ECP-error_pwd=\u5BC6\u78BC\u932F\u8AA4
 FR-Hyperlink_ChartHyperlink=\u5716\u8868\u8D85\u93C8
 M_Edit-FormatBrush=\u8907\u88FD\u683C\u5F0F(B)
@@ -881,7 +880,7 @@ Parameter-Boolean=\u5E03\u723E\u578B
 FRFont-Strikethrough=\u522A\u9664\u7DDA
 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
 Form-All_Files=\u5168\u90E8\u6A94\u6848
-DBCP_NUM_TEST_PER_EVCTION_RUN=\u7A7A\u9591\u93C8\u63A5\u56DE\u6536\u6AA2\u67E5\u6578
+DBCP_NUM_TEST_PER_EVCTION_RUN=\u7A7A\u9591\u9023\u63A5\u56DE\u6536\u6AA2\u67E5\u6578
 FR-Designer-FRFont_Family=\u540D\u5B57
 Device=\u8A2D\u5099
 M_Insert-Cell=\u5132\u5B58\u683C\u5143\u7D20
@@ -962,10 +961,10 @@ Widget-Load_Type=\u8F09\u5165
 template_unsaved=\u7BC4\u672C\u7121\u6CD5\u5132\u5B58
 check_communication=\u8ACB\u6AA2\u67E5\u7DB2\u8DEF\u901A\u8A0A\u662F\u5426\u6B63\u5E38\u53CA\u4F3A\u670D\u5668\u662F\u5426\u6B63\u5E38\u904B\u884C
 List-Need_Head=\u9700\u8981\u6B04\u8868\u982D
-FR-Designer-Plugin_Has_Been_Installed=Plugin has been installed
+FR-Designer-Plugin_Has_Been_Installed=\u63D2\u4EF6\u5DF2\u5B89\u88DD\uFF0C\u82E5\u60F3\u66F4\u65B0\u63D2\u4EF6\uFF0C\u8ACB\u5207\u63DB\u81F3\u63D2\u4EF6\u66F4\u65B0
 FR-Widget_Tree_And_Table=\u63A7\u5236\u9805\u6A39\u548C\u63A7\u5236\u9805\u8868
 FR-Base_Help=\u8AAA\u660E
-FR-Designer-Plugin_Update_Successful=Update successfully
+FR-Designer-Plugin_Update_Successful=\u63D2\u4EF6\u5347\u7D1A\u6210\u529F\uFF0C\u91CD\u555F\u4F3A\u670D\u5668\u4EE5\u751F\u6548
 August=\u516B\u6708
 LOG-Is_Being_Openned=\u6B63\u5728\u6253\u958B
 BackgroundTexture-Oak=\u6A61\u6728
@@ -973,7 +972,7 @@ Multi_nam_formula=\  \u8CC7\u6599\u96C6\u540D\:                       \u8CC7\u65
 TurnOn=\u958B\u5553
 HJS-Send_Successfully=\u767C\u9001\u6210\u529F
 Mon=\u661F\u671F\u4E00
-Inner_Parameter=Inner Parameter
+Inner_Parameter=\u5167\u7F6E\u53C3\u6578
 Required=\u5FC5\u586B
 Summary=\u532F\u7E3D
 template_unopened=\u7121\u6CD5\u6253\u958B\u7BC4\u672C
@@ -982,14 +981,14 @@ DataFunction-Min=\u6700\u5C0F\u503C
 StyleFormat-Percent=\u767E\u5206\u6BD4
 FR-App-All_Custom=\u81EA\u5B9A\u7FA9
 M_Insert-Data_Column=\u63D2\u5165\u8CC7\u6599\u6B04
-PLEASE=Please
+PLEASE=\u8ACB
 Numbers=\u6578\u76EE
 Release_Lock=\u89E3\u9396
 Background-Background_is_NULL=\u6C92\u6709\u80CC\u666F
 FR-Designer_Sytle-FRFont=\u5B57\u9AD4
 Gradation=\u5C64\u6B21
 The_current_list_is_empty=\u7576\u524D\u6B04\u8868\u70BA\u7A7A
-Formula_Dictionary_Display_Examples=
+Formula_Dictionary_Display_Examples=\ \u5BE6\u969B\u503C\u7BC4\u570D\u70BA \=range(100),\u5C0D\u5BE6\u969B\u503C\u7BC4\u570D\n \u5167\u7684\u6BCF\u500B$$$\u7684\u986F\u793A\u516C\u5F0F\u70BA \=0 - $$$\uFF0C\n \u5247\u6700\u7D42\u7684\u7D50\u679C\u5BE6\u969B\u503C\u70BA1, 2, ..., 100, \n \u986F\u793A\u503C\u70BA-1, -2, ... , -100\u3002
 Schedule-Template_Parameter=\u7BC4\u672C\u53C3\u6578
 JSShow=\u52D5\u614B\u5C55\u793A
 Level_coordinates=\u5C64\u6B21\u5750\u6A19
@@ -1003,7 +1002,7 @@ RWA-Remove_Field=\u79FB\u9664\u6B04\u4F4D
 Form-Desin_Width=\u8A2D\u8A08\u5BEC\u5EA6
 No-tableData=\u6C92\u6709\u8FD4\u56DE\u8CC7\u6599\u96C6
 Page_Total=\u5171
-FR-Designer-Plugin_Connect_Server_Error=Error to connect plugin store
+FR-Designer-Plugin_Connect_Server_Error=\u7121\u6CD5\u9023\u63A5\u63D2\u4EF6\u5546\u5E97\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66
 Import-Excel_Source=Excel\u6E90\u6A94\u6848
 Utils-Left_to_Right_a=\u5F9E\u5DE6\u5F80\u53F3
 ExpandD-Expand_Attribute=\u64F4\u5C55\u5C6C\u6027
@@ -1018,7 +1017,7 @@ Utils-Move_Up=\u4E0A\u79FB
 BackgroundTexture-PurpleMesh=\u7D2B\u8272\u7DB2\u8DEF
 Export-Word=Word\u683C\u5F0F
 ServerM-Widget_Manager=\u5143\u4EF6\u7BA1\u7406
-FR-Designer-Basic_Activation_Key=Activation Key\:
+FR-Designer-Basic_Activation_Key=\u8A2D\u8A08\u5668\u7DE8\u865F\:
 FR-App-Template_Report_Not_Exist=\u6240\u9078\u5831\u8868\u4E0D\u5B58\u5728
 Protected=\u4FDD\u8B77
 Skip=\u8DF3\u904E
@@ -1048,7 +1047,7 @@ BindColumn-Select=\u6B04\u8868
 FR-Widget_Mobile_Terminal=\u884C\u52D5\u8A2D\u5099
 FR-Background_Image_Titled=\u5E73\u92EA
 SetPrinterOffset=\u5370\u8868\u6A5F\u504F\u79FB
-FR-Designer-Plugin_Installed=Installed
+FR-Designer-Plugin_Installed=\u5DF2\u5B89\u88DD
 FR-Designer-Hyperlink_Name=\u540D\u5B57
 FR-Designer_Form-Button=\u6309\u9215
 Black=\u9ED1\u8272
@@ -1058,7 +1057,7 @@ PDF-Print_isPopup=\u662F\u5426\u5F48\u51FA\u8A2D\u5B9A\u6846
 LayerPageReport_CountPerPage=\u6BCF\u9801\u8A18\u9304\u6578
 Display_Modes=\u986F\u793A\u6A21\u5F0F
 RowSpan=\u5217\u8DE8\u5EA6
-Datasource-Test_Connection=\u6E2C\u8A66\u93C8\u63A5
+Datasource-Test_Connection=\u6E2C\u8A66\u9023\u63A5
 Function-Function_Manager=\u51FD\u6578\u7BA1\u7406\u5668
 Host_Name=\u4E3B\u6A5F\u540D
 CellWrite-Show_As_HTML=\u7528HTML\u986F\u793A\u5167\u5BB9
@@ -1068,7 +1067,7 @@ Form-SupportTag=\u6A19\u7C64\u5F62\u5F0F\u986F\u793A
 ReportD-Report_Write_Attributes=\u5831\u8868\u586B\u5831\u5C6C\u6027
 DataFunction-Count=\u500B\u6578
 Top_And_Thick_Bottom_Border_Line=\u4E0A\u6846\u7DDA\u548C\u7C97\u4E0B\u6846\u7DDA
-Client=Client
+Client=\u5BA2\u6236\u7AEF
 BindColumn-Result_Serial_Number_Start_From_1=\u5E8F\u865F\u5F9E1\u958B\u59CB
 History=\u6B77\u53F2
 Already_exists=\u5DF2\u5B58\u5728\uFF0C\u8ACB\u91CD\u65B0\u8F38\u5165\uFF01
@@ -1125,7 +1124,7 @@ LayerPageReport_PageEngine=\u4F7F\u7528\u6309\u9801\u904B\u7B97\u5206\u6BB5\u57F
 Schedule-The_selected_file_must_be_end_with_filter=\u9078\u64C7\u7684\u6A94\u6848\u5FC5\u9808\u4EE5.cpt\u6216\u8005.class\u6216\u8005.frm\u7D50\u5C3E\u3002
 Provide=\u63D0\u4F9B
 FormulaD-Math_&_Trig=\u6578\u5B78\u548C\u4E09\u89D2\u51FD\u6578
-FR-Designer-StyleAlignment_Right=\u9760\u53F3\u5C0D\u9F4A
+FR-Designer-StyleAlignment_Right=\u9760\u53F3
 Error_TableDataNameRepeat=\u5DF2\u7D93\u5728\u4F3A\u670D\u5668\u8CC7\u6599\u96C6\u4E2D\u5B58\u5728\u6216\u8005\u591A\u500B\u8CC7\u6599\u96C6\u540D\u91CD\u8907\u3002
 Choose_None=\u4E0D\u9078
 File-tree=\u6A94\u6848\u6A39
@@ -1154,7 +1153,7 @@ Multiline=\u591A\u5217\u7DE8\u8F2F
 Datasource-Convert_Charset=\u7DE8\u78BC\u8F49\u63DB
 DashBoard-ConnectionList=\u8CC7\u6599\u9023\u63A5
 Utils-Submit_Forcibly=\u5F37\u884C\u63D0\u4EA4
-FR-Designer_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
+Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
 Logout=\u9000\u51FA
 FR-Designer_Show_Blank_Row=\u88DC\u5145\u7A7A\u767D\u5217
 FR-Base_Format=\u683C\u5F0F
@@ -1163,12 +1162,12 @@ Delete_Column=\u522A\u9664\u6B04
 SecondGraduationLine=\u6B21\u8981\u523B\u5EA6\u7DDA
 SpecifiedG-Groups=\u7D44
 CONTINUUM_MODE=\u76F8\u9130\u9023\u7E8C\u5206\u7D44
-Datasource-Connection_failed=\u93C8\u63A5\u5931\u6557
+Datasource-Connection_failed=\u9023\u63A5\u5931\u6557
 CategoryName=\u5206\u985E\u540D
 DBCP_INITIAL_SIZE=\u521D\u59CB\u5316\u9023\u63A5\u6578
 Colors=\u984F\u8272
 FR-Import-Export_CSV=CSV\u683C\u5F0F(\u9017\u865F\u5206\u9694)
-FR-Designer-StyleAlignment_Left=\u9760\u5DE6\u5C0D\u9F4A
+FR-Designer-StyleAlignment_Left=\u9760\u5DE6
 BackgroundTexture-PaperBag=\u7D19\u888B
 RWA-BuildIn_SQL=\u5167\u7F6ESQL
 SingleLayer=\u55AE\u5C64
@@ -1193,7 +1192,7 @@ Privilege-Selected_None_Of_Any_Items=\u6C92\u6709\u9078\u4E2D\u4EFB\u4F55\u4E00\
 FRFont-Size=\u5927\u5C0F
 Function-J2EE_server=J2EE\u4F3A\u670D\u5668
 FR-Designer_Allow_Blank=\u5141\u8A31\u70BA\u7A7A
-FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
+Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
 Preference-Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u6EFE\u52D5\u689D\u53EF\u898B
 Scope=\u7BC4\u570D
 Save_All_Records_In_Memory=\u6240\u6709\u8A18\u9304\u90FD\u5132\u5B58\u5728\u5167\u5B58\u4E2D
@@ -1207,7 +1206,7 @@ FS_Start_Date=\u958B\u59CB\u65E5\u671F
 FR-ConditionB_Operator=\u64CD\u4F5C\u7B26
 Printer-Alias=\u5225\u540D
 DS-Class_Name=\u985E\u540D
-FR-Designer-Plugin_Has_Been_Disabled=Plugin has been disabled
+FR-Designer-Plugin_Has_Been_Disabled=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528\uFF0C\u91CD\u555F\u8A2D\u8A08\u5668\u53CA\u4F3A\u670D\u5668\u751F\u6548\uFF0C\u4F3A\u670D\u5668\u9700\u624B\u52D5\u91CD\u555F
 Sort-Original=\u4E0D\u6392\u5E8F
 Utils-Top_to_Bottom_a=\u5F9E\u4E0A\u5F80\u4E0B
 Parameter-String=\u5B57\u5143\u4E32
@@ -1228,7 +1227,7 @@ Interface=\u4ECB\u9762
 FR-Designer-Beyond_Bounds=\u8D85\u51FA\u6216\u8005\u5C0F\u65BCbody\u908A\u754C\uFF0C\u4E0D\u80FD\u8ABF\u6574\u5927\u5C0F
 seconds=\u79D2
 Auto-Build=\u81EA\u52D5\u69CB\u5EFA
-FR-Designer-Plugin_Install_Successful=Install successful
+FR-Designer-Plugin_Install_Successful=\u8A72\u63D2\u4EF6\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u53CA\u4F3A\u670D\u5668\u6642\u88AB\u555F\u7528\uFF0C\u4F3A\u670D\u5668\u9700\u624B\u52D5\u91CD\u555F
 Template_Path=\u7BC4\u672C\u8DEF\u5F91
 FR-Designer-FRFont_Bold=\u7C97\u9AD4
 Poly_Name=\u805A\u5408\u584A\u540D
@@ -1237,7 +1236,7 @@ Hyperlink-Self_Window=\u7576\u524D\u7A97\u53E3
 FR-Designer-Widget-Style_Title=\u6A19\u984C
 FR-Designer-FRFont_Size=\u5927\u5C0F
 M_File-Export-SVG=SVG\u683C\u5F0F
-Capacity=Capacity
+Capacity=\u5BB9\u91CF
 Rose_Red=\u73AB\u7470\u7D05
 StyleAlignment-The_value_of_rotation_must_between_-90_and_90_degrees=\u65CB\u8F49\u503C\u5FC5\u9808\u5728\u8CA090\u5EA6\u523090\u5EA6
 HF-Move_Left=\u5DE6\u79FB
@@ -1262,7 +1261,7 @@ DateFormat-Custom_Warning=\u8A3B\uFF1A\u81EA\u5B9A\u7FA9\u65E5\u671F\u683C\u5F0F
 Unit_MM=\u516C\u5398
 Server-Start=\u555F\u52D5
 CellPage-Can_Break_On_Paginate=\u5206\u9801\u6642\u53EF\u4EE5\u65B7\u958B
-FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
+Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
 ComboCheckBox-Start_Symbol=\u8D77\u59CB\u7B26
 Real=\u5BE6\u969B
 RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5132\u5B58\u683C
@@ -1287,7 +1286,7 @@ Brown=\u8910\u8272
 Select_A_Tree_DataSource_To_Build=\u9078\u64C7\u4E00\u500B\u6A39\u72C0\u8CC7\u6599\u96C6\u4F86\u69CB\u5EFA
 Overlapping=\u91CD\u66E1\u578B
 DS-Class_TableData=\u985E\u5225\u8CC7\u6599\u96C6
-FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install=Illegal plugin,cannot be installed
+FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install=\u4E0D\u53EF\u8B58\u5225\u7684\u63D2\u4EF6\uFF0C\u7121\u6CD5\u5B89\u88DD
 DisplayNothingBeforeQuery=\u9EDE\u64CA\u67E5\u8A62\u524D\u4E0D\u986F\u793A\u5176\u4ED6\u5167\u5BB9
 Y_Axis=Y\u8EF8
 FormulaD-Most_Recently_Used=\u5E38\u7528\u51FD\u6578
@@ -1318,7 +1317,7 @@ FR-Base_Table=\u8868
 Des-Remove_WorkSheet=\u8981\u522A\u9664\u7684\u8868\u53EF\u80FD\u5B58\u5728\u8CC7\u6599,\u5982\u679C\u8981\u6C38\u4E45\u522A\u9664\u9019\u4E9B\u8CC7\u6599,\u8ACB\u6309'\u78BA\u5B9A'\u6309\u9215.
 Rotation=\u65CB\u8F49
 Undefined=\u672A\u5B9A\u7FA9
-Support-Auto_Complete_Shortcut=Auto Complete Shortcut
+Support-Auto_Complete_Shortcut=\u81EA\u52D5\u88DC\u5168\u5FEB\u6377\u9375
 Set_Column_Title_End=\u8A2D\u5B9A\u91CD\u8907\u7D50\u5C3E\u6B04
 Submit_Url=\u63D0\u4EA4\u5730\u5740
 ReportServerP-Are_you_sure_to_delete_the_selected_printer=\u4F60\u78BA\u5BE6\u60F3\u522A\u9664\u9078\u4E2D\u7684\u5370\u8868\u6A5F\u55CE
@@ -1334,7 +1333,7 @@ Format-Error=\u8F38\u5165\u7684\u503C\u683C\u5F0F\u4E0D\u6B63\u78BA
 Server-Stop=\u505C\u6B62
 Preference-Setting_Grid=\u7DB2\u683C\u8A2D\u5B9A
 ReportServerP-Add_Printer=\u589E\u52A0\u5370\u8868\u6A5F
-FR-Designer-Plugin_Active=Active
+FR-Designer-Plugin_Active=\u555F\u7528
 Utils-File_name=\u6A94\u6848\u540D
 NOT_NULL_Des=\u4E0D\u80FD\u70BA\u7A7A
 Right_Border_Line=\u53F3\u6846\u7DDA
@@ -1348,17 +1347,17 @@ ReportColumns-Columns_vertically=\u6B04\u5206\u6B04
 ReportGUI-Print_Background=\u5217\u5370/\u532F\u51FA\u5831\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u865F\u5206\u9694)
 M_Edit-Paste=\u8CBC\u4E0A(P)
-FR-Designer-Basic_Restart_Designer=Restart designer
+FR-Designer-Basic_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668
 ReportServerP-PDF2-INFO=\u50C5\u5728LINUX/UNIX\u4E0B\u672A\u5B89\u88DD\u4E2D\u6587\u5B57\u9AD4\u6642\u4F7F\u7528
 FormulaD-Check_Valid=\u6AA2\u67E5\u5408\u6CD5\u6027
 server_disconnected=\u9023\u63A5\u5DF2\u65B7\u958B
 ParameterD-Parameter_name_cannot_be_null=\u53C3\u6578\u7684\u540D\u5B57\u4E0D\u53EF\u4EE5\u70BA\u7A7A
-FR-Designer-Plugin_Version_Is_Lower_Than_Current=The version of plugin is lower than current
+FR-Designer-Plugin_Version_Is_Lower_Than_Current=\u5347\u7D1A\u5305\u7684\u63D2\u4EF6\u7248\u672C\u6C92\u6709\u6BD4\u7576\u524D\u7684\u9AD8
 RWA-NotChange_Unmodified=\u4E0D\u6539\u8B8A\u6642\u4E0D\u66F4\u65B0
 User_Information=\u7528\u6236\u8A0A\u606F
 Custom_styles_lost=\u81EA\u5B9A\u7FA9\u6A23\u5F0F\u5DF2\u4E1F\u5931
 PageSetup-Margin=\u9801\u908A\u8DDD
-M-New_FormBook=\u5EFA\u7ACB\u65B0\u5831\u8868
+M-New_FormBook=\u65B0\u589E\u8868\u55AE\uFF08\u6C7A\u7B56\u8868\uFF09
 Widget-TreeNode=\u6A39\u7BC0\u9EDE\u6309\u9215
 Form-Url=\u5730\u5740
 Utils-Beyond_the_left_side_of_Border=\u8D85\u51FA\u5DE6\u908A\u754C
@@ -1371,9 +1370,9 @@ Not_Exsit=\u4E0D\u5B58\u5728\u65BC\u5831\u8868
 Utils-Insert_Row=\u63D2\u5165\u5217
 Utils-Delete_Row=\u522A\u9664\u5217
 not_support_authority_edit=\u8A72\u5143\u7D20\u4E0D\u652F\u6301\u8A31\u53EF\u6B0A\u63A7\u5236
-Formula_Tips=\u516C\u5F0F\u5FC5\u9808\u4EE5"\
+Formula_Tips=\u516C\u5F0F\u5FC5\u9808\u4EE5"\="\u865F\u958B\u982D
 FR-Action_Copy=\u8907\u88FD
-Compile_Success=Compile Success
+Compile_Success=\u7DE8\u8B6F\u6210\u529F
 BackgroundTexture-RecycledPaper=\u518D\u751F\u7D19
 StyleAlignment-Single_Line=\u55AE\u5217\u986F\u793A
 Utils-Move_Down=\u4E0B\u79FB
@@ -1460,7 +1459,7 @@ DBCP_TEST_ON_BORROW=\u7372\u53D6\u9023\u63A5\u524D\u6AA2\u9A57
 FR-Designer_layerIndex=\u4F9D\u8CF4\u7684\u5C64\u6578
 WEB-Write_Setting=\u586B\u5831\u9762\u9762\u8A2D\u5B9A
 M-New_WorkBook=\u65B0\u589E\u5DE5\u4F5C\u7C3F
-FR-Designer-Plugin_Has_Been_Actived=Plugin is now active
+FR-Designer-Plugin_Has_Been_Actived=\u63D2\u4EF6\u5DF2\u88AB\u555F\u7528\uFF0C\u91CD\u555F\u8A2D\u8A08\u5668\u53CA\u4F3A\u670D\u5668\u751F\u6548\uFF0C\u4F3A\u670D\u5668\u9700\u624B\u52D5\u91CD\u555F
 Datasource-Maximum_Number_of_Preview_Rows=\u6700\u5927\u7684\u9810\u89BD\u5217\u6578
 ExpandD-Cell_Expand_Attributes=\u64F4\u5C55\u5C6C\u6027
 Select_the_repeated_row_and_column=\u9078\u64C7\u9700\u8981\u91CD\u8907\u7684\u5217\u6B04
@@ -1536,7 +1535,7 @@ FR-Designer_Cancel=\u53D6\u6D88
 Button-Group-Display-Columns=\u5C55\u793A\u6B04\u6578
 Widget-Height=\u63A7\u5236\u9805\u9AD8\u5EA6
 Examples=\u4F8B\u5B50
-Formula_Dictionary_Display_Example=\u5BE6\u969B\u503C\u7BC4\u570D\u70BA Formula_Dictionary_Display_Examples\
+Formula_Dictionary_Display_Example=\u5BE6\u969B\u503C\u7BC4\u570D\u70BA Formula_Dictionary_Display_Examples\= \u5BE6\u969B\u503C\u7BC4\u570D\u70BA Formula_Dictionary_Display_Examples_Html\=<html>\u5BE6\u969B\u503C\u7BC4\u570D\u70BA Formula_Editor\=\u516C\u5F0F\u7DE8\u8F2F\u5668
 StyleAlignment-Horizontal=\u6C34\u5E73\u5C0D\u9F4A
 HyperLink_Must_Alone_Reset=\u591A\u500B\u8D85\u93C8
 ExpandD-Expand_Direction=\u64F4\u5C55\u65B9\u5411
@@ -1566,7 +1565,7 @@ HF-Undefined=\u6C92\u6709\u5B9A\u7FA9
 Widget-User_Defined_Widget_Config=\u9810\u5B9A\u7FA9\u63A7\u5236\u9805
 Report-Write_Attributes_Group_Warning=\u8A2D\u5B9A\u7232\u5132\u5B58\u683C\u7D44\u7684\u5404\u6B04\u4F4D\u4E2D\u7684\u5132\u5B58\u683C\u500B\u6578\u5FC5\u9808\u76F8\u540C
 Form-Single_quote=\u55AE\u5F15\u865F
-Compile_Success_And_Then_Save=Compile Success And Then Save
+Compile_Success_And_Then_Save=\u7DE8\u8B6F\u6210\u529F\u624D\u80FD\u6B63\u78BA\u5132\u5B58
 FR-Designer_Layout-Padding=\u5167\u908A\u8DDD
 Layout_Container=\u4F48\u5C40\u5BB9\u5668
 Admin=\u7BA1\u7406\u54E1
@@ -1583,7 +1582,7 @@ Tree-Return_Full_Path=\u7D50\u679C\u8FD4\u56DE\u5B8C\u6574\u5C64\u6B21\u8DEF\u5F
 FRFont-bolditalic=\u7C97\u9AD4\u659C\u9AD4
 FR-Base_StyleFormat_Sample=\u793A\u4F8B
 Area_Value=\u5340\u57DF\u503C
-FR-Designer-Plugin_Disable=Disable
+FR-Designer-Plugin_Disable=\u7981\u7528
 Utils-Are_you_sure_to_remove_the_selected_item=\u4F60\u78BA\u5BE6\u6C7A\u5B9A\u522A\u9664\u9078\u4E2D\u7684\u9805
 Face_Write=\u586B\u5831
 Poly-Report_Block=\u8868\u683C\u985E\u578B\u805A\u5408\u584A
@@ -1594,7 +1593,7 @@ FR-Hyperlink_Please_Select_Reportlet=\u8ACB\u9078\u64C7\u7DB2\u8DEF\u5831\u8868
 FS_Report_Type=\u985E\u578B
 HF-New_Line=\u63DB\u5217\u7B26
 Privilege=\u6B0A\u9650
-Export-Offline-Html=\u8F38\u51FA\u96E2\u7DDAhtml\u5831\u8868
+Export-Offline-Html=\u532F\u51FA\u96E2\u7DDAhtml\u5831\u8868
 FR-Designer_open-new-form-tip=\u7576\u524D\u6A21\u677F\u70BA711\u4EE5\u4E0B\u7248\u672C\u88FD\u4F5C, \u7121\u6CD5\u517C\u5BB9, \u4E0D\u80FD\u6253\u958B. \u5047\u5982\u60F3\u6253\u958B\u4FEE\u6539\u6B64\u8868\u55AE, \u8ACB\u4F7F\u7528\u5C0D\u61C9\u7248\u672C\u8A2D\u8A08\u5668\u6253\u958B.
 FR-Designer-Widget-Style_Frame_Style=\u6846\u67B6\u6A23\u5F0F
 Present-No_Present=\u53D6\u6D88\u6A21\u5F0F\u8A2D\u5B9A
@@ -1614,14 +1613,14 @@ FR-Designer_Date=\u65E5\u671F
 Column_Multiple=\u8CC7\u6599\u500D\u6578
 FR-App-All_File=\u6A94\u6848
 Sort-Descending=\u964D\u51AA
-FR-Designer-Plugin_Delete=Delete
+FR-Designer-Plugin_Delete=\u522A\u9664
 Above=\u4EE5\u4E0A\u7248\u672C
 Utils-The-Chart=\u5716\u8868
 FRFont-plain=\u5E38\u898F
 Calculating=\u8655\u7406\u4E2D
 Form-Object=\u8868\u55AE\u5C0D\u8C61
 May=\u4E94\u6708
-FR-Designer_Plugin_Normal_Update=Update
+FR-Designer_Plugin_Normal_Update=\u66F4\u65B0
 FR-Hyperlink_Reportlet=\u7DB2\u8DEF\u5831\u8868
 M_Edit-Copy=\u8907\u88FD(C)
 Sub_Report_Message2=\u7236\u5831\u8868\u4E0D\u5728\u7576\u524D\u904B\u884C\u74B0\u5883\u4E0B
@@ -1633,10 +1632,10 @@ FR-Designer_Server-version-tip-moreInfo=\u5EFA\u8B70\u60A8\u6240\u5C6C\u5718\u96
 Get_Lock=\u52A0\u9396
 HF-Edit_Footer=\u7DE8\u8F2F\u9801\u5C3E
 Datasource-New_Charset=\u65B0\u7DE8\u78BC
-Preference-Custom=Custom
+Preference-Custom=\u81EA\u5B9A\u7FA9
 BackgroundTexture-Newsprint=\u65B0\u805E\u7D19
 ConditionB-Add_bracket=\u65B0\u589E\u62EC\u865F
-Datasource-Connection_successfully=\u93C8\u63A5\u6210\u529F
+Datasource-Connection_successfully=\u9023\u63A5\u6210\u529F
 Function-The_class_must_implement_the_interface=\u6539\u985E\u5FC5\u9808\u5BE6\u73FE\u4ECB\u9762
 FR-Designer_ChartF-Transparency=\u900F\u660E
 Crimson=\u6DF1\u7D05
@@ -1658,9 +1657,9 @@ Verify-Verify_Formula=\u6821\u9A57\u516C\u5F0F
 State=\u7701\u5E02
 FR-Designer-Widget-Style_Body_Background=\u4E3B\u9AD4\u80CC\u666F
 FR-App-Privilege_No=\u6C92\u6709\u6B0A\u9650
-Please_Drag_ParaPane=
+Please_Drag_ParaPane=\u8ACB\u62D6\u5165\u53C3\u6578\u9762\u677F
 Come_True=\u5BE6\u73FE
-ISEMPTY=is empty
+ISEMPTY=\u70BA\u7A7A
 Background-Texture=\u7D0B\u7406
 FR-Designer_Verify-Message=\u932F\u8AA4\u8A0A\u606F
 Locked=\uFF08\u5DF2\u9396\u5B9A\uFF09
@@ -1710,11 +1709,11 @@ Condition_Display=\u689D\u4EF6\u986F\u793A
 FR-Server-Design_template_unopened=\u7121\u6CD5\u6253\u958B\u7BC4\u672C
 Function-Function_Class_Name=\u51FD\u6578\u985E\u540D
 Schedule-Template=\u7BC4\u672C\u540D\u7A31
-FR-Designer_Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
+Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
 Border-Style-Normal=\u76F4\u89D2\u6846\u7DDA
 Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7DDA\u548C\u96D9\u4E0B\u6846\u7DDA
 FR-Server_Embedded_Server_Start=\u5167\u7F6E\u7684\u4F3A\u670D\u5668-\u555F\u52D5
-FR-Designer-Basic_Restart_Designer_Later=Restart later
+FR-Designer-Basic_Restart_Designer_Later=\u7A0D\u5F8C\u91CD\u555F
 StyleAlignment-Top=\u9760\u4E0A\u5C0D\u9F4A
 ReportServerP-First=\u9996\u9801
 Not_Exist=\u4E0D\u5B58\u5728
@@ -1736,7 +1735,7 @@ PageSetup-Horizontally=\u6C34\u5E73\u7F6E\u4E2D
 No_Editor_Property_Definition=\u8A72\u7DE8\u8F2F\u5668\u6C92\u6709\u5C6C\u6027\u5B9A\u7FA9
 Env-Remote_Server=\u9060\u7A0B\u4F3A\u670D\u5668
 FR-Utils_Background=\u80CC\u666F
-FR-Designer-Plugin_Warning=Warning
+FR-Designer-Plugin_Warning=\u8B66\u544A
 Server-version-info=\u60A8\u7576\u524D\u6253\u958B\u7684\u6A21\u677F\u6A94\u6848\u662F\u7531\u66F4\u9AD8\u7248\u672C\u7684\u8A2D\u8A08\u5668\u88FD\u4F5C\u7684\uFF0C\u6253\u958B\u6703\u6709\u51FA\u932F\u6216\u8005\u4E1F\u5931\u539F\u6709\u6A21\u677F\u5C6C\u6027\u7684\u98A8\u96AA\u3002\u5047\u5982\u9700\u8981\u6253\u958B\u6B64\u6A21\u677F\u8ACB\u60A8\u5C07\u60A8\u7684\u8A2D\u8A08\u5668\u5347\u7D1A\u81F3
 CellWrite-Page_After_Row=\u5217\u5F8C\u5206\u9801
 HF-Right_Section=\u53F3\u5340\u57DF
@@ -1823,13 +1822,13 @@ local=\u672C\u6A5F
 FR-Designer_Gradation=\u5C64\u6B21
 PageSetup-Finis_Start_Column=\u91CD\u8907\u7D50\u5C3E\u6B04
 Env-Invalid_User_and_Password=\u975E\u6CD5\u7684\u5E33\u865F\u6216\u5BC6\u78BC
-FR-Designer-Plugin_All_Plugins=All plugins
+FR-Designer-Plugin_All_Plugins=\u5168\u90E8\u63D2\u4EF6
 FR-Designer_Prepare_Export=\u958B\u59CB\u532F\u51FA\uFF0C\u8ACB\u7A0D\u5019
-DBCP_TEST_ON_RETURN=\u6B78\u9084\u93C8\u63A5\u524D\u6AA2\u9A57
+DBCP_TEST_ON_RETURN=\u6B78\u9084\u9023\u63A5\u524D\u6AA2\u9A57
 no-alternatives=\u6C92\u6709\u9078\u64C7\u9805
 FR-Designer_Submmit_WClass=\u5F8C\u53F0\u985E\u63D0\u4EA4
 M_Insert-Slope_Line=\u63D2\u5165\u659C\u7DDA
-FR-Designer-Plugin_Plugin_Description=Description
+FR-Designer-Plugin_Plugin_Description=\u63D2\u4EF6\u63CF\u8FF0
 ExpandD-Not_Expand=\u4E0D\u64F4\u5C55
 Utils-Bottom_to_Top=\u5F9E\u4E0B\u5230\u4E0A
 Collect-Click\!_Get_user_information_code=\u9EDE\u64CA\!\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC
@@ -1848,7 +1847,7 @@ Form-NullLayout=\u7D55\u5C0D\u5B9A\u4F4D
 ConditionB-Remove_bracket=\u53BB\u6389\u62EC\u865F
 email=\u90F5\u7BB1
 Minute=\u5206\u9418
-FR-Designer-Plugin_Update=Plugins to update
+FR-Designer-Plugin_Update=\u63D2\u4EF6\u66F4\u65B0
 alraedy_close=\u5DF2\u7D93\u95DC\u9589
 ComboCheckBox-End_Symbol=\u7D50\u675F\u7B26
 DataColumn=\u8CC7\u6599\u6B04
@@ -1858,17 +1857,17 @@ Export-Excel-PageToSheet=\u5206\u9801\u5206Sheet\u532F\u51FA
 Edit-Row_Count=\u5217\u6578
 DS-Report_TableData=\u5831\u8868\u8CC7\u6599\u96C6
 Sche-Hour=\u6642
-Group_Count=Group Count
+Group_Count=\u8868\u793A\u7E3D\u500B\u6578
 EndValue=\u7D50\u675F\u503C
 FR-Designer_Sytle-Indentation=\u7E2E\u9032
 DownBarBorderStyleAndColor=\u8DCC\u67F1\u6A23\u5F0F
 World=\u4E16\u754C
-FR-Designer-Basic_Cancel=Cancel
+FR-Designer-Basic_Cancel=\u53D6\u6D88
 Finally=\u6700\u5F8C
 Low=\u4F4E
 Please_Input_The_Key=\u8ACB\u8F38\u5165\u5C0D\u61C9\u5730\u5716\u4F7F\u7528\u7684key
 Smart=\u667A\u80FD
-Preference-Predefined=Predefined
+Preference-Predefined=\u9810\u5B9A\u7FA9
 Current_custom_global=\u7576\u524D\u5831\u8868\u6240\u7528\u81EA\u5B9A\u7FA9\u5168\u5C40\u6A23\u5F0F
 FR-Designer-Plugin_Shop_Need_Install=\u60A8\u9084\u6C92\u6709\u63D2\u4EF6\u5546\u5E97\u7684\u8CC7\u6E90,\u662F\u5426\u4E0B\u8F09?
 WEB-Pagination_Setting=\u5206\u9801\u9810\u89BD\u8A2D\u5B9A
@@ -1876,14 +1875,14 @@ RCodeDrawPix=\u50CF\u7D20
 FR-Designer-Widget-Style_Alpha=\u4E0D\u900F\u660E\u5EA6
 BorderLayout-North=\u5317
 HJS-Current_Page=\u7576\u524D\u9801
-Compile=Compile
+Compile=\u7DE8\u8B6F
 Show_Blank_Row=\u88DC\u5145\u7A7A\u767D\u5217
 TableData_Dynamic_Parameter_Setting=\u52D5\u614B\u53C3\u6578\u6CE8\u5165
 FR-Background_Image_Default=\u9810\u8A2D
 BackgroundTexture-WhiteMarble=\u767D\u8272\u5927\u7406\u77F3
 DataFunction-Sum=\u6C42\u548C
 Collect-The_user_information_code_is_invalid=\u9019\u500B\u7528\u6236\u8A0A\u606F\u78BC\u662F\u975E\u6CD5\u7684
-Preference-Locale=Locale
+Preference-Locale=\u570B\u969B\u5316
 M_File-Export-PDF=PDF\u683C\u5F0F
 BiasD-From-lower_left_to_upper_right=\u7E3D\u5DE6\u4E0B\u5230\u53F3\u4E0A\u767C\u6563
 Border-Style=\u6846\u7DDA\u6A23\u5F0F
@@ -1916,7 +1915,7 @@ Preference-Pagination_Line_Color=\u5206\u9801\u7DDA\u984F\u8272
 Test_URL=\u6E2C\u8A66\u9023\u63A5
 Fill_blank_Data=\u88DC\u5145\u7A7A\u767D\u8CC7\u6599
 ReportServerP-The_name_of_printer_cannot_be_null=\u5370\u8868\u6A5F\u7684\u540D\u5B57\u4E0D\u80FD\u70BA\u7A7A
-FR-Designer-Basic_Copy_Activation_Key=Double click to copy key to clipboard
+FR-Designer-Basic_Copy_Activation_Key=\u96D9\u64CA\u8A2D\u8A08\u5668\u7DE8\u865F\u53EF\u8907\u88FD\u5230\u526A\u8CBC\u677F
 Continuum=\u76F8\u9130\u9023\u7E8C
 BackgroundTexture-MediumWood=\u6DF1\u8272\u6728\u88FD
 Datasource-Column_Index=\u6B04\u5E8F\u865F
@@ -1925,11 +1924,11 @@ Form-Component_Bounds=\u5143\u4EF6\u908A\u754C
 Utils-Submit=\u63D0\u4EA4
 Conditions_formula=\u689D\u4EF6\u516C\u5F0F
 M_Insert-Image=\u63D2\u5165\u5716\u7247
-FR-Designer-Plugin_Will_Be_Delete=Delete plugin
+FR-Designer-Plugin_Will_Be_Delete=\u63D2\u4EF6\u5C07\u88AB\u522A\u9664\uFF0C\u9700\u91CD\u555F\u8A2D\u8A08\u5668\u53CA\u4F3A\u670D\u5668\uFF0C\u4F3A\u670D\u5668\u9700\u624B\u52D5\u91CD\u555F
 FormulaD-Functions=\u51FD\u6578
 Mobile_Terminal=\u884C\u52D5\u8A2D\u5099
 CheckBox=\u5FA9\u9078\u6846
-FR-Designer-Plugin_Install=Install
+FR-Designer-Plugin_Install=\u5B89\u88DD
 Sun=\u65E5
 FR-Designer_ToolBar_Bottom=\u5E95\u90E8\u5DE5\u5177\u6B04
 Widget-Width=\u63A7\u5236\u9805\u5BEC\u5EA6
@@ -1987,4 +1986,18 @@ FR-Designer_Role=\u89D2\u8272
 FR-Designer_Permissions=\u6B0A\u9650
 FR-Designer_Form_Button=\u6309\u9215
 FR-Designer_WF_Name=\u540D\u7A31
+FR-Designer_Double=\u5C0F\u6578
+FR-Designer_Query=\u67E5\u8A62
+FR-Designer_Font=\u5B57\u9AD4
+FR-Designer_Confirm=\u78BA\u8A8D
+FR-Designer_Parameter=\u53C3\u6578
+FR-Designer-Plugin_Plugin=\u63D2\u4EF6
+FR-Designer_Background=\u586B\u6EFF\u8272\u5F69
+Template=\u7BC4\u672C
+
+FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
+FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
+FR-Designer_Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
+FR-Designer_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
+FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
 FR-Product_Demo=\u529F\u80FD\u5C55\u793A