Merge pull request #556 in DESIGN/design-i18n from final/10.0 to persist/10.0

* commit 'ba5fa181c004152b03a36d24d5fe53e78d85f22f':
  REPORT-26209 国际化CRM模板->代码库同步
  REPORT-26209 国际化CRM模板->代码库同步
  调整
  解决冲突
  REPORT-26209 国际化CRM模板->代码库同步
  REPORT-33236
  REPORT-33236
  REPORT-26209 国际化CRM模板->代码库同步
  REPORT-26209 国际化CRM模板->代码库同步
  REPORT-26209 国际化CRM模板->代码库同步
  REPORT-26209 国际化CRM模板->代码库同步
  CHART-13666  国际化
  REPORT-26209 国际化CRM模板->代码库同步

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

@@ -226,6 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=
 Fine-Design_Chart_Gauge_Pointer180=
 Fine-Design_Chart_Gauge_Ring=
 Fine-Design_Chart_Gauge_Slot=
+Fine-Design_Chart_Generate_Recommended_Chart=
 Fine-Design_Chart_Geographic=
 Fine-Design_Chart_Gis_Layer=
 Fine-Design_Chart_Gradient_Direction=

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

@@ -224,8 +224,9 @@ Fine-Design_Chart_Gap_Series=Series Interval
 Fine-Design_Chart_Gauge_Cuvette=Tube Dashboard
 Fine-Design_Chart_Gauge_Pointer=Multi-Pointer Dashboard(360)
 Fine-Design_Chart_Gauge_Pointer180=Multi-Pointer Dashboard(180)
-Fine-Design_Chart_Gauge_Ring=100% Doughnut Dashboard
-Fine-Design_Chart_Gauge_Slot=100% Solid Dashboard
+Fine-Design_Chart_Gauge_Ring=Doughnut Gauge
+Fine-Design_Chart_Gauge_Slot=Angular Gauge
+Fine-Design_Chart_Generate_Recommended_Chart=Generating recommended chart
 Fine-Design_Chart_Geographic=Geographic Info
 Fine-Design_Chart_Gis_Layer=GIS Layer
 Fine-Design_Chart_Gradient_Direction=Gradient Direction

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

@@ -226,6 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=360\u00B0\u591A\u30DD\u30A4\u30F3\u30BF\u306E\u3
 Fine-Design_Chart_Gauge_Pointer180=180\u00B0\u591A\u30DD\u30A4\u30F3\u30BF\u306E\u30E1\u30FC\u30BF\u30FC
 Fine-Design_Chart_Gauge_Ring=\u30EA\u30F3\u30B0\u30E1\u30FC\u30BF\u30FC(%)
 Fine-Design_Chart_Gauge_Slot=\u30B9\u30B1\u30FC\u30EB\u30E1\u30FC\u30BF\u30FC(\uFF05)
+Fine-Design_Chart_Generate_Recommended_Chart=\u63A8\u85A6\u30C1\u30E3\u30FC\u30C8\u3092\u751F\u6210\u4E2D\u3067\u3059
 Fine-Design_Chart_Geographic=\u5730\u7406\u60C5\u5831
 Fine-Design_Chart_Gis_Layer=GIS\u30EC\u30A4\u30E4
 Fine-Design_Chart_Gradient_Direction=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3\u65B9\u5411

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

@@ -226,6 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=\uBA40\uD2F0 \uD3EC\uC778\uD130 \uAC8C\uC774\uC9
 Fine-Design_Chart_Gauge_Pointer180=\uBA40\uD2F0 \uD3EC\uC778\uD130 \uAC8C\uC774\uC9C0(180)
 Fine-Design_Chart_Gauge_Ring=100% \uB3C4\uB108\uCE20 \uAC8C\uC774\uC9C0
 Fine-Design_Chart_Gauge_Slot=100% \uC194\uB9AC\uB4DC \uAC8C\uC774\uC9C0
+Fine-Design_Chart_Generate_Recommended_Chart=\uCD94\uCC9C \uCC28\uD2B8 \uC0DD\uC131 \uC911
 Fine-Design_Chart_Geographic=\uC9C0\uB9AC\uC801 \uC815\uBCF4
 Fine-Design_Chart_Gis_Layer=GIS\uB808\uC774\uC5B4
 Fine-Design_Chart_Gradient_Direction=\uADF8\uB77C\uB370\uC774\uC158 \uBC29\uD5A5

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

