Merge branch 'final/10.0' of https://code.fineres.com/scm/~lucian.chen/design-i18n into release/10.0

 Conflicts:

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

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

@@ -1589,6 +1589,7 @@ Fine-Design_Form_Zoom_In_Logic=
 Fine-Design_Form_Zoom_Out_Logic=
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=
 Fine-Design_Function_Form_Widget_Edit_Toolbar=
+Fine-Design_Mobile_Attribute_Settings=
 Fine-Design_Function_Mobile_Template_Cpt=
 Fine-Design_Function_Mobile_Template_Frm=
 Fine-Design_Last_Designer_Process_Not_Exist=
@@ -2571,4 +2572,5 @@ Fine-Designer_PC_Fit_Attr=
 Fine-Engine_Fit-Impl=
 Fine_Design_Basic_Engine_Event_After_Delete=
 Fine_Design_Basic_M_Data_Analysis=
-Fine_Design_Chart_Year=
+Fine_Design_Chart_Year=
+Fine-Design_Basic_DataSet_Rename_Warning=

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

@@ -301,7 +301,6 @@ Fine-Design_Basic_Display_Value=Display Value
 Fine-Design_Basic_Double=Double
 Fine-Design_Basic_Drag_To_Select_Gradient=Drag the button below to choose gradient area, click button to choose color
 Fine-Design_Basic_Driver=Driver
-Fine-Design_Basic_Odbc_Tips=
 Fine-Design_Basic_Duplicate_Parameter_Name=The parameter name already exists, please rename it.
 Fine-Design_Basic_Dynamic_Parameter_Injection=Injection
 Fine-Design_Basic_ECP_Decode=Report Decryption
@@ -665,7 +664,7 @@ Fine-Design_Basic_Parameter_Integer=Integer
 Fine-Design_Basic_Parameter_Source_Type_Server=Global Parameters
 Fine-Design_Basic_Parameter_Source_Type_Tabledata=Dataset Parameters
 Fine-Design_Basic_Parameter_String=String
-Fine-Design_Basic_Parameter_UI_Display=Display Parameter Pane
+Fine-Design_Basic_Parameter_UI_Display=Show Parameter Pane
 Fine-Design_Basic_Parameters=Parameters
 Fine-Design_Basic_Parent_Marked_Field=Parent Tag Field
 Fine-Design_Basic_Password=Password
@@ -1108,7 +1107,7 @@ Fine-Design_Basic_Widget_Error_Tip=Error Tip
 Fine-Design_Basic_Widget_Field=Field
 Fine-Design_Basic_Widget_Form_Widget_Config=Form Widget
 Fine-Design_Basic_Widget_Form_Widget_Container=Form Container
-Fine-Design_Basic_Widget_Library=Component Library
+Fine-Design_Basic_Widget_Library=Widget Library
 Fine-Design_Basic_Widget_Load_By_Async=Async Load
 Fine-Design_Basic_Widget_Name=Widget Name
 Fine-Design_Basic_Widget_Position=Widget Location
@@ -1124,15 +1123,15 @@ Fine-Design_Basic_Widget_Type_Checkbox=Checkbox
 Fine-Design_Basic_Widget_Type_Checkbox_Group=Checkbox Group
 Fine-Design_Basic_Widget_Type_Combo_Box=Drop-down Box
 Fine-Design_Basic_Widget_Type_Combo_Checkbox=Drop-down Checkbox
-Fine-Design_Basic_Widget_Type_Date=Date
+Fine-Design_Basic_Widget_Type_Date=Date Widget
 Fine-Design_Basic_Widget_Type_File=File Widget
 Fine-Design_Basic_Widget_Type_Label=Label Widget
 Fine-Design_Basic_Widget_Type_List=List Widget
 Fine-Design_Basic_Widget_Type_Number=Digital Widget
-Fine-Design_Basic_Widget_Type_Password=Password
+Fine-Design_Basic_Widget_Type_Password=Password Widget
 Fine-Design_Basic_Widget_Type_Radio_Group=Radio Button Group
-Fine-Design_Basic_Widget_Type_Text=Text Field
-Fine-Design_Basic_Widget_Type_Textarea=Text Area
+Fine-Design_Basic_Widget_Type_Text=Text Widget
+Fine-Design_Basic_Widget_Type_Textarea=Text Field
 Fine-Design_Basic_Widget_User_Defined_Widget_Config=Predefined Widget
 Fine-Design_Basic_WorkBook=Workbook
 Fine-Design_Basic_Work_After_Restart_Designer=Take effect when the designer is restarted
