Merge remote-tracking branch 'origin/release/10.0' into feature/10.0

# Conflicts: # design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties # design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties # design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties # design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties # design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties # design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
7 years ago · dfc72128b0
12 changed files with 96 additions and 29 deletions
--- 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
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=Switch
 Fine-Design_Chart_Summary_Method=Summary Method
 Fine-Design_Chart_Subject_Color=Theme Color
 Fine-Design_Chart_Style_Transparent=Transparent
-Fine-Design_Chart_Style_TopDownShade=Top Down Shade
+Fine-Design_Chart_Style_TopDownShade=Gradient
 Fine-Design_Chart_Style_Retro=Retro
 Fine-Design_Chart_Style_Present=Present
 Fine-Design_Chart_Style_Plane3D=Plane 3D
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=display strategy
 Fine-Design_Chart_Display_Negative=displayNegative
 Fine-Design_Chart_Direction_Vertical=vertical direction
 Fine-Design_Chart_Direction_Horizontal=Horizontal
+Fine-Design_Chart_DifferArc_Pie=diff arc pie
 Fine-Design_Chart_Descriptor=Descriptor
 Fine-Design_Chart_Deploy=deploy
 Fine-Design_Chart_Delimiter_Symbol=Delimiter
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=Switch
 Fine-Design_Chart_Summary_Method=Summary Method
 Fine-Design_Chart_Subject_Color=Theme Color
 Fine-Design_Chart_Style_Transparent=Transparent
-Fine-Design_Chart_Style_TopDownShade=Gradient(vertical)
+Fine-Design_Chart_Style_TopDownShade=Gradient
 Fine-Design_Chart_Style_Retro=Retro
 Fine-Design_Chart_Style_Present=Present
 Fine-Design_Chart_Style_Plane3D=Plane 3D
@ -326,7 +326,7 @@ Fine-Design_Chart_Link_Cell=Linkage Cell
 Fine-Design_Chart_Link=Link
 Fine-Design_Chart_LineMap=Flow map
 Fine-Design_Chart_Line_Width=LineWidth
-Fine-Design_Chart_Line_Style=Polyline Style
+Fine-Design_Chart_Line_Style=Line Style
 Fine-Design_Chart_Line_Map_Animation=Animation
 Fine-Design_Chart_Line_Chart=Line
 Fine-Design_Chart_Line=line
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=Display Strategy
 Fine-Design_Chart_Display_Negative=displayNegative
 Fine-Design_Chart_Direction_Vertical=Vertical Direction
 Fine-Design_Chart_Direction_Horizontal=Horizontal
+Fine-Design_Chart_DifferArc_Pie=diff arc pie
 Fine-Design_Chart_Descriptor=Description
 Fine-Design_Chart_Deploy=deploy
 Fine-Design_Chart_Delimiter_Symbol=Separator
--- 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
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=\u5207\u308A\u66FF\u3048\u308B
 Fine-Design_Chart_Summary_Method=\u96C6\u8A08\u65B9\u6CD5
 Fine-Design_Chart_Subject_Color=\u30B9\u30C6\u30FC\u30B8\u8272
 Fine-Design_Chart_Style_Transparent=\u900F\u660E
-Fine-Design_Chart_Style_TopDownShade=\u4E0A\u4E0B\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3
+Fine-Design_Chart_Style_TopDownShade=Gradient
 Fine-Design_Chart_Style_Retro=\u30EC\u30C8\u30ED
 Fine-Design_Chart_Style_Present=\u5F62\u614B
 Fine-Design_Chart_Style_Plane3D=\u5E73\u97623-D
@ -326,7 +326,7 @@ Fine-Design_Chart_Link_Cell=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30
 Fine-Design_Chart_Link=\u95A2\u9023\u7DDA
 Fine-Design_Chart_LineMap=\u6D41\u308C\u5730\u56F3
 Fine-Design_Chart_Line_Width=\u7DDA\u306E\u5E45
-Fine-Design_Chart_Line_Style=\u6298\u308C\u7DDA\u306E\u30B9\u30BF\u30A4\u30EB
+Fine-Design_Chart_Line_Style=Line Style
 Fine-Design_Chart_Line_Map_Animation=\u6D41\u308C\u308B\u52D5\u753B
 Fine-Design_Chart_Line_Chart=\u6298\u308C\u7DDA\u30B0\u30E9\u30D5
 Fine-Design_Chart_Line=\u7DDA
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=\u8868\u793A\u65B9\u6CD5
 Fine-Design_Chart_Display_Negative=\u8CA0\u6570\u30D0\u30D6\u30EB\u3092\u8868\u793A
 Fine-Design_Chart_Direction_Vertical=\u7E26\u65B9\u5411
 Fine-Design_Chart_Direction_Horizontal=\u6A2A\u65B9\u5411