@@ -226,6 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=\u591A\u6307\u9488\u7684\u4EEA\u8868\u76D8360\u5
 Fine-Design_Chart_Gauge_Pointer180=\u591A\u6307\u9488\u7684\u4EEA\u8868\u76D8180\u5EA6
 Fine-Design_Chart_Gauge_Ring=\u767E\u5206\u6BD4\u5706\u73AF\u4EEA\u8868\u76D8
 Fine-Design_Chart_Gauge_Slot=\u767E\u5206\u6BD4\u523B\u5EA6\u69FD\u578B\u4EEA\u8868\u76D8
+Fine-Design_Chart_Generate_Recommended_Chart=\u6B63\u5728\u751F\u6210\u63A8\u8350\u56FE\u8868
 Fine-Design_Chart_Geographic=\u5730\u7406\u4FE1\u606F
 Fine-Design_Chart_Gis_Layer=GIS\u56FE\u5C42
 Fine-Design_Chart_Gradient_Direction=\u6E10\u53D8\u65B9\u5411

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

@@ -226,6 +226,7 @@ Fine-Design_Chart_Gauge_Pointer=\u591A\u6307\u91DD\u7684\u5100\u9336\u76E4360\u5
 Fine-Design_Chart_Gauge_Pointer180=\u591A\u6307\u91DD\u7684\u5100\u9336\u76E4180\u5EA6
 Fine-Design_Chart_Gauge_Ring=\u767E\u5206\u6BD4\u5713\u74B0\u5100\u9336\u76E4
 Fine-Design_Chart_Gauge_Slot=\u767E\u5206\u6BD4\u523B\u5EA6\u69FD\u578B\u5100\u9336\u76E4
+Fine-Design_Chart_Generate_Recommended_Chart=\u6B63\u5728\u751F\u6210\u63A8\u85A6\u5716\u8868
 Fine-Design_Chart_Geographic=\u5730\u7406\u8CC7\u8A0A
 Fine-Design_Chart_Gis_Layer=GIS\u5716\u5C64
 Fine-Design_Chart_Gradient_Direction=\u6F38\u8B8A\u65B9\u5411

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

@@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=
 Fine-Design_Basic_Not_Null_Des=
 Fine-Design_Basic_Not_Support_Authority_Edit=
 Fine-Design_Basic_OccurrenceOf=
+Fine-Design_Basic_Odbc_Tips=
 Fine-Design_Basic_Official_Website=
 Fine-Design_Basic_Ok=
 Fine-Design_Basic_Only_Submit_Current_Sheet=
@@ -1588,7 +1589,6 @@ 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,5 +2571,4 @@ 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_Basic_DataSet_Rename_Warning=
+Fine_Design_Chart_Year=

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

@@ -196,10 +196,10 @@ Fine-Design_Basic_Community_sign=Engineer Certification
 Fine-Design_Basic_Compile=Compile
 Fine-Design_Basic_Compile_Save_Attention=Can be saved correctly after successfully compiled.
 Fine-Design_Basic_Compile_Success=Successfully Compiled
-Fine-Design_Basic_Component_Name=Component Name
-Fine-Design_Basic_Component_Position=Component Location 
-Fine-Design_Basic_Component_Settings=Component Settings 
-Fine-Design_Basic_Component_Size=Component Size
+Fine-Design_Basic_Component_Name=Widget Name
+Fine-Design_Basic_Component_Position=Widget Location 
+Fine-Design_Basic_Component_Settings=Widget Settings 
+Fine-Design_Basic_Component_Size=Widget Size
 Fine-Design_Basic_ConditionB_Add_bracket=Add Brackets
 Fine-Design_Basic_ConditionB_Operator=Operators
 Fine-Design_Basic_ConditionB_Remove_bracket=Remove Brackets
@@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=Normal
 Fine-Design_Basic_Not_Null_Des=NOT NULL
 Fine-Design_Basic_Not_Support_Authority_Edit=This element does not support access control
 Fine-Design_Basic_OccurrenceOf=When "{0}" Occurs
+Fine-Design_Basic_Odbc_Tips=How to connect ODBC data source
 Fine-Design_Basic_Official_Website=Official Website:
 Fine-Design_Basic_Ok=OK
 Fine-Design_Basic_Only_Submit_Current_Sheet=Submit Current Sheet Only