@@ -1421,7 +1420,7 @@ Fine-Design_Form_Forbid_Drag_Into_Para_Pane=The object cannot be dragged into th
 Fine-Design_Form_Form_Url=URL
 Fine-Design_Form_Form_Widget_Name=Widget Name
 Fine-Design_Form_Formula_Tips=The formula must begin with "
-Fine-Design_Form_Functional_When_Unactivated=Component is selectable
+Fine-Design_Form_Functional_When_Unactivated=Widget is selectable
 Fine-Design_Form_Golden=Golden
 Fine-Design_Form_Grid_Layout=Grid Layout
 Fine-Design_Form_Hgap=Horizontal Gap
@@ -1502,7 +1501,7 @@ Fine-Design_Form_Return_Date=Return Date
 Fine-Design_Form_Right=Right
 Fine-Design_Form_Rose_Red=Rose Red
 Fine-Design_Form_Set_Mobile_Only_Template=Set as mobile template
-Fine-Design_Form_Share_Module_OK=Shared component successfully installed!
+Fine-Design_Form_Share_Module_OK=Shared Module successfully installed!
 Fine-Design_Form_Share_Module_Removed_Failed=Failed To Remove
 Fine-Design_Form_Share_Module_Removed_Successful=Successfully Removed
 Fine-Design_Form_Size=Size
@@ -1587,8 +1586,8 @@ Fine-Design_Form_Widget_Visible=Visible
 Fine-Design_Form_Widget_Width=Widget Width
 Fine-Design_Form_Zoom_In_Logic=Zoom In Logic
 Fine-Design_Form_Zoom_Out_Logic=Zoom Out Logic
-Fine-Design_Function_Form_Widget_Edit_Popup_Menu=Form Component Edit(Popup Menu)
-Fine-Design_Function_Form_Widget_Edit_Toolbar=Form Component Edit(Toolbar)
+Fine-Design_Function_Form_Widget_Edit_Popup_Menu=Form Widget Edit(Popup Menu)
+Fine-Design_Function_Form_Widget_Edit_Toolbar=Form Widget Edit(Toolbar)
 Fine-Design_Function_Mobile_Template_Cpt=Mobile Template(cpt)
 Fine-Design_Function_Mobile_Template_Frm=Mobile Template(frm)
 Fine-Design_Last_Designer_Process_Not_Exist=The designer process wasn't closed properly last time, end the process and restart it?
@@ -1597,7 +1596,7 @@ Fine-Design_Mobile_BookMark=Navigation
 Fine-Design_Mobile_BookMark_Name=Navigation Name
 Fine-Design_Mobile_BookMark_Rename_Failure=Duplicate navigation exists, please set another name.
 Fine-Design_Mobile_BookMark_Style=Navigation Style
-Fine-Design_Mobile_BookMark_Style_Hint=<html>Tip: This plugin only displays the navigation of components in the same level. If "Show navigation under this level" is checked in the nested level, only the top-level navigation are displayed, up to 8 navigations.</html>
+Fine-Design_Mobile_BookMark_Style_Hint=<html>Tip: This plugin only displays the navigation of widgets in the same level. If "Show navigation under this level" is checked in the nested level, only the top-level navigation are displayed, up to 8 navigations.</html>
 Fine-Design_Mobile_BookMark_Style_Sidebar=Sidebar
 Fine-Design_Mobile_BookMark_Style_Sidebar_Background_Color=BG Color
 Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Color=Border Color
@@ -1644,7 +1643,7 @@ Fine-Design_Mobile_Preview=Mobile Preview
 Fine-Design_Mobile_Select_Fill=Select Fill
 Fine-Design_Mobile_Select_Icon=Select Icon
 Fine-Design_Mobile_Show_BookMark=Display navigation below this level
-Fine-Design_Mobile_Show_BookMark_Hint=<html>Tip: Please check in Mobile Panel of each component<br/>&nbsp;&nbsp;&nbsp;whether the navigation is displayed</html>
+Fine-Design_Mobile_Show_BookMark_Hint=<html>Tip: Please check in Mobile Panel of each widget<br/>&nbsp;&nbsp;&nbsp;whether the navigation is displayed</html>
 Fine-Design_Mobile_Slider_Dot_Indicator=Dot Indicator
 Fine-Design_Mobile_Slider_Title=Slider Title
 Fine-Design_Mobile_Spit_Line=Splitline
@@ -2009,7 +2008,7 @@ Fine-Design_Report_Form_Frozen_Tip=When use Freeze, suggest install
 Fine-Design_Report_Form_Iframe=Iframe
 Fine-Design_Report_Form_List=List
 Fine-Design_Report_Form_Password=Password
