diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
index cf1f23d..6f16189 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=
Fine-Design_Chart_CurveLine=
Fine-Design_Chart_Curve_Line=
Fine-Design_Chart_Curve_Smooth=
-Fine-Design_Chart_Rich_Text=
-Fine-Design_Chart_Rich_Text_Edit=
Fine-Design_Chart_Custom=
Fine-Design_Chart_Custom_Axis=
Fine-Design_Chart_Custom_Color=
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=
Fine-Design_Chart_Respectively_Specified=
Fine-Design_Chart_Result_Data=
Fine-Design_Chart_Reversal=
+Fine-Design_Chart_Rich_Text=
+Fine-Design_Chart_Rich_Text_Edit=
Fine-Design_Chart_Right_Boundary=
Fine-Design_Chart_Right_Top=
Fine-Design_Chart_Rotation=
diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
index 320f0c6..74ecedd 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties
@@ -121,7 +121,7 @@ Fine-Design_Chart_Combine_Map=Combination Map
Fine-Design_Chart_Common=Common
Fine-Design_Chart_Condition_Attributes=Conditional Attributes
Fine-Design_Chart_Condition_Config=Status Config
-Fine-Design_Chart_Condition_Display=Conditional Display
+Fine-Design_Chart_Condition_Display=Conditional Format
Fine-Design_Chart_Connect_WMP=Connection
Fine-Design_Chart_Connecting_WMP=Connecting
Fine-Design_Chart_Continuity=Continuity
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=Curve
Fine-Design_Chart_CurveLine=Curve Line
Fine-Design_Chart_Curve_Line=Smooth Curve
Fine-Design_Chart_Curve_Smooth=Smooth Curve
-Fine-Design_Chart_Rich_Text=Rich Text
-Fine-Design_Chart_Rich_Text_Edit=Rich Text Edit
Fine-Design_Chart_Custom=Custom
Fine-Design_Chart_Custom_Axis=Custom Axis
Fine-Design_Chart_Custom_Color=Combination Color
@@ -292,9 +290,9 @@ Fine-Design_Chart_Label_OverlapAdjust=Auto Adjustment
Fine-Design_Chart_Label_OverlapHide=Hide Overlapped Labels
Fine-Design_Chart_Label_OverlapInterval=Interval Display
Fine-Design_Chart_Label_WhenOverlap=When Labels Overlap
-Fine-Design_Chart_Large_Data=Big Data
+Fine-Design_Chart_Large_Data=Large Data Volume
Fine-Design_Chart_Large_Data_Model_Prompt=(the sort order will change after optimization, but the time axis and the value axis will not be affected\\)
-Fine-Design_Chart_Large_Model=Big Data Model
+Fine-Design_Chart_Large_Model=Large Data Volume Mode
Fine-Design_Chart_LatLng=Long/Lat
Fine-Design_Chart_LatLng_Order=Lat&Long Order
Fine-Design_Chart_Latitude=Latitude
@@ -455,7 +453,7 @@ Fine-Design_Chart_Off=Off
Fine-Design_Chart_On=On
Fine-Design_Chart_Only_Use_Before_Records=Only use front records
Fine-Design_Chart_Open=On
-Fine-Design_Chart_Open_Large_Data_Model=Open big data optimization
+Fine-Design_Chart_Open_Large_Data_Model=Enable Large Data Volume Mode
Fine-Design_Chart_Origin=Original
Fine-Design_Chart_Outlier_Value=Outliers
Fine-Design_Chart_Pane_Background=Pane Background
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=Area Value
Fine-Design_Chart_Respectively_Specified=Specified Separately
Fine-Design_Chart_Result_Data=Result data
Fine-Design_Chart_Reversal=Reversal
+Fine-Design_Chart_Rich_Text=Rich Text
+Fine-Design_Chart_Rich_Text_Edit=Rich Text Edit
Fine-Design_Chart_Right_Boundary=Right Boundary
Fine-Design_Chart_Right_Top=Upper Right
Fine-Design_Chart_Rotation=Rotatable
diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
index 269da74..e0be4d4 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7DDA
Fine-Design_Chart_CurveLine=\u66F2\u7DDA
Fine-Design_Chart_Curve_Line=\u6ED1\u3089\u304B\u306A\u66F2\u7DDA
Fine-Design_Chart_Curve_Smooth=\u6ED1\u3089\u304B\u306A\u66F2\u7DDA
-Fine-Design_Chart_Rich_Text=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8
-Fine-Design_Chart_Rich_Text_Edit=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8\u7DE8\u96C6
Fine-Design_Chart_Custom=\u30AB\u30B9\u30BF\u30E0
Fine-Design_Chart_Custom_Axis=\u30AB\u30B9\u30BF\u30E0\u5EA7\u6A19\u8EF8
Fine-Design_Chart_Custom_Color=\u30B3\u30F3\u30D3\u30CD\u30FC\u30B7\u30E7\u30F3\u30AB\u30E9\u30FC
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=\u30A8\u30EA\u30A2\u306E\u5024
Fine-Design_Chart_Respectively_Specified=\u500B\u5225\u6307\u5B9A
Fine-Design_Chart_Result_Data=\u7D50\u679C\u30C7\u30FC\u30BF
Fine-Design_Chart_Reversal=\u53CD\u8EE2
+Fine-Design_Chart_Rich_Text=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8
+Fine-Design_Chart_Rich_Text_Edit=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8\u7DE8\u96C6
Fine-Design_Chart_Right_Boundary=\u53F3\u5883\u754C
Fine-Design_Chart_Right_Top=\u53F3\u4E0A
Fine-Design_Chart_Rotation=\u56DE\u8EE2\u53EF\u80FD
diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
index d1108a7..dd36578 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties
@@ -36,7 +36,7 @@ Fine-Design_Chart_Arrow_Style=\uD654\uC0B4\uD45C
Fine-Design_Chart_At_Least_One_Chart=\uCC28\uD2B8 \uD55C\uAC00\uC9C0 \uC120\uD0DD\uD558\uC138\uC694
Fine-Design_Chart_Auto=\uC790\uB3D9
Fine-Design_Chart_Auto_Adjust=\uC624\uBC84\uB7A9 \uC870\uC815
-Fine-Design_Chart_Auto_No_Match=
+Fine-Design_Chart_Auto_No_Match=\uD604\uC7AC \uB370\uC774\uD130\uAC00 \uC801\uC808\uD55C \uADF8\uB798\uD504\uC5D0 \uB9DE\uC9C0 \uC54A\uC73C\uBBC0\uB85C \uB370\uC774\uD130 \uC870\uC808 \uD6C4 \uB2E4\uC2DC \uC2DC\uB3C4\uD574\uC8FC\uC2DC\uAE30 \uBC14\uB78D\uB2C8\uB2E4.
Fine-Design_Chart_Auto_Recommended_Chart=\uC790\uB3D9 \uCD94\uCC9C \uCC28\uD2B8
Fine-Design_Chart_Auto_Refresh=\uC790\uB3D9 \uC7AC\uC0DD
Fine-Design_Chart_Auto_Sort=\uC790\uB3D9 \uC815\uC5F4
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=\uACE1\uC120
Fine-Design_Chart_CurveLine=\uACE1\uC120
Fine-Design_Chart_Curve_Line=\uBD80\uB4DC\uB7EC\uC6B4 \uACE1\uC120
Fine-Design_Chart_Curve_Smooth=\uBD80\uB4DC\uB7EC\uC6B4 \uACE1\uC120
-Fine-Design_Chart_Rich_Text=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8
-Fine-Design_Chart_Rich_Text_Edit=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1
Fine-Design_Chart_Custom=\uCEE4\uC2A4\uD140
Fine-Design_Chart_Custom_Axis=\uCEE4\uC2A4\uD140 \uC88C\uD45C\uCD95
Fine-Design_Chart_Custom_Color=\uC870\uD569\uC0C9
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=\uAD6C\uC5ED\uAC12
Fine-Design_Chart_Respectively_Specified=\uAC01\uBCBD \uACC4\uC0B0
Fine-Design_Chart_Result_Data=\uACB0\uACFC \uB370\uC774\uD130
Fine-Design_Chart_Reversal=\uD68C\uC804
+Fine-Design_Chart_Rich_Text=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8
+Fine-Design_Chart_Rich_Text_Edit=\uC11C\uC2DD\uC788\uB294 \uD14D\uC2A4\uD2B8 \uD3B8\uC9D1
Fine-Design_Chart_Right_Boundary=\uC624\uB978\uCABD \uBCC0\uB450\uB9AC
Fine-Design_Chart_Right_Top=\uC624\uB978\uCABD\uC704
Fine-Design_Chart_Rotation=\uD68C\uC804\uAC00\uB2A5
diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
index f6c00e3..816c44a 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7EBF
Fine-Design_Chart_CurveLine=\u66F2\u7EBF
Fine-Design_Chart_Curve_Line=\u5149\u6ED1\u66F2\u7EBF
Fine-Design_Chart_Curve_Smooth=\u5149\u6ED1\u66F2\u7EBF
-Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
-Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7F16\u8F91
Fine-Design_Chart_Custom=\u81EA\u5B9A\u4E49
Fine-Design_Chart_Custom_Axis=\u81EA\u5B9A\u4E49\u5750\u6807\u8F74
Fine-Design_Chart_Custom_Color=\u7EC4\u5408\u8272
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=\u533A\u57DF\u503C
Fine-Design_Chart_Respectively_Specified=\u5206\u522B\u6307\u5B9A
Fine-Design_Chart_Result_Data=\u7ED3\u679C\u6570\u636E
Fine-Design_Chart_Reversal=\u7FFB\u8F6C
+Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
+Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7F16\u8F91
Fine-Design_Chart_Right_Boundary=\u53F3\u8FB9\u754C
Fine-Design_Chart_Right_Top=\u53F3\u4E0A
Fine-Design_Chart_Rotation=\u53EF\u65CB\u8F6C
diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
index 545e4df..97e39fa 100644
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties
@@ -131,8 +131,6 @@ Fine-Design_Chart_Curve=\u66F2\u7DDA
Fine-Design_Chart_CurveLine=\u66F2\u7DDA
Fine-Design_Chart_Curve_Line=\u5149\u6ED1\u66F2\u7DDA
Fine-Design_Chart_Curve_Smooth=\u5149\u6ED1\u66F2\u7DDA
-Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
-Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7DE8\u8F2F
Fine-Design_Chart_Custom=\u81EA\u8A02
Fine-Design_Chart_Custom_Axis=\u81EA\u8A02\u5750\u6A19\u8EF8
Fine-Design_Chart_Custom_Color=\u7D44\u5408\u8272
@@ -508,6 +506,8 @@ Fine-Design_Chart_Region_Value=\u5340\u57DF\u503C
Fine-Design_Chart_Respectively_Specified=\u5206\u5225\u6307\u5B9A
Fine-Design_Chart_Result_Data=\u7D50\u679C\u8CC7\u6599
Fine-Design_Chart_Reversal=\u7FFB\u8F49
+Fine-Design_Chart_Rich_Text=\u5BCC\u6587\u672C
+Fine-Design_Chart_Rich_Text_Edit=\u5BCC\u6587\u672C\u7DE8\u8F2F
Fine-Design_Chart_Right_Boundary=\u53F3\u908A\u754C
Fine-Design_Chart_Right_Top=\u53F3\u4E0A
Fine-Design_Chart_Rotation=\u53EF\u65CB\u8F49
diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
index b6a702b..09f305f 100644
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties
@@ -2124,7 +2124,7 @@ Fine-Design_Report_M_Insert_Sub_Report=Insert Sub Report
Fine-Design_Report_M_Insert_Text=Insert Text
Fine-Design_Report_M_New_FormBook=New Dashboard
Fine-Design_Report_M_New_Multi_Report=New Aggregation Report(M)
-Fine-Design_Report_M_New_WorkBook=New Normal Report
+Fine-Design_Report_M_New_WorkBook=New General Report
Fine-Design_Report_M_Server_Server_Config_Manager=Server Configuration Manager
Fine-Design_Report_Main_Value_Axis=Main Value Axis
Fine-Design_Report_Margin=Margin
diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
index d56d985..0e35275 100644
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
@@ -376,7 +376,7 @@ Fine-Design_Basic_Engine_No_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092
Fine-Design_Basic_Engine_Parameter_Formula=\u6570\u5F0F
Fine-Design_Basic_Engine_Parameter_Name=\u30D1\u30E9\u30E1\u30FC\u30BF\u540D
Fine-Design_Basic_Engine_Schedule_Template_Parameter=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF
-Fine-Design_Basic_Enter_New_File_Name=\u65B0\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u540D
+Fine-Design_Basic_Enter_New_File_Name=\u65B0\u3057\u3044\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
Fine-Design_Basic_Enter_New_Folder_Name=\u65B0\u3057\u3044\u30D5\u30A9\u30EB\u30C0\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
Fine-Design_Basic_Env_Configure_Workspace=\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u8A2D\u5B9A
Fine-Design_Basic_Env_Des1=\u5E33\u7968\u30B5\u30FC\u30D0\u304C\u3042\u308BWEB-INF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
@@ -815,8 +815,8 @@ Fine-Design_Basic_Remote_Design_Add_Member=\u8A2D\u8A08\u30E1\u30F3\u30D0\u30FC\
Fine-Design_Basic_Remote_Design_Affected_Function=\u5F71\u97FF\u3055\u308C\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u6A5F\u80FD
Fine-Design_Basic_Remote_Design_Authority_Manager=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u6A29\u9650\u7BA1\u7406
Fine-Design_Basic_Remote_Design_Branch_Inconsistency=\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093
-Fine-Design_Basic_Remote_Design_Branch_Is_Old=\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4F4E\u3044
-Fine-Design_Basic_Remote_Design_Branch_Need_Update=\u6A5F\u80FD\u306E\u6B63\u5E38\u5229\u7528\u3092\u4FDD\u3064\u305F\u3081\u3001\u9069\u6642\u306B\u66F4\u65B0\u3057\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4E00\u81F4\u6027\u3092\u4FDD\u3064\u3053\u3068\u3092\u9032\u3081\u307E\u3059
+Fine-Design_Basic_Remote_Design_Branch_Is_Old=\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4EE5\u4E0B\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3088\u308A\u4F4E\u3044\uFF1A
+Fine-Design_Basic_Remote_Design_Branch_Need_Update=\u6A5F\u80FD\u306E\u6B63\u5E38\u5229\u7528\u3092\u4FDD\u3064\u305F\u3081\u3001\u9069\u6642\u306B\u66F4\u65B0\u3057\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4E00\u81F4\u6027\u3092\u4FDD\u3064\u3053\u3068\u3092\u52E7\u3081\u307E\u3059
Fine-Design_Basic_Remote_Design_Button_Confirm=\u78BA\u5B9A
Fine-Design_Basic_Remote_Design_Choose_Custom=\u30C7\u30B6\u30A4\u30F3\u5F79\u5272\u3092\u9078\u629E
Fine-Design_Basic_Remote_Design_Choose_Member=\u8A2D\u8A08\u30E1\u30F3\u30D0\u30FC\u3092\u9078\u629E
@@ -838,8 +838,8 @@ Fine-Design_Basic_Remote_Design_Selected_User=\u9078\u629E\u3057\u305F\u30C7\u30
Fine-Design_Basic_Remote_Design_Template_Authority_Config=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u8A2D\u8A08\u6A29\u9650\u8A2D\u5B9A
Fine-Design_Basic_Remote_Design_Title_Hint=\u30E1\u30C3\u30BB\u30FC\u30B8
Fine-Design_Basic_Remote_Design_User=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u30E6\u30FC\u30B6
-Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u306B\u63A5\u7D9A\u3067\u304D\u308B\u304C\u3001
\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002
-Fine-Design_Basic_Remote_Design_Version_Inconsistency=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u306F\u63A5\u7D9A\u3067\u304D\u307E\u3059\u304C\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4E0D\u4E00\u81F4\u3067\u3059\u3002\u63A5\u7D9A\u3092\u7D9A\u304D\u307E\u3059\u304B\uFF1F
+Fine-Design_Basic_Remote_Design_Version_Inconsistence_Test=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u306B\u63A5\u7D9A\u3067\u304D\u308B\u304C\u3001
\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093\u3002
+Fine-Design_Basic_Remote_Design_Version_Inconsistency=\u30EA\u30E2\u30FC\u30C8\u8A2D\u8A08\u306F\u63A5\u7D9A\u3067\u304D\u307E\u3059\u304C\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093\u3002\u63A5\u7D9A\u3092\u7D9A\u304D\u307E\u3059\u304B\uFF1F
Fine-Design_Basic_Remote_Disconnected=\u63A5\u7D9A\u304C\u5207\u65AD\u3055\u308C\u307E\u3057\u305F
Fine-Design_Basic_Remote_Env=\u30EA\u30E2\u30FC\u30C8\u74B0\u5883
Fine-Design_Basic_Remote_Env_Account_Password=\u30D1\u30B9\u30EF\u30FC\u30C9::
@@ -2580,6 +2580,7 @@ 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
+<<<<<<< HEAD
Fine_Design_Chart_Year=\u5E74
\u3001Fine-Design_Basic_Community_TechSupport=
Fine-Design_Predefined_Dark_Pattern=
@@ -2617,3 +2618,6 @@ Fine-Design_Basic_Predefined_Applicate_Format=
Fine-Design_Basic_Predefined_Set_Default=
Fine-Design_Basic_Predefined_Preview_Title_Text=
Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
+=======
+Fine_Design_Chart_Year=\u5E74
+>>>>>>> af23f0d325429aedfa25d49d2939b1cb4e0dcbaf
diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
index d918119..35dfbf7 100644
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
@@ -376,7 +376,7 @@ Fine-Design_Basic_Engine_No_TableData=\uB9AC\uD134 \uB370\uC774\uD130\uC14B\uC77
Fine-Design_Basic_Engine_Parameter_Formula=\uC218\uC2DD
Fine-Design_Basic_Engine_Parameter_Name=\uD30C\uB77C\uBBF8\uD130 \uC774\uB984
Fine-Design_Basic_Engine_Schedule_Template_Parameter=\uD15C\uD50C\uB9BF \uD30C\uB77C\uBBF8\uD130
-Fine-Design_Basic_Enter_New_File_Name=\uC0C8 \uD30C\uC77C \uC774\uB984
+Fine-Design_Basic_Enter_New_File_Name=\uC0C8\uB85C\uC6B4 \uD30C\uC77C\uC774\uB984\uC744 \uC785\uB825\uD574\uC8FC\uC2ED\uC2DC\uC624.
Fine-Design_Basic_Enter_New_Folder_Name=\uC0C8\uB85C\uC6B4 \uD3F4\uB354\uC774\uB984\uC744 \uC785\uB825\uD558\uC138\uC694.
Fine-Design_Basic_Env_Configure_Workspace=\uB514\uB809\uD130\uB9AC \uC124\uC815
Fine-Design_Basic_Env_Des1=\uB9AC\uD3EC\uD2B8\uC11C\uBC84 \uD574\uB2F9 WEB-INF \uB514\uB809\uD130\uB9AC\uB97C \uC120\uD0DD\uD574\uC8FC\uC2ED\uC2DC\uC624.
@@ -641,7 +641,7 @@ Fine-Design_Basic_Not_Support_Authority_Edit=\uD574\uB2F9 \uC694\uC18C\uB294 \uA
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_Ok=\uB124
Fine-Design_Basic_Only_Submit_Current_Sheet=\uD604\uC7AC sheet\uB9CC \uC81C\uCD9C
Fine-Design_Basic_Open=\uC5F4\uAE30
Fine-Design_Basic_Open-New_Form_Tip=\uD604\uC7AC \uD15C\uD50C\uB9BF\uC740 711\uC774\uD558 \uBC84\uC804\uC758 \uB514\uC790\uC774\uB108\uB85C \uC791\uC131\uB418\uC5B4 \uD638\uD658\uB418\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.
@@ -870,7 +870,7 @@ Fine-Design_Basic_Reportlet=\uC6F9 \uB9AC\uD3EC\uD2B8
Fine-Design_Basic_Reportlet_Parameter_Type=\uB9E4\uAC1C\uBCC0\uC218 \uC804\uB2EC\uBC29\uC2DD
Fine-Design_Basic_Required=\uD544\uC218 \uC785\uB825\uD56D\uBAA9
Fine-Design_Basic_Reset=\uB9AC\uC14B
-Fine-Design_Basic_Restart=\u91CD\u542F
+Fine-Design_Basic_Restart=\uB2E4\uC2DC \uC2DC\uC791
Fine-Design_Basic_Restart_Designer=\uB514\uC790\uC774\uB108 \uC7AC\uBD80\uD305
Fine-Design_Basic_Restart_Designer_Later=\uC7A0\uC2DC\uD6C4 \uC7AC\uBD80\uD305 \uD574\uC8FC\uC2ED\uC2DC\uC624.
Fine-Design_Basic_Right=\uC6B0
@@ -1302,8 +1302,8 @@ Fine-Design_Embed_Server=\uB0B4\uC7A5 \uC11C\uBC84
Fine-Design_Encode_Auto=\uC790\uB3D9
Fine-Design_Encrypt_Decrypt_Exception=\uBB34\uB2E8 \uC554\uD638\uD654 \uD15C\uD50C\uB9BF\uC744 \uC5F4 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4
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=\uC8C4\uC1A1\uD569\uB2C8\uB2E4. \uB514\uC790\uC774\uB108\uC5D0\uC11C \uC608\uAE30\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+Fine-Design_Error_Fall_Back_Report=\uB514\uC790\uC774\uB108 \uC624\uB958 \uBCF4\uACE0
Fine-Design_Error_Finedb_Backup_Reset=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uBC30\uCE58\uAC00 \uC624\uB958\uC785\uB2C8\uB2E4. \uB9AC\uC14B\uD788\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? embed \uD3F4\uB354\uC5D0 \uBC31\uC5C5\uC774 \uC0DD\uC131\uD558\uACE0 \uB9AC\uC14B\uD560 \uAC83\uC774\uB2E4
Fine-Design_Error_Finedb_Backup_Reset_Result=\uBC31\uC5C5 \uB9AC\uC14B \uC2E4\uD328\uD588\uC73C\uBBC0\uB85C \uC218\uB3D9\uC73C\uB85C {} \uD3F4\uB354\uB97C \uB2E4\uB978 \uB514\uB809\uD130\uB9AC\uC5D0 \uBC31\uC5C5\uD558\uACE0 \uC0AD\uC81C\uD558\uC2ED\uC2DC\uC624
Fine-Design_Error_Finedb_Problem_Message=finedb\u635F\u574F\u6216\u88AB\u5176\u4ED6\u7A0B\u5E8F\u5360\u7528
@@ -1314,10 +1314,10 @@ Fine-Design_Error_Remote_No_Response_Message=\u8FDC\u7A0B\u8BBE\u8BA1\u670D\u52A
Fine-Design_Error_Remote_No_Response_Switch=\uB514\uB809\uD1A0\uB9AC \uC804\uD658
Fine-Design_Error_Remote_No_Response_Tip=\uC6D0\uACA9 \uC5F0\uACB0 \uC2DC\uAC04\uC774 \uB108\uBB34 \uAE38\uBA74 \uACC4\uC18D \uAE30\uB2E4\uB9AC\uC2ED\uB2C8\uAE4C?
Fine-Design_Error_Remote_No_Response_Wait=\uACC4\uC18D \uAE30\uB2E4\uB9AC\uB2E4
-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_Apology_Message=\uC8C4\uC1A1\uD569\uB2C8\uB2E4. \uB514\uC790\uC774\uB108\uC5D0\uC11C \uC608\uAE30\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
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_UnExcepted_Fall_Back=\uB514\uC790\uC774\uB108\uC5D0\uC11C \uC608\uAE30\uCE58 \uC54A\uC740 \uC624\uB958
+Fine-Design_Error_UnExcepted_Start_Failed=\uB514\uC790\uC774\uB108\uC5D0\uC11C \uC608\uAE30\uCE58 \uC54A\uC740 \uC624\uB958
Fine-Design_Find_New_Version=\uC0C8\uB85C\uC6B4 \uBC84\uC804 \uBC1C\uACAC
Fine-Design_Form-Widget_Name=\uCEE8\uD2B8\uB864 \uC774\uB984
Fine-Design_Form_Adaptive=\uC801\uC751
@@ -1654,15 +1654,15 @@ Fine-Design_Mobile_Spit_Line=\uBD84\uD560\uC120
Fine-Design_Mobile_Tab_Button_Background=Button Background
Fine-Design_Mobile_Tab_Button_Padding=Button Padding
Fine-Design_Mobile_Tab_Char=Char
-Fine-Design_Mobile_Tab_Float=
-Fine-Design_Mobile_Tab_Holder_Place=
+Fine-Design_Mobile_Tab_Float=\uD50C\uB85C\uD305 \uB514\uC2A4\uD50C\uB808\uC774
+Fine-Design_Mobile_Tab_Holder_Place=\uD640\uB354 \uD45C\uC2DC
Fine-Design_Mobile_Tab_Init_Char=InitChar
Fine-Design_Mobile_Tab_Min_Width=Tab\uCD5C\uC18C \uB108\uBE44
Fine-Design_Mobile_Tab_Select_Char=SelectChar
-Fine-Design_Mobile_Tab_Show_Indicator=
-Fine-Design_Mobile_Tab_Show_Indicator_type=
-Fine-Design_Mobile_Tab_Show_Title=
-Fine-Design_Mobile_Tab_Slide=
+Fine-Design_Mobile_Tab_Show_Indicator=\uB3C4\uD2B8 \uC778\uB514\uCF00\uC774\uD130\uB97C \uD45C\uC2DC
+Fine-Design_Mobile_Tab_Show_Indicator_type=\uB514\uC2A4\uD50C\uB808\uC774 \uBC29\uC2DD\uC694
+Fine-Design_Mobile_Tab_Show_Title=\uC81C\uBAA9 \uD45C\uC2DC
+Fine-Design_Mobile_Tab_Slide=\uC2AC\uB77C\uC774\uB529 \uC2A4\uC704\uCE58 \uC9C0\uC6D0
Fine-Design_Mobile_Tab_Style=tab\uC2A4\uD0C0\uC77C
Fine-Design_Mobile_Title_Width_Fix=\uD0C0\uC774\uD2C0 \uB108\uBE44 \uACE0\uC815
Fine-Design_Mobile_Under_Line=\uBC11\uC904
@@ -1687,7 +1687,7 @@ Fine-Design_Parameter_Panel=\uD30C\uB77C\uBBF8\uD130 \uD328\uB110
Fine-Design_Plugin_Has_Been_Actived_Duplicate=\uD50C\uB77C\uADF8\uC778 \uD65C\uC131\uD654 \uB418\uC5C8\uC2B5\uB2C8\uB2E4.
Fine-Design_Plugin_Update_Log=\uB85C\uADF8 \uC5C5\uB370\uC774\uD2B8
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_Problem_Detail_Message=\uBB38\uC7AC \uC138\uBD80 \uC815\uBCF4
Fine-Design_Prompt_When_Leave_Without_Submit=\uC81C\uCD9C\uC5C6\uC774 \uB098\uAC00\uAE30 \uC54C\uB9BC
Fine-Design_Push_Update_Focus_Point=10.0 \uD478\uC2DC \uC5C5\uB370\uC774\uD2B8 \uD3EC\uCEE4\uC2A4 \uD3EC\uC778\uD2B8
Fine-Design_Remind_Me_Next_Time=\uB2E4\uC74C\uC5D0 \uC2DC\uC791\uD560 \uB54C \uC54C\uB9BC
@@ -2477,7 +2477,7 @@ Fine-Design_Report_Y_Coordinate=\uC218\uC9C1 \uC88C\uD45C
Fine-Design_Report_Yes=\uC608
Fine-Design_Report_Zero_Margin_Warn=\uD504\uB9B0\uD130\uB294 \uBB3C\uB9AC\uC801 \uC5EC\uBC31\uC774 \uC788\uC73C\uBBC0\uB85C
\uB9AC\uD3EC\uD2B8\uC758 \uD398\uC774\uC9C0 \uC5EC\uBC31\uC124\uC815\uC774 \uB108\uBB34\uC791\uC73C\uBA74
\uB0B4\uC6A9\uC774 \uC644\uC815\uD558\uAC8C \uD504\uB9AC\uD2B8\uB418\uC9C0 \uBABB\uD560\uC218 \uC788\uC2B5\uB2C8\uB2E4.
Fine-Design_See_More_New_Features=\uB354 \uB9CE\uC740 \uC0C8\uB85C\uC6B4 \uAE30\uB2A5 \uBCF4\uAE30
-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=\uBCF4\uACE0\uC11C\uB97C \uBCF4\uB0B4\uBA74 \uC81C\uD488\uC744 \uB354 \uC798 \uCD5C\uC801\uD654 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC218\uC9D1\uB41C \uBAA8\uB4E0 \uC815\uBCF4\uB97C \uAE30\uBC00\uB85C \uC720\uC9C0\uD558\uACE0 \uC81C\uD488 \uAC1C\uC120\uC5D0\uB9CC \uC0AC\uC6A9\uD560 \uAC83\uC744 \uC57D\uC18D\uD569\uB2C8\uB2E4.
Fine-Design_Skip_This_Version=\uD574\uB2F9 \uBC84\uC804 \uC2A4\uD0B5
Fine-Design_Software_Download_Url=\uC18C\uD504\uD2B8\uC6E8\uC5B4 \uB2E4\uC6B4\uB85C\uB4DC \uC8FC\uC18C
Fine-Design_Startup_When_Needed=\uC0AC\uC6A9\uC2DC \uC2DC\uC791 (\uAD8C\uC7A5)
@@ -2580,6 +2580,7 @@ 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
+<<<<<<< HEAD
Fine_Design_Chart_Year=\uB144
\u3001Fine-Design_Basic_Community_TechSupport=
Fine-Design_Predefined_Dark_Pattern=
@@ -2617,3 +2618,6 @@ Fine-Design_Basic_Predefined_Applicate_Format=
Fine-Design_Basic_Predefined_Set_Default=
Fine-Design_Basic_Predefined_Preview_Title_Text=
Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
+=======
+Fine_Design_Chart_Year=\uB144
+>>>>>>> af23f0d325429aedfa25d49d2939b1cb4e0dcbaf