@@ -664,7 +665,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=Show Parameter Pane
+Fine-Design_Basic_Parameter_UI_Display=Display Parameter Pane
 Fine-Design_Basic_Parameters=Parameters
 Fine-Design_Basic_Parent_Marked_Field=Parent Tag Field
 Fine-Design_Basic_Password=Password
@@ -1107,7 +1108,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=Widget Library
+Fine-Design_Basic_Widget_Library=Component Library
 Fine-Design_Basic_Widget_Load_By_Async=Async Load
 Fine-Design_Basic_Widget_Name=Widget Name
 Fine-Design_Basic_Widget_Position=Widget Location
@@ -1123,15 +1124,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 Widget
+Fine-Design_Basic_Widget_Type_Date=Date
 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 Widget
+Fine-Design_Basic_Widget_Type_Password=Password
 Fine-Design_Basic_Widget_Type_Radio_Group=Radio Button Group
-Fine-Design_Basic_Widget_Type_Text=Text Widget
-Fine-Design_Basic_Widget_Type_Textarea=Text Field
+Fine-Design_Basic_Widget_Type_Text=Text Field
+Fine-Design_Basic_Widget_Type_Textarea=Text Area
 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
@@ -1420,7 +1421,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=Widget is selectable
+Fine-Design_Form_Functional_When_Unactivated=Component is selectable
 Fine-Design_Form_Golden=Golden
 Fine-Design_Form_Grid_Layout=Grid Layout
 Fine-Design_Form_Hgap=Horizontal Gap
@@ -1501,7 +1502,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 Module successfully installed!
+Fine-Design_Form_Share_Module_OK=Shared component 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
@@ -1586,9 +1587,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 Widget Edit(Popup Menu)
-Fine-Design_Function_Form_Widget_Edit_Toolbar=Form Widget Edit(Toolbar)
-Fine-Design_Mobile_Attribute_Settings=Attribute Settings
+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_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 +1597,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 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_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_Sidebar=Sidebar
 Fine-Design_Mobile_BookMark_Style_Sidebar_Background_Color=BG Color
 Fine-Design_Mobile_BookMark_Style_Sidebar_Border_Color=Border Color
@@ -1644,7 +1644,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 widget<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 component<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
@@ -1788,7 +1788,7 @@ Fine-Design_Report_Cancel_Repeat_Attributes=Cancel duplicate rows and columns
 Fine-Design_Report_CellElement_Property_Table=Cell Attribute Table
 Fine-Design_Report_CellPage_Can_Break_On_Paginate=Can break when paging
 Fine-Design_Report_CellPage_Repeat_Content_When_Paging=Repeat content when paging
-Fine-Design_Report_CellWrite_InsertRow_COPY=Original Value
+Fine-Design_Report_CellWrite_InsertRow_COPY=Original
 Fine-Design_Report_CellWrite_InsertRow_NULL=NULL
 Fine-Design_Report_CellWrite_InsertRow_Policy=Insert Row Policy
 Fine-Design_Report_CellWrite_Page_After_Column=Paginate After Column
@@ -2009,7 +2009,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 Field
+Fine-Design_Report_Form_TextArea=Text Area
 Fine-Design_Report_Format=Format
 Fine-Design_Report_Formula=Formula
 Fine-Design_Report_Formula_Group=Formula Group
@@ -2132,7 +2132,7 @@ Fine-Design_Report_Mobile_ToolBar=Toolbar
 Fine-Design_Report_Mobile_Vertical=Vertical Screen
 Fine-Design_Report_Mobile_Zoom=Zoom
 Fine-Design_Report_NS_Exception_ReadError=Error code:11300005 Template file parsing error
-Fine-Design_Report_New_Value=New Value
+Fine-Design_Report_New_Value=New
 Fine-Design_Report_No=No
 Fine-Design_Report_No_Auto_Adjust=No Automatic Adjustment
 Fine-Design_Report_No_Border_Line=No Border
@@ -2570,6 +2570,5 @@ Fine-Designer_PC_Element_Case_Fit_Attr=PC element adaptive attr
 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
-Fine_Design_Chart_Year=Year
-Fine-Design_Basic_DataSet_Rename_Warning=Dataset name is illegal, please do not name it as {}!
+Fine_Design_Basic_M_Data_Analysis=Data Analysis Preview
+Fine_Design_Chart_Year=Year

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