+Fine-Design_Chart_DifferArc_Pie=\u975E\u7B49\u5F27\u30ED\u30FC\u30BA\u30B0\u30E9\u30D5
 Fine-Design_Chart_Descriptor=\u8AAC\u660E
 Fine-Design_Chart_Deploy=\u8A2D\u5B9A
 Fine-Design_Chart_Delimiter_Symbol=\u533A\u5207\u308A\u6587\u5B57
--- 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
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=\uC804\uD658
 Fine-Design_Chart_Summary_Method=\uCDE8\uD569\uBC29\uC2DD
 Fine-Design_Chart_Subject_Color=\uD14C\uB9C8\uC0C9
 Fine-Design_Chart_Style_Transparent=\uD22C\uBA85
-Fine-Design_Chart_Style_TopDownShade=\uC0C1\uD558 \uADF8\uB77C\uB370\uC774\uC158
+Fine-Design_Chart_Style_TopDownShade=Gradient
 Fine-Design_Chart_Style_Retro=\uBCF5\uACE0
 Fine-Design_Chart_Style_Present=\uD615\uD0DC
 Fine-Design_Chart_Style_Plane3D=\uD3C9\uBA743D
@ -326,7 +326,7 @@ Fine-Design_Chart_Link_Cell=\uCC28\uD2B8 \uD558\uC774\uD37C\uB9C1\uD06C-\uC140 \
 Fine-Design_Chart_Link=\uB9C1\uD06C
 Fine-Design_Chart_LineMap=LineMap
 Fine-Design_Chart_Line_Width=\uB77C\uC778\uB108\uBE44
-Fine-Design_Chart_Line_Style=\uAEBD\uC740\uC120\uC591\uC2DD
+Fine-Design_Chart_Line_Style=Line Style
 Fine-Design_Chart_Line_Map_Animation=\uC560\uB2C8\uBA54\uC774\uC158
 Fine-Design_Chart_Line_Chart=\uAEBD\uC740\uC120\uCC28\uD2B8
 Fine-Design_Chart_Line=\uB77C\uC778
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=\uC815\uCC45\uBCF4\uC774\uAE30
 Fine-Design_Chart_Display_Negative=\uC804\uC2DC \uB9C8\uC774\uB108\uC2A4 \uAC70\uD488
 Fine-Design_Chart_Direction_Vertical=\uC138\uB85C
 Fine-Design_Chart_Direction_Horizontal=\uAC00\uB85C
+Fine-Design_Chart_DifferArc_Pie=\uD638\uB3C4 \uC7A5\uBBF8 \uADF8\uB9BC \uAC19\uC9C0 \uC54A\uB2E4
 Fine-Design_Chart_Descriptor=\uC124\uBA85
 Fine-Design_Chart_Deploy=\uC124\uC815
 Fine-Design_Chart_Delimiter_Symbol=\uAD6C\uBD84\uBB38\uC790
--- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties
+++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_CN.properties
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=\u5207\u6362
 Fine-Design_Chart_Summary_Method=\u6C47\u603B\u65B9\u5F0F
 Fine-Design_Chart_Subject_Color=\u4E3B\u9898\u989C\u8272
 Fine-Design_Chart_Style_Transparent=\u900F\u660E
-Fine-Design_Chart_Style_TopDownShade=\u4E0A\u4E0B\u6E10\u53D8
+Fine-Design_Chart_Style_TopDownShade=\u6E10\u53D8
 Fine-Design_Chart_Style_Retro=\u590D\u53E4
 Fine-Design_Chart_Style_Present=\u5F62\u6001
 Fine-Design_Chart_Style_Plane3D=\u5E73\u97623D
@ -120,7 +120,7 @@ Fine-Design_Chart_Start_Time=\u5F00\u59CB\u65F6\u95F4
 Fine-Design_Chart_Start_Task_ID=\u8D77\u59CB\u4EFB\u52A1id
 Fine-Design_Chart_Start_Longitude=\u8D77\u70B9\u7ECF\u5EA6
 Fine-Design_Chart_Start_Latitude=\u8D77\u70B9\u7EAC\u5EA6