-Fine-Design_Report_Form_TextArea=Text Area
+Fine-Design_Report_Form_TextArea=Text Field
 Fine-Design_Report_Format=Format
 Fine-Design_Report_Formula=Formula
 Fine-Design_Report_Formula_Group=Formula Group
@@ -2571,4 +2570,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Engine_Fit-Impl=Adaptive Plugin
 Fine_Design_Basic_Engine_Event_After_Delete=Delete After Row
 Fine_Design_Basic_M_Data_Analysis=Data Analysis Preview
-Fine_Design_Chart_Year=Year
+Fine_Design_Chart_Year=Year
+Fine-Design_Basic_DataSet_Rename_Warning=Dataset name is illegal, please do not name it as {}!

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

@@ -1589,6 +1589,7 @@ Fine-Design_Form_Zoom_In_Logic=\u62E1\u5927\u30ED\u30B8\u30C3\u30AF
 Fine-Design_Form_Zoom_Out_Logic=\u7E2E\u5C0F\u30ED\u30B8\u30C3\u30AF
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u7DE8\u96C6(\u53F3\u30AF\u30EA\u30C3\u30AF\u30E1\u30CB\u30E5\u30FC)
 Fine-Design_Function_Form_Widget_Edit_Toolbar=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u7DE8\u96C6(\u30C4\u30FC\u30EB\u30D0\u30FC)
+Fine-Design_Mobile_Attribute_Settings=\u5C5E\u6027\u8A2D\u5B9A
 Fine-Design_Function_Mobile_Template_Cpt=\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8(cpt)
 Fine-Design_Function_Mobile_Template_Frm=\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8(frm)
 Fine-Design_Last_Designer_Process_Not_Exist=\u4E0A\u6B21\u8BBE\u8BA1\u5668\u8FDB\u7A0B\u672A\u6B63\u5E38\u5173\u95ED\uFF0C\u662F\u5426\u7ED3\u675F\u8FDB\u7A0B\u5E76\u91CD\u542F
@@ -2571,4 +2572,5 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30
 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3
 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C
 Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
+Fine_Design_Chart_Year=\u5E74
+Fine-Design_Basic_DataSet_Rename_Warning=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306E\u540D\u524D\u306F\u4ED5\u69D8\u5916\u3067\u3059\u3001{}\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\uFF01

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

@@ -1,3 +1,4 @@
+Fine-Design_Mobile_Attribute_Settings=\uC18D\uC131 \uC124\uC815
 Collect-Click!_Get_user_information_code=!\uB97C \uD074\uB9AD\uD558\uC5EC \uD65C\uC131\uD654\uCF54\uB4DC\uB97C \uBC1B\uC2B5\uB2C8\uB2E4.
 FIne-Design_Basic_Submit=\uC81C\uCD9C
 FIne-Design_Basic_System=\uC2DC\uC2A4\uD15C
@@ -2571,4 +2572,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778
 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4
 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D
-Fine_Design_Chart_Year=\uB144
+Fine_Design_Chart_Year=\uB144
+Fine-Design_Basic_DataSet_Rename_Warning=\uB370\uC774\uD130 \uC138\uD2B8 \uC774\uB984\uC774 \uADDC\uBC94\uC5D0 \uB9DE\uC9C0 \uC54A\uC73C\uBBC0\uB85C {} (\uC73C)\uB85C \uC9C0\uC815\uD558\uC9C0 \uB9C8\uC2ED\uC2DC\uC624!

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

@@ -2571,4 +2571,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027
 Fine-Engine_Fit-Impl=\u81EA\u9002\u5E94\u63D2\u4EF6
 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E
 Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
+Fine_Design_Chart_Year=\u5E74

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

@@ -1,3 +1,4 @@
+Fine-Design_Mobile_Attribute_Settings=\u5C6C\u6027\u8A2D\u5B9A
 Collect-Click!_Get_user_information_code=\u9EDE\u64CA!\u7372\u53D6\u6FC0\u6D3B\u78BC
 FIne-Design_Basic_Submit=\u63D0\u4EA4
 FIne-Design_Basic_System=\u7CFB\u7D71
@@ -2571,4 +2572,5 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027
 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6
 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C
 Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790
-Fine_Design_Chart_Year=\u5E74
+Fine_Design_Chart_Year=\u5E74
+Fine-Design_Basic_DataSet_Rename_Warning=\u8CC7\u6599\u96C6\u540D\u7A31\u4E0D\u5408\u898F\u7BC4\uFF0C\u8ACB\u52FF\u547D\u540D\u70BA{}\uFF01