diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index c3531ae7be..7cfab6b487 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -9,7 +9,7 @@ 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...
@@ -29,7 +29,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
@@ -268,11 +268,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
@@ -293,13 +293,13 @@ FR-Designer_Remove=Remove
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\:
@@ -332,7 +332,7 @@ FR-Designer_Event_Set=Event Setup
FR-Designer_Blow_set=Following Settings
FR-Designer_I_Want_To_Set_Single=Individually set for the report
FR-Designer_Using_Server_Report_View_Settings=Use server report settings
-FR-Designer_ErrorHandlerTemplate=Error Template Definition
+FR-Designer_ErrorHandlerTemplate=Error Template Definition
FR-Designer_Save_Path=Save Path
FR-Designer-Collect_OSXTips=Tip\: Press control + v to paste the activation code
FR-Designer_X_Coordinate=Abscissa
@@ -381,7 +381,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 +394,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
@@ -621,9 +621,9 @@ Utils-Current_Sheet=Current Sheet
ConditionB-is_less_than=less than
BorderLayout-West=West
AnalysisLine=Line
-Layer_Report_Warnning_info=Line report engine is suitable for large data.
Many report features will no longer support if use it,
more information in helpdocument.
+Layer_Report_Warnning_info=Line report engine is suitable for large data.
Many report features will no longer support if use it,
more information in helpdoc.
Tree-Width=Tree Width
-alert_word=Export without fixed height, cell hight will change according to the content and pagination position will different from the preview result.
+alert_word=Export without fixed height, cell height will change according to the content and pagination position will different from the preview result.
PageSetup-Paper_Size=Paper Size
M-Page_Setup=Page Setup
DashBoard-FormBook=Form
@@ -703,7 +703,7 @@ RWA-Click_Cell_To_Edit_Value=Click Cell to Edit Value
Utils-Row_Height=Row Height
ReportD-Excel_Export=Export Attributes
Form-Please_Select_A_Kind_Of_Form_Container=Select A Form Container
-Column_Does_Not_Exsit=Column Does Not Exsit
+Column_Does_Not_Exsit=Column Does Not Exist
M_Insert-Hyperlink=Hyperlink
can_not_include_underline=Can not contain "_"
FR-Designer-Plugin_Jar_Expired=Jar Expired
@@ -803,7 +803,7 @@ CellWrite-Page_Before_Row=Before Row
FR-Designer-Plugin_Load_Plugins_From_Server=Loading data from plugins store
D-Dispaly_Divide_Result_Set_into_Groups=Grouping on Result Set
Closed=Closed
-RWA-Help=Set "No update if no modidy", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
+RWA-Help=Set "No update if no modify", so if cell is not modified, the record will not update; it improves filling and submit performance when data is large.
FR-Designer-Widget-Style_Custom=Custom
FR-Designer-Widget-Style_Render_Style=Rendering style
Highlight-Barcode=BarCode
@@ -954,7 +954,7 @@ zeroMarginWarn=The printer exist the physical margins
report page margin se
Widget-Date_Selector_Return_Type=Return value type
Utils-Switch_To_Template_Reportlet=Switch to template web report
satisfy=satisfy
-FR-Designer_WidgetDisplyPosition=Control DisplyPosition
+FR-Designer_WidgetDisplyPosition=Control DisplayPosition
FR-Base_Top=Top
FR-Designer_Form-CheckBox=CheckBox
Reportlet-Parameter_Type=Parameter passing mode
@@ -972,7 +972,7 @@ FR-Widget_Tree_And_Table=Control tree and control table
FR-Base_Help=Help
FR-Designer-Plugin_Update_Successful=Update successfully, restart the sever to enable it
August=August
-LOG-Is_Being_Openned=Is Being Openned
+LOG-Is_Being_Openned=Is Being Opened
BackgroundTexture-Oak=Oak
Multi_nam_formula=\ data set name\:
TurnOn=TurnOn
@@ -1131,7 +1131,7 @@ Schedule-The_selected_file_must_be_end_with_filter=The selected file must end wi
Provide=Provide
FormulaD-Math_&_Trig=Math and Trig
FR-Designer-StyleAlignment_Right=Right
-Error_TableDataNameRepeat=\ already exsits in Server DataSet or the name is repeated.
+Error_TableDataNameRepeat=\ already exists in Server DataSet or the name is repeated.
Choose_None=Deselect
File-tree=File tree
FRFont-bold=Bold
@@ -1149,7 +1149,7 @@ FR-mobile_report_analysis=report analysis
Month=Month
Utils-Column_Width=Column-W
Collect-Use_Designer=Use Designer
-Widget-User_Defined_Editor=Predefine editor, you can only change its properties in control mangement menu.
+Widget-User_Defined_Editor=Predefine editor, you can only change its properties in control management menu.
Unit_Ten_Thousand=Ten Thousand
Data_Setting=Data Setting
ECP_input_pwd=Enter your password\:
@@ -1167,7 +1167,7 @@ FR-App-Export_png=png
Delete_Column=Delete Column
SecondGraduationLine=Minor Graduation Line
SpecifiedG-Groups=Groups
-CONTINUUM_MODE=Continous grouping
+CONTINUUM_MODE=Continuous grouping
Datasource-Connection_failed=Connection Failed
CategoryName=Category Name
DBCP_INITIAL_SIZE=Initialize Connections
@@ -1181,7 +1181,7 @@ Or-you=or you
FR-Designer_Certificate_Path=Certificate Path
Utils-Last_Page=Last Page
BarCodeD-Drawing_Text=Display Barcode Text
-Warning-Template_Do_Not_Exsit=Template do not exsit
+Warning-Template_Do_Not_Exsit=Template do not exist
BindColumn-Group=Group
Export-SVG=SVG
Plane3D=Plane 3D
@@ -1295,7 +1295,7 @@ DS-Class_TableData=Class Data Set
FR-Designer-Plugin_Illegal_Plugin_Zip_Cannot_Be_Install=Illegal plugin,cannot be installed
DisplayNothingBeforeQuery=Display Nothing Before Query
Y_Axis=Y Axis
-FormulaD-Most_Recently_Used=Rencently used
+FormulaD-Most_Recently_Used=Recently used
FormulaD-Input_formula_in_the_text_area_below=Input formula in the text area below
Build-Way=Build Way
M_Edit-Undo=Undo
@@ -1803,7 +1803,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 +1823,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
@@ -1946,7 +1946,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
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 559c8ffd08..0ad9d28a15 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -1,7 +1,7 @@
# 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
+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
FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8A18\u5BC6\u78BC
FR-Designer-BBSLogin_Login=\u767B\u9304
FR-Designer-BBSLogin_Login-Failure-Tip=\u5E33\u865F\u6216\u5BC6\u78BC\u932F\u8AA4\uFF0C\u8ACB\u91CD\u65B0\u767B\u9304
@@ -9,7 +9,7 @@ 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...
@@ -181,7 +181,7 @@ FR-Designer_Support_QQ=\u652F\u63F4QQ
FR-Designer_Swatch=\u6A23\u54C1
FR-Designer_Tab_title=tab\u6A19\u984C
FR-Designer_TableData=\u8CC7\u6599\u96C6
-FR-Designer_Thank_guest=\u611F\u8B1D\u5BA2\u6236
+FR-Designer_Thank_guest=\u611F\u8B1D\u5BA2\u6236
FR-Designer_Thanks-To=\u9CF4\u8B1D
FR-Designer_Title=\u6A19\u984C
FR-Designer_Total=\u7E3D\u5171
@@ -561,19 +561,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 +582,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)
@@ -1358,7 +1358,7 @@ 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\u5EFA\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
@@ -1658,7 +1658,7 @@ 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
Background-Texture=\u7D0B\u7406