From dd3ef3cd1dc03afb96ccefa6fdd1a800d53c66f4 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 30 Jul 2020 10:13:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-26209=20=E5=9B=BD=E9=99=85=E5=8C=96C?= =?UTF-8?q?RM=E6=A8=A1=E6=9D=BF->=E4=BB=A3=E7=A0=81=E5=BA=93=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/i18n/chart_ko_KR.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main.properties | 4 ++-- .../main/resources/com/fr/design/i18n/main_en.properties | 8 ++++---- .../resources/com/fr/design/i18n/main_ja_JP.properties | 4 ++-- .../resources/com/fr/design/i18n/main_ko_KR.properties | 4 ++-- .../main/resources/com/fr/design/i18n/main_zh.properties | 4 ++-- .../resources/com/fr/design/i18n/main_zh_TW.properties | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) 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 5900263..8d13dc1 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 @@ -376,7 +376,7 @@ Fine-Design_Chart_Marker_Time=\uC911\uC694\uD55C \uB2E8\uACC4 Fine-Design_Chart_Marker_Type=\uD0DC\uADF8 \uC720\uD615 Fine-Design_Chart_Match_Color=\uBC30\uC0C9 Fine-Design_Chart_Match_Color_Scheme=\uBC30\uC0C9 \uBC29\uC548 -Fine-Design_Chart_Match_Default_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme=\uAE30\uBCF8 \uBC30\uC0C9 \uBC29\uC548 Fine-Design_Chart_Match_To=\uC5D0 \uB9DE\uCD94\uAE30 Fine-Design_Chart_Math_Exponent=\uC9C0\uC218 \uD53C\uD305 Fine-Design_Chart_Math_Linear=\uC120\uD615 \uD53C\uD305 diff --git 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 index b2b9372..c64cc12 100644 --- 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data= Fine-Design_Chart_Enable_Auto_Refresh= Fine-Design_Chart_Enable_Field_Name= Fine-Design_Chart_Enable_Field_Value= +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float= Fine-Design_Chart_Float_Chart= Fine-Design_Chart_Format= @@ -2571,5 +2572,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_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year= \ No newline at end of file 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 1be1cc8..ffa3b07 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=Empty Data Hint Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh Fine-Design_Chart_Enable_Field_Name=Enable Field Name Fine-Design_Chart_Enable_Field_Value=Enable Field Value +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=Chart Hyperlink-Floating Element Fine-Design_Chart_Float_Chart=Chart Hyperlink-Floating Chart Fine-Design_Chart_Format=Format @@ -1718,7 +1719,7 @@ Fine-Design_Report_AlphaFine_Relation_Item=Related Questions Fine-Design_Report_AlphaFine_ShowAll=Display All Fine-Design_Report_AlphaFine_ShowLess=Collapse Fine-Design_Report_Alpha_Hot_No_Item=There is no hot issues in this topic. -Fine-Design_Report_Append_Delete_Row_Message=Warning! Please set extended attributes of the specified cell. +Fine-Design_Report_Append_Delete_Row_Message=Note: The specified cell must have the expansion attribute Fine-Design_Report_Are_You_Sure_To_Delete_The_Data=Are you sure to delete the selected data Fine-Design_Report_At_Least_One_Visual_Worksheet=A workbook must contain at least one visible worksheet. If you want to delete it, please insert a new worksheet first. Fine-Design_Report_Attention=Attention @@ -2318,7 +2319,7 @@ Fine-Design_Report_SpecifiedG_Leave_In_Their_Own_Groups=Leave in their own group Fine-Design_Report_SpecifiedG_Put_All_Others_Together=Merger All Others Fine-Design_Report_SpecifiedG_Specified_Group=Custom Group Fine-Design_Report_Specify=Specify -Fine-Design_Report_Specify_Cell=Specify Cell +Fine-Design_Report_Specify_Cell=Specified Cell Fine-Design_Report_StyleFormat_Date=Date Fine-Design_Report_StyleFormat_Sample=Sample Fine-Design_Report_StyleFormat_Time=Time @@ -2571,5 +2572,4 @@ 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_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=Year \ No newline at end of file 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 2130ea8..eed0da5 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u30B0\u30E9\u30D5\u7A7A\u767D\u30C7\u30FC\u30BF\u3 Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u66F4\u65B0 Fine-Design_Chart_Enable_Field_Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u4F7F\u7528 Fine-Design_Chart_Enable_Field_Value=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u4F7F\u7528 +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u8981\u7D20\u9023\u52D5 Fine-Design_Chart_Float_Chart=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u30B0\u30E9\u30D5 Fine-Design_Chart_Format=\u66F8\u5F0F @@ -2571,5 +2572,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_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file 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 c265fcf..e8da3e3 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\uCC28\uD2B8 \uBE48 \uB370\uC774\uD130 \uC54C\uB9BC Fine-Design_Chart_Enable_Auto_Refresh=\uC790\uB3D9 \uC0C8\uB85C\uACE0\uCE68 Fine-Design_Chart_Enable_Field_Name=\uD544\uB4DC\uBA85\uC0AC\uC6A9 Fine-Design_Chart_Enable_Field_Value=\uD544\uB4DC\uAC12\uC0AC\uC6A9 +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uC694\uC18C \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Float_Chart=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uCC28\uD2B8 \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Format=\uD3EC\uBA67 @@ -2571,5 +2572,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_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\uB144 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 765cabc..c193df2 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u56FE\u8868\u7A7A\u6570\u636E\u63D0\u793A Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52A8\u5237\u65B0 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u5B57\u6BB5\u540D Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u5B57\u6BB5\u503C +Fine-Design_Chart_Field_Value=\u5B57\u6BB5\u503C Fine-Design_Chart_Float=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u60AC\u6D6E\u5143\u7D20 Fine-Design_Chart_Float_Chart=\u56FE\u8868\u8D85\u94FE-\u60AC\u6D6E\u7A97\u56FE\u8868 Fine-Design_Chart_Format=\u683C\u5F0F @@ -2571,5 +2572,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_Field_Value=\u5B57\u6BB5\u503C \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file diff --git 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 index 0da9a1f..9306bb1 100644 --- 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u5716\u8868\u7A7A\u8CC7\u6599\u63D0\u793A Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u91CD\u65B0\u6574\u7406 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u6B04\u4F4D\u540D Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u6B04\u4F4D\u503C +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\u5716\u8868\u8D85\u9023\u7D50-\u806F\u52D5\u61F8\u6D6E\u5143\u7D20 Fine-Design_Chart_Float_Chart=\u5716\u8868\u8D85\u9023\u7D50-\u61F8\u6D6E\u7A97\u5716\u8868 Fine-Design_Chart_Format=\u683C\u5F0F @@ -2571,5 +2572,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_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file From ab76ced20e3dab765774778c1e0d66bd2f636d02 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Thu, 30 Jul 2020 15:01:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-35463=20=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E2=80=9CBUG=E9=9C=80=E6=B1=82=E5=8F=8D=E9=A6=88=E2=80=9D?= =?UTF-8?q?=E5=92=8C=E2=80=9C=E6=8A=80=E6=9C=AF=E6=94=AF=E6=8C=81=E2=80=9D?= =?UTF-8?q?=E7=9A=84KEY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_en.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_ja_JP.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_ko_KR.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_zh.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 2 ++ 6 files changed, 12 insertions(+) diff --git 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 index 27ed111..1fda8b6 100644 --- 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully= Fine-Design_Basic_Commuinity_Center= Fine-Design_Basic_Commuinity_Demand= Fine-Design_Basic_Commuinity_Need= +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution= Fine-Design_Basic_Community= Fine-Design_Basic_Community_Bbs= 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 95f9229..7d5ce54 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Successfully Saved Fine-Design_Basic_Commuinity_Center=Center Fine-Design_Basic_Commuinity_Demand=Customize Demand Fine-Design_Basic_Commuinity_Need=Demand Feedback +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=Tech Solutions Fine-Design_Basic_Community=Community Fine-Design_Basic_Community_Bbs=Community Home 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 cd19d08..4e02e73 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=\u4FDD\u5B58\u3057\u307E\u3057\u305F Fine-Design_Basic_Commuinity_Center=\u30A4\u30D9\u30F3\u30C8\u30BB\u30F3\u30BF\u30FC Fine-Design_Basic_Commuinity_Demand=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B5\u30FC\u30D3\u30B9 Fine-Design_Basic_Commuinity_Need=\u30CB\u30FC\u30BA\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF +\u3001Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u30BD\u30EA\u30E5\u30FC\u30B7\u30E7\u30F3 Fine-Design_Basic_Community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 Fine-Design_Basic_Community_Bbs=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8 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 524e80d..c3db9be 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=\uC800\uC7A5\uC131\uACF5 Fine-Design_Basic_Commuinity_Center=\uCEE4\uBBA4\uB2C8\uD2F0 \uC13C\uD130 Fine-Design_Basic_Commuinity_Demand=\uCEE4\uC2A4\uD140 \uC218\uC694 Fine-Design_Basic_Commuinity_Need=\uC218\uC694 \uD53C\uB4DC\uBC31 +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\uC194\uB8E8\uC158 Fine-Design_Basic_Community=\uCEE4\uBBA4\uB2C8\uD2F0 Fine-Design_Basic_Community_Bbs=\uCEE4\uBBA4\uB2C8\uD2F0 \uD648 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 30199a1..12c49d1 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52A8\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236 Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u9988 +Fine-Design_Basic_Community_TechSupport=\u6280\u672F\u652F\u6301 +Fine-Design_Basic_Community_BugAndNeed=BUG\u9700\u6C42\u53CD\u9988 Fine-Design_Basic_Commuinity_Solution=\u6280\u672F\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u533A Fine-Design_Basic_Community_Bbs=\u793E\u533A\u9996\u9875 diff --git 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 index 63beeea..96f5e5a 100644 --- 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u88FD Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u994B +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u5340 Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801