@@ -637,8 +637,9 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u7A7A\u767D\u4E0D\u53EF
 Fine-Design_Basic_Not_Support_Authority_Edit=\u3053\u306E\u8981\u7D20\u306F\u6A29\u9650\u5236\u5FA1\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093
 Fine-Design_Basic_OccurrenceOf=\u51FA\u73FE\u56DE\u6570 "{0}"
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u306BODBS\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u63A5\u7D9A\u3059\u308B\u304B
 Fine-Design_Basic_Official_Website=\u516C\u5F0F\u30B5\u30A4\u30C8\uFF1A
-Fine-Design_Basic_Ok=\u597D
+Fine-Design_Basic_Ok=\u306F\u3044
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u5F53\u8A72sheet\u306E\u307F\u3092\u9001\u4FE1\u3059\u308B
 Fine-Design_Basic_Open=\u958B\u304F
 Fine-Design_Basic_Open-New_Form_Tip=\u73FE\u5728\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F7.11\u4EE5\u4E0B\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u4F5C\u6210\u3055\u308C\u305F\u306E\u3067\u3001\u4E92\u63DB\u6027\u304C\u306A\u304F\u3001\u958B\u3051\u307E\u305B\u3093\u3002 \u5BFE\u5FDC\u3059\u308B\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30C7\u30B6\u30A4\u30CA\u3067\u958B\u3044\u3066\u304F\u3060\u3055\u3044
@@ -867,7 +868,7 @@ Fine-Design_Basic_Reportlet=Web\u5E33\u7968
 Fine-Design_Basic_Reportlet_Parameter_Type=\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6E21\u3059\u65B9\u6CD5
 Fine-Design_Basic_Required=\u8A18\u5165\u5FC5\u9808
 Fine-Design_Basic_Reset=\u30EA\u30BB\u30C3\u30C8
-Fine-Design_Basic_Restart=\u91CD\u542F
+Fine-Design_Basic_Restart=\u518D\u8D77\u52D5
 Fine-Design_Basic_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u3092\u518D\u8D77\u52D5\u3059\u308B
 Fine-Design_Basic_Restart_Designer_Later=\u5F8C\u3067\u518D\u8D77\u52D5\u3059\u308B
 Fine-Design_Basic_Right=\u53F3
@@ -1119,8 +1120,8 @@ Fine-Design_Basic_Widget_Size=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u306E\u5927\u
 Fine-Design_Basic_Widget_Style_Preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 Fine-Design_Basic_Widget_TreeNode=\u30C4\u30EA\u30FC\u30CE\u30FC\u30C9\u30DC\u30BF\u30F3
 Fine-Design_Basic_Widget_Type_Button=\u30DC\u30BF\u30F3
-Fine-Design_Basic_Widget_Type_Checkbox=\u30C1\u30E3\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
-Fine-Design_Basic_Widget_Type_Checkbox_Group=\u30C1\u30E3\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u30B0\u30EB\u30FC\u30D7
+Fine-Design_Basic_Widget_Type_Checkbox=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
+Fine-Design_Basic_Widget_Type_Checkbox_Group=\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u30B0\u30EB\u30FC\u30D7
 Fine-Design_Basic_Widget_Type_Combo_Box=\u30D7\u30EB\u30C0\u30A6\u30F3\u30DC\u30C3\u30AF\u30B9
 Fine-Design_Basic_Widget_Type_Combo_Checkbox=\u30D7\u30EB\u30C0\u30A6\u30F3\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9
 Fine-Design_Basic_Widget_Type_Date=\u65E5\u4ED8
@@ -1298,8 +1299,8 @@ Fine-Design_Embed_Server=\u7D44\u307F\u8FBC\u307F\u30B5\u30FC\u30D0
 Fine-Design_Encode_Auto=\u81EA\u52D5
 Fine-Design_Encrypt_Decrypt_Exception=\u6A29\u9650\u306E\u306A\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002
 Fine-Design_End_Occupied_Process=\u7ED3\u675F\u8FDB\u7A0B