-Fine-Design_Chart_Start_Area_Name=\u8D77\u70B9\u533A\u57DF
+Fine-Design_Chart_Start_Area_Name=\u8D77\u70B9\u533A\u57DF\u540D
 Fine-Design_Chart_Start_Angle=\u8D77\u59CB\u89D2\u5EA6
 Fine-Design_Chart_Start_And_End=\u8D77\u59CB\u70B9\u548C\u5230\u8FBE\u70B9
 Fine-Design_Chart_Stacked_Line=\u5806\u79EF\u6298\u7EBF\u56FE
@ -326,7 +326,7 @@ Fine-Design_Chart_Link_Cell=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u5355\u5143\u6
 Fine-Design_Chart_Link=\u8FDE\u7EBF
 Fine-Design_Chart_LineMap=\u6D41\u5411\u5730\u56FE
 Fine-Design_Chart_Line_Width=\u7EBF\u5BBD
-Fine-Design_Chart_Line_Style=\u6298\u7EBF\u6837\u5F0F
+Fine-Design_Chart_Line_Style=\u7EBF\u578B
 Fine-Design_Chart_Line_Map_Animation=\u6D41\u5411\u52A8\u753B
 Fine-Design_Chart_Line_Chart=\u6298\u7EBF\u56FE
 Fine-Design_Chart_Line=\u7EBF
@ -436,7 +436,7 @@ Fine-Design_Chart_End_Time=\u7ED3\u675F\u65F6\u95F4
 Fine-Design_Chart_End_Task_ID=\u7ED3\u675F\u4EFB\u52A1id
 Fine-Design_Chart_End_Longitude=\u7EC8\u70B9\u7ECF\u5EA6
 Fine-Design_Chart_End_Latitude=\u7EC8\u70B9\u7EAC\u5EA6
-Fine-Design_Chart_End_Area_Name=\u7EC8\u70B9\u533A\u57DF
+Fine-Design_Chart_End_Area_Name=\u7EC8\u70B9\u533A\u57DF\u540D
 Fine-Design_Chart_End_Angle=\u7EC8\u7ED3\u89D2\u5EA6
 Fine-Design_Chart_Edit_Trendline=\u7F16\u8F91\u8D8B\u52BF\u7EBF
 Fine-Design_Chart_Edit_Image_Marker=\u7F16\u8F91\u56FE\u7247\u6807\u8BB0
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=\u663E\u793A\u7B56\u7565
 Fine-Design_Chart_Display_Negative=\u5C55\u793A\u8D1F\u6C14\u6CE1
 Fine-Design_Chart_Direction_Vertical=\u7EB5\u5411
 Fine-Design_Chart_Direction_Horizontal=\u6A2A\u5411
+Fine-Design_Chart_DifferArc_Pie=\u4E0D\u7B49\u5F27\u5EA6\u73AB\u7470\u56FE
 Fine-Design_Chart_Descriptor=\u63CF\u8FF0
 Fine-Design_Chart_Deploy=\u914D\u7F6E
 Fine-Design_Chart_Delimiter_Symbol=\u5206\u9694\u7B26
--- 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
@ -91,7 +91,7 @@ Fine-Design_Chart_Switch=\u5207\u63DB
 Fine-Design_Chart_Summary_Method=\u532F\u7E3D\u65B9\u5F0F
 Fine-Design_Chart_Subject_Color=\u4E3B\u984C\u984F\u8272
 Fine-Design_Chart_Style_Transparent=\u900F\u660E
-Fine-Design_Chart_Style_TopDownShade=\u4E0A\u4E0B\u6F38\u8B8A
+Fine-Design_Chart_Style_TopDownShade=\u6F38\u8B8A
 Fine-Design_Chart_Style_Retro=\u5FA9\u53E4
 Fine-Design_Chart_Style_Present=\u6A21\u5F0F
 Fine-Design_Chart_Style_Plane3D=\u5E73\u97623D
@ -326,7 +326,7 @@ Fine-Design_Chart_Link_Cell=\u5716\u8868\u8D85\u93C8-\u806F\u52D5\u5132\u5B58\u6
 Fine-Design_Chart_Link=\u9023\u7DDA
 Fine-Design_Chart_LineMap=\u6D41\u5411\u5730\u5716
 Fine-Design_Chart_Line_Width=\u7DDA\u5BEC