-Fine-Design_Error_Fall_Back_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF
-Fine-Design_Error_Fall_Back_Report=\u8BBE\u8BA1\u5668\u95EA\u9000\u62A5\u544A
+Fine-Design_Error_Fall_Back_Apology_Message=\u30C7\u30B6\u30A4\u30CA\u30FC\u306F\u4E88\u60F3\u4EE5\u5916\u306E\u30A8\u30E9\u30FC\u304C\u51FA\u307E\u3057\u305F
+Fine-Design_Error_Fall_Back_Report=\u4E88\u60F3\u4EE5\u5916\u306E\u30A8\u30E9\u30FC\u3067\u5F37\u5236\u7D42\u4E86\u3055\u308C\u305F\u5831\u544A
 Fine-Design_Error_Finedb_Backup_Reset=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u914D\u7F6E\u306B\u9593\u9055\u3044\u304C\u3042\u308A\u3001\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059\u304B\u3002\u305D\u3046\u3059\u308B\u3068\u3001embed\u30D5\u30A3\u30EB\u30C0\u3067\u30D1\u30C3\u30AF\u30A2\u30C3\u30D7\u3092\u751F\u3058\u3066\u3001\u30EA\u30BB\u30C3\u30C8\u3057\u307E\u3059\u3002
 Fine-Design_Error_Finedb_Backup_Reset_Result=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30EA\u30BB\u30C3\u30C8\u5931\u6557\u3001\u81EA\u5206\u3067\u30D5\u30A9\u30EB\u30C0{}\u3092\u307B\u304B\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3057\u3066\u304B\u3089\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 Fine-Design_Error_Finedb_Problem_Message=finedb\u635F\u574F\u6216\u88AB\u5176\u4ED6\u7A0B\u5E8F\u5360\u7528
@@ -1310,10 +1311,10 @@ Fine-Design_Error_Remote_No_Response_Message=\u8FDC\u7A0B\u8BBE\u8BA1\u670D\u52A
 Fine-Design_Error_Remote_No_Response_Switch=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u5207\u308A\u66FF\u3048\u308B
 Fine-Design_Error_Remote_No_Response_Tip=\u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u6642\u9593\u304C\u666E\u6BB5\u3088\u308A\u9577\u3044\u3001\u5F15\u304D\u7D9A\u304D\u5F85\u3061\u307E\u3059\u304B\u3002
 Fine-Design_Error_Remote_No_Response_Wait=\u5F15\u304D\u7D9A\u304D\u5F85\u3064
-Fine-Design_Error_Start_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u542F\u52A8\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF
-Fine-Design_Error_Start_Report=\u542F\u52A8\u5931\u8D25\u62A5\u544A
-Fine-Design_Error_UnExcepted_Fall_Back=\u9884\u671F\u5916\u7684\u95EA\u9000\u9519\u8BEF
-Fine-Design_Error_UnExcepted_Start_Failed=\u9884\u671F\u5916\u7684\u542F\u52A8\u9519\u8BEF
+Fine-Design_Error_Start_Apology_Message=\u30C7\u30B6\u30A4\u30CA\u30FC\u3092\u7ACB\u3061\u4E0A\u3052\u308B\u6642\u306B\u4E88\u60F3\u4EE5\u5916\u306E\u30A8\u30E9\u30FC\u304C\u51FA\u307E\u3057\u305F
+Fine-Design_Error_Start_Report=\u8D77\u52D5\u5931\u6557\u5831\u544A
+Fine-Design_Error_UnExcepted_Fall_Back=\u4E88\u60F3\u4EE5\u5916\u306E\u30A8\u30E9\u30FC\u3067\u5F37\u5236\u7D42\u4E86\u3055\u308C\u307E\u3057\u305F
+Fine-Design_Error_UnExcepted_Start_Failed=\u4E88\u60F3\u4EE5\u5916\u306E\u30A8\u30E9\u30FC\u3067\u8D77\u52D5\u5931\u6557
 Fine-Design_Find_New_Version=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059
 Fine-Design_Form-Widget_Name=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u540D
 Fine-Design_Form_Adaptive=\u81EA\u52D5\u8ABF\u6574
@@ -1527,7 +1528,7 @@ Fine-Design_Form_ToolBar_Widget=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
 Fine-Design_Form_Toolbar_Custom_Button=\u30AB\u30B9\u30BF\u30E0\u30DC\u30BF\u30F3
 Fine-Design_Form_Toolbar_Setting=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C4\u30FC\u30EB\u30D0\u30FC\u8A2D\u5B9A
 Fine-Design_Form_Total=\u5408\u8A08