-Fine-Design_Chart_Line_Style=\u6298\u7DDA\u6A23\u5F0F
+Fine-Design_Chart_Line_Style=Line Style
 Fine-Design_Chart_Line_Map_Animation=\u6D41\u5411\u52D5\u756B
 Fine-Design_Chart_Line_Chart=\u6298\u7DAB\u5716
 Fine-Design_Chart_Line=\u7DDA
@ -452,6 +452,7 @@ Fine-Design_Chart_Display_Strategy=\u986F\u793A\u7B56\u7565
 Fine-Design_Chart_Display_Negative=\u5C55\u793A\u8CA0\u6C23\u6CE1
 Fine-Design_Chart_Direction_Vertical=Vertical Direction
 Fine-Design_Chart_Direction_Horizontal=\u6A6B\u5411
+Fine-Design_Chart_DifferArc_Pie=\u4E0D\u7B49\u5F27\u5EA6\u73AB\u7470\u5716
 Fine-Design_Chart_Descriptor=\u63CF\u8FF0
 Fine-Design_Chart_Deploy=\u914D\u7F6E
 Fine-Design_Chart_Delimiter_Symbol=\u5206\u9694\u7B26
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
@ -1107,6 +1107,9 @@ Fine-Design_Basic_Community_Questions=
 Fine-Design_Basic_Community_sign=
 Fine-Design_Basic_Community_Update=
 Fine-Design_Basic_Community_Video=
+Fine-Design_Basic_Commuinity_Center=
+Fine-Design_Basic_Commuinity_Demand=
+Fine-Design_Basic_Commuinity_Solution=
 Fine-Design_Report_Can_Not_Use_Format_Brush=
 Fine-Design_Form_Canvas_Size_Lock_Desc=The size of the canvas is 375*560, the width is locked, the height is customizable
 Fine-Design_Report_CellElement_Property_Table=CellElement_Property_Table
@ -2142,6 +2145,7 @@ Fine-Design_Report_AlphaFine_Hot=hot
 Fine-Design_Report_AlphaFine_Relation_Item=Relation Questions
 Fine-Design_Report_AlphaFine_Back=back
 Fine-Design_Basic_Loading_Embed_Server=
+Fine-Design_Basic_Local_Workspace=Local Directory
 Fine-Design_Updater_UpdateAndUpgrade=
 Fine-Design_Updater_Checking_Jar_Update=
 Fine-Design_Updater_Update=
@ -2173,3 +2177,5 @@ Fine-Design_Updater_Restore_Old_Version=
 Fine-Design_Updater_Already_Backup_Old_Project=
 Fine-Design_Updater_Unzip_Replace_Restore=
 Fine-Design_Updater_Restore_to_V8=
+Fine-Design_Report_Main_Value_Axis=Main Value Axis
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
@ -138,9 +138,12 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully
 Fine-Design_Basic_Commuinity_Need=need
 Fine-Design_Basic_Community=community
 Fine-Design_Basic_Community_Bbs=bbs
+Fine-Design_Basic_Commuinity_Demand=demand
+Fine-Design_Basic_Commuinity_Solution=tech solution
+Fine-Design_Basic_Commuinity_Center=center
 Fine-Design_Basic_Community_Bug=bug report
 Fine-Design_Basic_Community_Questions=questions
-Fine-Design_Basic_Community_sign=sign
+Fine-Design_Basic_Community_sign=ngineer certification
 Fine-Design_Basic_Community_Update=update
 Fine-Design_Basic_Community_Video=video
 Fine-Design_Basic_Compile=Compile
@ -2132,6 +2135,7 @@ Fine-Design_Basic_Engine_Event_Success=Success
 Fine-Design_Basic_Engine_Event_Unload_Check=Leave Without Submitting
 Fine-Design_Basic_Engine_Event_Write_Failure=Filling failed
 Fine-Design_Basic_Engine_Event_Write_Success=Filling successfully
+<<<<<<< HEAD
 Fine-Design_Basic_AlphaFine_Search_Type=Search Type
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Service
 Fine-Design_Basic_AlphaFine_Enable_Segmentation=Enable Segmentation
@ -2140,6 +2144,9 @@ Fine-Design_Report_AlphaFine_Hot=hot
 Fine-Design_Report_AlphaFine_Relation_Item=Relation Questions
 Fine-Design_Report_AlphaFine_Back=back
 Fine-Design_Basic_Loading_Embed_Server=Embed Server is Starting...
+=======
+Fine-Design_Basic_Local_Workspace=Local Directory
+>>>>>>> origin/release/10.0
 Fine-Design_Updater_UpdateAndUpgrade=Update&Upgrade
 Fine-Design_Updater_Checking_Jar_Update=checking jarpackage update
 Fine-Design_Updater_Update=update
@ -2171,3 +2178,6 @@ Fine-Design_Updater_Restore_Old_Version=Restore to V8.0
 Fine-Design_Updater_Already_Backup_Old_Project=Designer V8.0 already backups at
 Fine-Design_Updater_Unzip_Replace_Restore=,unzip outside /FineReport and run independently.
 Fine-Design_Updater_Restore_to_V8=Restore FR8.0
+Fine-Design_Updater_Restore_to_V8=Restore FR8.0
+Fine-Design_Report_Main_Value_Axis=Primary Value Axis
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
--- 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
@ -1032,12 +1032,15 @@ Fine-Design_Basic_Button_Icon=\u30DC\u30BF\u30F3\u30A2\u30A4\u30B3\u30F3
 Fine-Design_Report_Button_Type=\u30DC\u30BF\u30F3\u30BF\u30A4\u30D7
 Fine-Design_Basic_Button_OK=\u78BA\u5B9A
 Fine-Design_Basic_Community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3
-Fine-Design_Basic_Community_Bbs=\u5E06\u8EDF\u30D5\u30A9\u30FC\u30E9\u30E0
+Fine-Design_Basic_Community_Bbs=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8
 Fine-Design_Basic_Community_Bug=Bug\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
 Fine-Design_Report_Community_Help=\u30D8\u30EB\u30D7\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
-Fine-Design_Basic_Commuinity_Need=\u9700\u8981\u306E\u63D0\u51FA
+Fine-Design_Basic_Commuinity_Need=\u9700\u8981\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
+Fine-Design_Basic_Commuinity_Demand=\u9700\u8981\u6CE8\u6587
+Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u6848
+Fine-Design_Basic_Commuinity_Center=\u30A4\u30D9\u30F3\u30C8\u30BB\u30F3\u30BF\u30FC
 Fine-Design_Basic_Community_Questions=\u554F\u984C\u306E\u554F\u3044\u5408\u308F\u305B
-Fine-Design_Basic_Community_sign=\u5E06\u8EDF\u8A8D\u8A3C
+Fine-Design_Basic_Community_sign=\u30EC\u30DD\u30FC\u30C8\u30A8\u30F3\u30B8\u30CB\u30A2\u306E\u8A8D\u8A3C
 Fine-Design_Basic_Community_Update=\u88FD\u54C1\u66F4\u65B0
 Fine-Design_Basic_Community_Video=\u30D3\u30C7\u30AA
 Fine-Design_Report_Can_Not_Use_Format_Brush=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
@ -2132,3 +2135,25 @@ Fine-Design_Report_AlphaFine_Internet_Forum=
 Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
 Fine-Design_Report_AlphaFine_Back=
+Fine-Design_Basic_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+Fine-Design_Updater_Checking_Jar_Update=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D
+Fine-Design_Updater_Update=\u66F4\u65B0
+Fine-Design_Updater_Restore=\u5FA9\u5143
+Fine-Design_Updater_New_Version_Available=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u6709\u308A
+Fine-Design_Updater_JarUpdate=JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u66F4\u65B0
+Fine-Design_Updater_No_Previous_Version=\u30CE\u30FC\u53E4\u3044\u30D0\u30FC\u30B8\u30E7\u30F3
+Fine-Design_Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u306A\u3044
+Fine-Design_Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5
+Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044
+Fine-Design_Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3
+Fine-Design_Updater_Jar_Restore=\u65E7JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u5FA9\u5143
+Fine-Design_Updater_Restore_To=\u5FA9\u5143
+Fine-Design_Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u3059\u308B
+Fine-Design_Updater_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
+Fine-Design_Updater_Ok=\u78BA\u5B9A
+Fine-Design_Updater_Restart_Later=\u5F8C\u307B\u3069\u30EA\u30B9\u30BF\u30FC\u30C8
+Fine-Design_Updater_Download_Failed=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B
+Fine-Design_Updater_Alert=\u8B66\u544A
+Fine-Design_Report_Main_Value_Axis=\u30E1\u30A4\u30F3\u5024\u8EF8
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
--- 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
@ -2136,3 +2136,6 @@ Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
 Fine-Design_Report_AlphaFine_Back=
 Fine-Design_Basic_Loading_Embed_Server=
+Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC
+Fine-Design_Report_Main_Value_Axis=\uBA54\uC778\uAC12\uCD95
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
@ -660,7 +660,7 @@ Fine-Design_Report_Test_URL=\u6D4B\u8BD5\u8FDE\u63A5
 Fine-Design_Report_Thick_Bottom_Border_Line=\u7C97\u5E95\u6846\u7EBF
 Fine-Design_Basic_To=\u5230
 Fine-Design_Basic_Today=\u4ECA\u5929
-Fine-Design_Chart_Top_Down_Shade=\u4E0A\u4E0B\u6E10\u53D8
+Fine-Design_Chart_Top_Down_Shade=\u6E10\u53D8
 Fine-Design_Report_Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u53CC\u4E0B\u6846\u7EBF
 Fine-Design_Report_Top_And_Thick_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u7C97\u4E0B\u6846\u7EBF
 Fine-Design_Report_Top_Bottom_Border_Line=\u4E0A\u4E0B\u6846\u7EBF
@ -1038,14 +1038,17 @@ Fine-Design_Basic_Button_Icon=\u6309\u94AE\u56FE\u6807
 Fine-Design_Report_Button_Type=\u6309\u94AE\u7C7B\u578B
 Fine-Design_Basic_Button_OK=\u786E\u5B9A
 Fine-Design_Basic_Community=\u793E\u533A
-Fine-Design_Basic_Community_Bbs=\u5E06\u8F6F\u8BBA\u575B
+Fine-Design_Basic_Community_Bbs=\u793E\u533A\u9996\u9875
 Fine-Design_Basic_Community_Bug=BUG\u53CD\u9988
 Fine-Design_Report_Community_Help=\u5E2E\u52A9\u6587\u6863
-Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u63D0\u4EA4
+Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u9988
+Fine-Design_Basic_Commuinity_Center=\u6D3B\u52A8\u4E2D\u5FC3
+Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236
+Fine-Design_Basic_Commuinity_Solution=\u6280\u672F\u65B9\u6848
 Fine-Design_Basic_Community_Questions=\u95EE\u9898\u6C42\u52A9
-Fine-Design_Basic_Community_sign=\u5E06\u8F6F\u8BA4\u8BC1
+Fine-Design_Basic_Community_sign=\u62A5\u8868\u5DE5\u7A0B\u5E08\u8BA4\u8BC1
 Fine-Design_Basic_Community_Update=\u4EA7\u54C1\u66F4\u65B0
-Fine-Design_Basic_Community_Video=\u5165\u95E8\u89C6\u9891
+Fine-Design_Basic_Community_Video=\u89C6\u9891\u6559\u7A0B
 Fine-Design_Report_Can_Not_Use_Format_Brush=\u4E0D\u80FD\u5BF9\u591A\u91CD\u9009\u5B9A\u533A\u57DF\u4F7F\u7528\u683C\u5F0F\u5237\!
 Fine-Design_Form_Canvas_Size_Lock_Desc=\u753B\u5E03\u5927\u5C0F375*560\uFF0C\u5BBD\u5EA6\u9501\u5B9A\uFF0C\u9AD8\u5EA6\u53EF\u81EA\u5B9A\u4E49
 Fine-Design_Report_CellElement_Property_Table=\u5355\u5143\u683C\u5C5E\u6027\u8868
@ -2142,6 +2145,7 @@ Fine-Design_Report_AlphaFine_Hot=\u70ED\u95E8\u95EE\u9898
 Fine-Design_Report_AlphaFine_Relation_Item=\u76F8\u5173\u95EE\u9898
 Fine-Design_Report_AlphaFine_Back=\u8FD4\u56DE
 Fine-Design_Basic_Loading_Embed_Server=\u5185\u7F6E\u670D\u52A1\u5668\u542F\u52A8\u4E2D...
+Fine-Design_Basic_Local_Workspace=\u672C\u5730\u76EE\u5F55
 Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7
 Fine-Design_Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0
 Fine-Design_Updater_Update=\u66F4\u65B0