-Fine-Design_Form_Use_Params_Template=\u3088\u304F\u4F7F\u308F\u308C\u308B\u30D1\u30E9\u30E1\u30FC\u30BF\u7D44
+Fine-Design_Form_Use_Params_Template=\u3088\u304F\u4F7F\u308F\u308C\u308B\u691C\u7D22\u6761\u4EF6
 Fine-Design_Form_Using_Server_Report_View_Settings=\u30B5\u30FC\u30D0\u8A2D\u5B9A
 Fine-Design_Form_Verify_Message=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
 Fine-Design_Form_Vertical_Box_Layout=\u5782\u76F4\u30DC\u30C3\u30AF\u30B9\u30EC\u30A4\u30A2\u30A6\u30C8
@@ -1588,7 +1589,6 @@ 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
@@ -1677,8 +1677,8 @@ Fine-Design_Offline_Helptutorial_Msg=\u4ECA\u306F\u30AA\u30D5\u30E9\u30A4\u30F3\
 Fine-Design_Parameter_Panel=\u30D1\u30E9\u30E1\u30FC\u30BF\u30D1\u30CD\u30EB
 Fine-Design_Plugin_Has_Been_Actived_Duplicate=\u30D7\u30E9\u30B0\u30A4\u30F3\u304C\u6709\u52B9\u306B\u306A\u308A\u307E\u3059
 Fine-Design_Plugin_Update_Log=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30ED\u30B0
-Fine-Design_Port_Found_Port_Conflict=\u53D1\u73B0\u4E0E\u8BBE\u8BA1\u5668\u7AEF\u53E3\u51B2\u7A81\u7684\u8FDB\u7A0B\uFF0C\u8BF7\u7ED3\u675F\u8FDB\u7A0B\u6216\u66F4\u6539\u8BBE\u8BA1\u5668\u7AEF\u53E3
-Fine-Design_Problem_Detail_Message=\u95EE\u9898\u8BE6\u7EC6\u4FE1\u606F
+Fine-Design_Port_Found_Port_Conflict=\u30C7\u30B6\u30A4\u30CA\u30FC\u30DD\u30FC\u30C8\u3068\u7AF6\u5408\u3059\u308B\u30D7\u30ED\u30BB\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\u30D7\u30ED\u30BB\u30B9\u3092\u7D42\u4E86\u3059\u308B\u304B\u3001\u30C7\u30B6\u30A4\u30CA\u30FC\u30DD\u30FC\u30C8\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044
+Fine-Design_Problem_Detail_Message=\u30A8\u30E9\u30FC\u306E\u8A73\u7D30\u60C5\u5831
 Fine-Design_Prompt_When_Leave_Without_Submit=\u672A\u66F8\u304D\u8FBC\u307F\u306E\u72B6\u614B\u3067\u96E2\u308C\u308B\u6642\u306E\u30D2\u30F3\u30C8
 Fine-Design_Push_Update_Focus_Point=10,0\u66F4\u65B0\u60C5\u5831\u30D7\u30C3\u30B7\u30E5\u30D5\u30A9\u30FC\u30AB\u30B9\u30DD\u30A4\u30F3\u30C8
 Fine-Design_Remind_Me_Next_Time=\u6B21\u56DE\u8D77\u52D5\u3059\u308B\u6642\u30EA\u30DE\u30A4\u30F3\u30C9
@@ -2468,7 +2468,7 @@ Fine-Design_Report_Y_Coordinate=\u7E26\u5EA7\u6A19
 Fine-Design_Report_Yes=\u306F\u3044
 Fine-Design_Report_Zero_Margin_Warn=\u30D7\u30EA\u30F3\u30BF\u306F\u7269\u7406\u7684\u306A<br>\u30DE\u30FC\u30B8\u30F3\u304C\u3042\u308B\u306E\u3067\u3001<br>\u5E33\u7968\u306E\u30DE\u30FC\u30B8\u30F3\u304C<br>\u8DB3\u308A\u306A\u3044\u3068\u4E00\u90E8\u306E<br>\u5185\u5BB9\u304C\u8868\u793A\u3055\u308C\u306A\u304F\u306A\u308A\u307E\u3059<br>&nbsp
 Fine-Design_See_More_New_Features=\u3055\u3089\u306B\u591A\u3044\u306E\u65B0\u7279\u6027\u3092\u30C1\u30A7\u30C3\u30AF