@ -2173,3 +2177,5 @@ Fine-Design_Updater_Restore_Old_Version=\u8FD8\u539F\u81F38.0\u7248\u672C
 Fine-Design_Updater_Already_Backup_Old_Project=8.0\u8BBE\u8BA1\u5668\u5DF2\u7ECF\u5907\u4EFD\u5728
 Fine-Design_Updater_Unzip_Replace_Restore=\u76EE\u5F55\u4E0B\uFF0C\u89E3\u538B\u540E\u53EF\u72EC\u7ACB\u8FD0\u884C\u3002\u5EFA\u8BAE\u5728FineReport\u6839\u76EE\u5F55\u5916\u89E3\u538B\u3002
 Fine-Design_Updater_Restore_to_V8=\u8FD8\u539F\u81F3FR8.0
+Fine-Design_Report_Main_Value_Axis=\u4E3B\u503C\u8F74
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
@ -1036,14 +1036,17 @@ Fine-Design_Basic_Button_Icon=\u6309\u9215\u5716\u793A
 Fine-Design_Report_Button_Type=\u6309\u9215\u985E\u578B
 Fine-Design_Basic_Button_OK=\u78BA\u5B9A
 Fine-Design_Basic_Community=\u793E\u5340
-Fine-Design_Basic_Community_Bbs=\u5E06\u8EDF\u8AD6\u58C7
+Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801
 Fine-Design_Basic_Community_Bug=BUG\u53CD\u994B
 Fine-Design_Report_Community_Help=\u5E6B\u52A9\u6587\u6A94
-Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u63D0\u4EA4
+Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u8FF4\u97FF
+Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236
+Fine-Design_Basic_Commuinity_Solution=\u79D1\u6280\u65B9\u6848
+Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3
 Fine-Design_Basic_Community_Questions=\u554F\u984C\u6C42\u52A9
-Fine-Design_Basic_Community_sign=\u5E06\u8EDF\u8A8D\u8B49
+Fine-Design_Basic_Community_sign=\u5831\u8868\u5DE5\u7A0B\u5E2B\u8A8D\u8B49
 Fine-Design_Basic_Community_Update=\u7522\u54C1\u66F4\u65B0
-Fine-Design_Basic_Community_Video=\u5165\u9580\u8996\u983B
+Fine-Design_Basic_Community_Video=\u8996\u983B\u6559\u7A0B
 Fine-Design_Report_Can_Not_Use_Format_Brush=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
 Fine-Design_Form_Canvas_Size_Lock_Desc=\u756B\u5E03\u5927\u5C0F375*560\uFF0C\u5BEC\u5EA6\u9396\u5B9A\uFF0C\u9AD8\u5EA6\u53EF\u81EA\u5B9A\u7FA9
 Fine-Design_Report_CellElement_Property_Table=\u55AE\u5143\u683C\u5C6C\u6027\u8868
@ -2130,6 +2133,7 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B
 Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u5831\u5931\u6557
 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u5831\u6210\u529F
 Fine-Design_Report_Alignment=\u5C0D\u9F4A
+<<<<<<< HEAD
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Basic_AlphaFine_Enable_Segmentation=
@ -2138,6 +2142,9 @@ Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
 Fine-Design_Report_AlphaFine_Back=
 Fine-Design_Basic_Loading_Embed_Server=
+=======
+Fine-Design_Basic_Local_Workspace=\u672C\u6A5F\u76EE\u9304
+>>>>>>> origin/release/10.0
 Fine-Design_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A
 Fine-Design_Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0
 Fine-Design_Updater_Update=\u66F4\u65B0
@ -2169,3 +2176,7 @@ Fine-Design_Updater_Restore_Old_Version=\u9084\u539F\u81F38.0\u7248\u672C
 Fine-Design_Updater_Already_Backup_Old_Project=8.0\u8A2D\u8A08\u5668\u5DF2\u7D93\u5099\u4EFD\u5728
 Fine-Design_Updater_Unzip_Replace_Restore=\u76EE\u9304\u4E0B\uFF0C\u89E3\u58D3\u5F8C\u53EF\u7368\u7ACB\u57F7\u884C\u3002\u5EFA\u8B70\u5728FINEREPORT\u6839\u76EE\u9304\u5916\u89E3\u58D3\u3002
 Fine-Design_Updater_Restore_to_V8=\u9084\u539F\u81F3FR8.0
+Fine-Design_Report_Main_Value_Axis=\u4E3B\u503C\u8EF8
+Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F
+
+