-Fine-Design_Send_Report_To_Us=\u53D1\u9001\u62A5\u544A\u5E2E\u52A9\u6211\u4EEC\u66F4\u597D\u5730\u4F18\u5316\u4EA7\u54C1\uFF0C\u6211\u4EEC\u4F1A\u5BF9\u6536\u96C6\u7684\u4E00\u5207\u7684\u4FE1\u606F\u4FDD\u5BC6\uFF0C\u5E76\u627F\u8BFA\u53EA\u7528\u4E8E\u4EA7\u54C1\u6539\u8FDB
+Fine-Design_Send_Report_To_Us=\u88FD\u54C1\u306E\u6700\u9069\u5316\u306B\u5F79\u7ACB\u3064\u30EC\u30DD\u30FC\u30C8\u3092\u9001\u4FE1\u3057\u307E\u3059\u3002\u53CE\u96C6\u3057\u305F\u3059\u3079\u3066\u306E\u60C5\u5831\u306F\u6A5F\u5BC6\u60C5\u5831\u3068\u3057\u3066\u6271\u3044\u3001\u88FD\u54C1\u306E\u6539\u5584\u306B\u306E\u307F\u4F7F\u7528\u3057\u307E\u3059
 Fine-Design_Skip_This_Version=\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30B9\u30AD\u30C3\u30D7
 Fine-Design_Software_Download_Url=\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9URL
 Fine-Design_Startup_When_Needed=\u4F7F\u7528\u6642\u306E\u8D77\u52D5\uFF08\u63A8\u5968\uFF09
@@ -2571,5 +2571,4 @@ 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_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
+Fine_Design_Chart_Year=\u5E74

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

@@ -1,4 +1,3 @@
-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
@@ -638,6 +637,7 @@ Fine-Design_Basic_Normal=\uC815\uC0C1
 Fine-Design_Basic_Not_Null_Des=NOT NULL
 Fine-Design_Basic_Not_Support_Authority_Edit=\uD574\uB2F9 \uC694\uC18C\uB294 \uAD8C\uD55C \uC81C\uC5B4\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 Fine-Design_Basic_OccurrenceOf="{0}" \uBC1C\uC0DD
+Fine-Design_Basic_Odbc_Tips=ODBC \uB370\uC774\uD130 \uC18C\uC2A4\uB97C \uC5F0\uACB0\uD558\uB294 \uBC29\uBC95
 Fine-Design_Basic_Official_Website=\uACF5\uC2DD \uC6F9\uC0AC\uC774\uD2B8:
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\uD604\uC7AC sheet\uB9CC \uC81C\uCD9C
@@ -2571,5 +2571,4 @@ 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_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!
+Fine_Design_Chart_Year=\uB144

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

@@ -637,6 +637,7 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u4E0D\u80FD\u4E3A\u7A7A
 Fine-Design_Basic_Not_Support_Authority_Edit=\u8BE5\u5143\u7D20\u4E0D\u652F\u6301\u6743\u9650\u63A7\u5236
 Fine-Design_Basic_OccurrenceOf=\u6709"{0}"\u51FA\u73B0
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u8FDE\u63A5ODBC\u6570\u636E\u6E90
 Fine-Design_Basic_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u5F53\u524Dsheet
@@ -2570,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,4 +1,3 @@
-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
@@ -638,6 +637,7 @@ Fine-Design_Basic_Normal=\u6B63\u5E38
 Fine-Design_Basic_Not_Null_Des=\u4E0D\u80FD\u70BA\u7A7A
 Fine-Design_Basic_Not_Support_Authority_Edit=\u8A72\u5143\u7D20\u4E0D\u652F\u63F4\u6B0A\u9650\u63A7\u5236
 Fine-Design_Basic_OccurrenceOf=\u6709"{0}"\u51FA\u73FE
+Fine-Design_Basic_Odbc_Tips=\u5982\u4F55\u9023\u7D50ODBC\u8CC7\u6599\u4F86\u6E90
 Fine-Design_Basic_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A
 Fine-Design_Basic_Ok=\u597D
 Fine-Design_Basic_Only_Submit_Current_Sheet=\u53EA\u63D0\u4EA4\u7576\u524DSHEET
@@ -2571,5 +2571,4 @@ 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_Basic_DataSet_Rename_Warning=\u8CC7\u6599\u96C6\u540D\u7A31\u4E0D\u5408\u898F\u7BC4\uFF0C\u8ACB\u52FF\u547D\u540D\u70BA{}\uFF01
+Fine_Design_Chart_Year=\u5E74