From 62bf09cb8ce6e20b1c8dbe308cf169e803f9131b Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Sun, 19 Aug 2018 01:40:57 +0800 Subject: [PATCH 1/9] d0818 --- .../main/resources/com/fr/design/i18n/chart.properties | 3 ++- .../resources/com/fr/design/i18n/chart_en_US.properties | 5 +++-- .../resources/com/fr/design/i18n/chart_ja_JP.properties | 5 +++-- .../resources/com/fr/design/i18n/chart_ko_KR.properties | 5 +++-- .../resources/com/fr/design/i18n/chart_zh_CN.properties | 9 +++++---- .../resources/com/fr/design/i18n/chart_zh_TW.properties | 5 +++-- .../resources/com/fr/design/i18n/main_zh_CN.properties | 2 +- 7 files changed, 20 insertions(+), 14 deletions(-) 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 4e87f46..9f42b3e 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 @@ -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 diff --git 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 index 5bd3588..2de1d28 100644 --- 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 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 2170998..acb6ae2 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 @@ -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 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 31f39cf..cba6140 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 @@ -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 diff --git 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 index bc15b23..b64e87f 100644 --- 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 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 2976e65..4f2cffa 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 @@ -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 diff --git 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 index a3ead12..1bb1da2 100644 --- 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 From aaf39efdc611f072f173a95e05eac6aa945a6d6c Mon Sep 17 00:00:00 2001 From: ju Date: Mon, 20 Aug 2018 20:21:20 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=B4=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=85=A8=E5=86=99=E6=88=90=2010.0=EF=BC=8C=E5=AF=B9jar?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=A8=E5=86=99=E6=88=90#{branch}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- design-i18n-chart/pom.xml | 2 +- design-i18n-report/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/design-i18n-chart/pom.xml b/design-i18n-chart/pom.xml index f7f951d..72778ef 100644 --- a/design-i18n-chart/pom.xml +++ b/design-i18n-chart/pom.xml @@ -10,5 +10,5 @@ com.fr.core design-i18n-chart - ${branch}-SNAPSHOT + 10.0 \ No newline at end of file diff --git a/design-i18n-report/pom.xml b/design-i18n-report/pom.xml index e45471c..b226190 100644 --- a/design-i18n-report/pom.xml +++ b/design-i18n-report/pom.xml @@ -10,5 +10,5 @@ com.fr.core design-i18n-report - ${branch}-SNAPSHOT + 10.0 \ No newline at end of file From 1ce4a9d948923c8ab95653bc48f29adca0fe74eb Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 22 Aug 2018 14:19:18 +0800 Subject: [PATCH 3/9] REPORT-10562 & REPORT-10763 --- .../com/fr/design/i18n/main.properties | 32 +++++++++++++++++ .../com/fr/design/i18n/main_en_US.properties | 34 ++++++++++++++++++- .../com/fr/design/i18n/main_ja_JP.properties | 20 +++++++++++ .../com/fr/design/i18n/main_ko_KR.properties | 3 +- .../com/fr/design/i18n/main_zh_CN.properties | 32 +++++++++++++++++ .../com/fr/design/i18n/main_zh_TW.properties | 33 ++++++++++++++++++ 6 files changed, 152 insertions(+), 2 deletions(-) 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 759f843..2f4e286 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 @@ -2134,3 +2134,35 @@ Fine-Design_Basic_Engine_Event_Success=Success Fine-Design_Basic_Engine_Event_Unload_Check=Unloading page with data not submitted Fine-Design_Basic_Engine_Event_Write_Failure=Writefailure Fine-Design_Basic_Engine_Event_Write_Success=Writesuccess +Fine-Design_Basic_Local_Workspace=Local Directory +FR-Desinger-Updater_UpdateAndUpgrade= +FR-Desinger-Updater_Checking_Jar_Update= +FR-Desinger-Updater_Update= +FR-Desinger-Updater_Restore= +FR-Desinger-Updater_New_Version_Available= +FR-Desinger-Updater_JarUpdate= +FR-Desinger-Updater_No_Previous_Version= +FR-Desinger-Updater_Not_Install_Version= +FR-Desinger-Updater_Restart_Designer= +FR-Desinger-Updater_Connect_VersionUpdateServer_Failed= +FR-Desinger-Updater_Already_Latest_Version= +FR-Desinger-Updater_Jar_Restore= +FR-Desinger-Updater_Restore_To= +FR-Desinger-Updater_WorksAfterRestart= +FR-Designer-Updater_Cancel= +FR-Designer-Updater_Ok= +FR-Designer-Updater_Restart_Later= +FR-Designer-Updater_Download_Failed= +FR-Designer-Updater_Alert= +FR-Designer-Updater_Date= +FR-Designer-Updater_Content= +FR-Designer-Updater_Search= +FR-Designer-Updater_SignHeader= +FR-Designer-Updater_Designer_Version= +FR-Designer-Updater_JAR_Version= +FR-Designer-Updater_Latest_JAR= +FR-Designer-Updater_Update_to_V9.0= +FR-Designer-Updater_Restore_Old_Version= +FR-Designer-Updater_Already_Backup_Old_Project= +FR-Designer-Updater_Unzip_Replace_Restore= +FR-Designer_Updater_Restore_to_V8= \ No newline at end of file diff --git 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 index ce7f299..a5a4bd5 100644 --- 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 @@ -2131,4 +2131,36 @@ Fine-Design_Basic_Engine_Event_Stop_Edit=Edit end 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 \ No newline at end of file +Fine-Design_Basic_Engine_Event_Write_Success=Filling successfully +Fine-Design_Basic_Local_Workspace=Local Directory +FR-Desinger-Updater_UpdateAndUpgrade=Update&Upgrade +FR-Desinger-Updater_Checking_Jar_Update=checking jarpackage update +FR-Desinger-Updater_Update=update +FR-Desinger-Updater_Restore=restore to previous? +FR-Desinger-Updater_New_Version_Available=new version available +FR-Desinger-Updater_JarUpdate=JARPack Update +FR-Desinger-Updater_No_Previous_Version=no previous version +FR-Desinger-Updater_Not_Install_Version=not install version +FR-Desinger-Updater_Restart_Designer=restart +FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=cannot connect to version-update-server +FR-Desinger-Updater_Already_Latest_Version=The latest version already +FR-Desinger-Updater_Jar_Restore=JARPackage restore +FR-Desinger-Updater_Restore_To=restore to +FR-Desinger-Updater_WorksAfterRestart=version, works after restart +FR-Designer-Updater_Cancel=Cancel +FR-Designer-Updater_Ok=Ok +FR-Designer-Updater_Restart_Later=restart later +FR-Designer-Updater_Download_Failed=download failed\! +FR-Designer-Updater_Alert=Warning +FR-Designer-Updater_Date=Date +FR-Designer-Updater_Content=Content +FR-Designer-Updater_Search=Search +FR-Designer-Updater_SignHeader=Header +FR-Designer-Updater_Designer_Version=Designer Version +FR-Designer-Updater_JAR_Version=JAR Version +FR-Designer-Updater_Latest_JAR=Latest JAR +FR-Designer-Updater_Update_to_V9.0=Upgrade to FineReport v9.0 +FR-Designer-Updater_Restore_Old_Version=Restore to V8.0 +FR-Designer-Updater_Already_Backup_Old_Project=Designer V8.0 already backups at +FR-Designer-Updater_Unzip_Replace_Restore=,unzip outside /FineReport and run independently. +FR-Designer_Updater_Restore_to_V8=Restore FR8.0 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 5869cd0..22f4e88 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 @@ -2124,3 +2124,23 @@ Fine-Design_Basic_Engine_Event_Success=\u6210\u529F Fine-Design_Basic_Engine_Event_Unload_Check=\u9001\u4FE1\u305B\u305A\u306B\u96E2\u308C\u308B Fine-Design_Basic_Engine_Event_Write_Failure=\u66F8\u304D\u8FBC\u307F\u5931\u6557 Fine-Design_Basic_Engine_Event_Write_Success=\u66F8\u304D\u8FBC\u307F\u6210\u529F +Fine-Design_Basic_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA +FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 +FR-Desinger-Updater_Checking_Jar_Update=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D +FR-Desinger-Updater_Update=\u66F4\u65B0 +FR-Desinger-Updater_Restore=\u5FA9\u5143 +FR-Desinger-Updater_New_Version_Available=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u6709\u308A +FR-Desinger-Updater_JarUpdate=JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u66F4\u65B0 +FR-Desinger-Updater_No_Previous_Version=\u30CE\u30FC\u53E4\u3044\u30D0\u30FC\u30B8\u30E7\u30F3 +FR-Desinger-Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u306A\u3044 +FR-Desinger-Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5 +FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044 +FR-Desinger-Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3 +FR-Desinger-Updater_Jar_Restore=\u65E7JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u5FA9\u5143 +FR-Desinger-Updater_Restore_To=\u5FA9\u5143 +FR-Desinger-Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u3059\u308B +FR-Designer-Updater_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB +FR-Designer-Updater_Ok=\u78BA\u5B9A +FR-Designer-Updater_Restart_Later=\u5F8C\u307B\u3069\u30EA\u30B9\u30BF\u30FC\u30C8 +FR-Designer-Updater_Download_Failed=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B +FR-Designer-Updater_Alert=\u8B66\u544A 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 b4994f7..502db4a 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 @@ -2127,4 +2127,5 @@ Fine-Design_Basic_Engine_Event_Stop_Edit=\uD3B8\uC9D1\uC885\uB8CC Fine-Design_Basic_Engine_Event_Success=\uC131\uACF5 Fine-Design_Basic_Engine_Event_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328 -Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 \ No newline at end of file +Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 +Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC \ No newline at end of file diff --git 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 index 1bb1da2..4e61485 100644 --- 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 @@ -2134,3 +2134,35 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u79BB\u5F00 Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u62A5\u5931\u8D25 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u62A5\u6210\u529F Fine-Design_Report_Alignment=\u5BF9\u9F50 +Fine-Design_Basic_Local_Workspace=\u672C\u5730\u76EE\u5F55 +FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7 +FR-Desinger-Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0 +FR-Desinger-Updater_Update=\u66F4\u65B0 +FR-Desinger-Updater_Restore=\u8FD8\u539F\u5230\u4EE5\u524D? +FR-Desinger-Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +FR-Desinger-Updater_JarUpdate=JAR\u5305\u66F4\u65B0 +FR-Desinger-Updater_No_Previous_Version=\u6CA1\u6709\u66F4\u65E9\u7684\u7248\u672C +FR-Desinger-Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C +FR-Desinger-Updater_Restart_Designer=\u7ACB\u5373\u91CD\u542F +FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668 +FR-Desinger-Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C +FR-Desinger-Updater_Jar_Restore=JAR\u5305\u8FD8\u539F +FR-Desinger-Updater_Restore_To=\u8FD8\u539F\u5230 +FR-Desinger-Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548 +FR-Designer-Updater_Cancel=\u53D6\u6D88 +FR-Designer-Updater_Ok=\u786E\u5B9A +FR-Designer-Updater_Restart_Later=\u7A0D\u540E\u91CD\u542F +FR-Designer-Updater_Download_Failed=\u4E0B\u8F7D\u5931\u8D25 +FR-Designer-Updater_Alert=\u8B66\u544A +FR-Designer-Updater_Date=\u66F4\u65B0\u65E5\u671F +FR-Designer-Updater_Content=\u5185\u5BB9 +FR-Designer-Updater_Search=\u641C\u7D22 +FR-Designer-Updater_SignHeader=\u6807\u5FD7\u4F4D +FR-Designer-Updater_Designer_Version=\u8BBE\u8BA1\u5668\u7248\u672C +FR-Designer-Updater_JAR_Version=JAR\u7248\u672C +FR-Designer-Updater_Latest_JAR=\u6700\u65B0JAR +FR-Designer-Updater_Update_to_V9.0=\u5347\u7EA7\u81F3FineReport9.0\u7248\u672C +FR-Designer-Updater_Restore_Old_Version=\u8FD8\u539F\u81F38.0\u7248\u672C +FR-Designer-Updater_Already_Backup_Old_Project=8.0\u8BBE\u8BA1\u5668\u5DF2\u7ECF\u5907\u4EFD\u5728 +FR-Designer-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 +FR-Designer_Updater_Restore_to_V8=\u8FD8\u539F\u81F3FR8.0 \ 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 90ea88a..4d1dce8 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 @@ -2130,4 +2130,37 @@ 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 +Fine-Design_Basic_Local_Workspace=\u672C\u6A5F\u76EE\u9304 +FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A +FR-Desinger-Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0 +FR-Desinger-Updater_Update=\u66F4\u65B0 +FR-Desinger-Updater_Restore=\u9084\u539F\u5230\u4EE5\u524D? +FR-Desinger-Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +FR-Desinger-Updater_JarUpdate=JAR\u5305\u66F4\u65B0 +FR-Desinger-Updater_No_Previous_Version=\u6C92\u6709\u66F4\u65E9\u7684\u7248\u672C +FR-Desinger-Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C +FR-Desinger-Updater_Restart_Designer=\u7ACB\u5373\u91CD\u555F +FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668 +FR-Desinger-Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C +FR-Desinger-Updater_Jar_Restore=JAR\u5305\u9084\u539F +FR-Desinger-Updater_Restore_To=\u9084\u539F\u5230 +FR-Desinger-Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548 +FR-Designer-Updater_Cancel=\u53D6\u6D88 +FR-Designer-Updater_Ok=\u78BA\u5B9A +FR-Designer-Updater_Restart_Later=\u7A0D\u5F8C\u91CD\u555F +FR-Designer-Updater_Download_Failed=\u4E0B\u8F09\u5931\u6557 +FR-Designer-Updater_Alert=\u8B66\u544A +FR-Designer-Updater_Date=\u66F4\u65B0\u65E5\u671F +FR-Designer-Updater_Content=\u5167\u5BB9 +FR-Designer-Updater_Search=\u641C\u7D22 +FR-Designer-Updater_SignHeader=\u6807\u5FD7\u4F4D +FR-Designer-Updater_Designer_Version=\u8A2D\u8A08\u5668\u7248\u672C +FR-Designer-Updater_JAR_Version=JAR\u7248\u672C +FR-Designer-Updater_Latest_JAR=\u6700\u65B0JAR +FR-Designer-Updater_Update_to_V9.0=\u5347\u7D1A\u81F3FINEREPORT9.0\u7248\u672C +FR-Designer-Updater_Restore_Old_Version=\u9084\u539F\u81F38.0\u7248\u672C +FR-Designer-Updater_Already_Backup_Old_Project=8.0\u8A2D\u8A08\u5668\u5DF2\u7D93\u5099\u4EFD\u5728 +FR-Designer-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 +FR-Designer_Updater_Restore_to_V8=\u9084\u539F\u81F3FR8.0 + From f21010b1e375f96242858ac6840352168e490671 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 22 Aug 2018 14:53:28 +0800 Subject: [PATCH 4/9] REPORT-10562 & REPORT-10763 --- .../com/fr/design/i18n/main.properties | 62 +++++++++---------- .../com/fr/design/i18n/main_en_US.properties | 62 +++++++++---------- .../com/fr/design/i18n/main_ja_JP.properties | 38 ++++++------ .../com/fr/design/i18n/main_zh_CN.properties | 62 +++++++++---------- .../com/fr/design/i18n/main_zh_TW.properties | 62 +++++++++---------- 5 files changed, 143 insertions(+), 143 deletions(-) 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 2f4e286..12af5cd 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 @@ -2135,34 +2135,34 @@ Fine-Design_Basic_Engine_Event_Unload_Check=Unloading page with data not submitt Fine-Design_Basic_Engine_Event_Write_Failure=Writefailure Fine-Design_Basic_Engine_Event_Write_Success=Writesuccess Fine-Design_Basic_Local_Workspace=Local Directory -FR-Desinger-Updater_UpdateAndUpgrade= -FR-Desinger-Updater_Checking_Jar_Update= -FR-Desinger-Updater_Update= -FR-Desinger-Updater_Restore= -FR-Desinger-Updater_New_Version_Available= -FR-Desinger-Updater_JarUpdate= -FR-Desinger-Updater_No_Previous_Version= -FR-Desinger-Updater_Not_Install_Version= -FR-Desinger-Updater_Restart_Designer= -FR-Desinger-Updater_Connect_VersionUpdateServer_Failed= -FR-Desinger-Updater_Already_Latest_Version= -FR-Desinger-Updater_Jar_Restore= -FR-Desinger-Updater_Restore_To= -FR-Desinger-Updater_WorksAfterRestart= -FR-Designer-Updater_Cancel= -FR-Designer-Updater_Ok= -FR-Designer-Updater_Restart_Later= -FR-Designer-Updater_Download_Failed= -FR-Designer-Updater_Alert= -FR-Designer-Updater_Date= -FR-Designer-Updater_Content= -FR-Designer-Updater_Search= -FR-Designer-Updater_SignHeader= -FR-Designer-Updater_Designer_Version= -FR-Designer-Updater_JAR_Version= -FR-Designer-Updater_Latest_JAR= -FR-Designer-Updater_Update_to_V9.0= -FR-Designer-Updater_Restore_Old_Version= -FR-Designer-Updater_Already_Backup_Old_Project= -FR-Designer-Updater_Unzip_Replace_Restore= -FR-Designer_Updater_Restore_to_V8= \ No newline at end of file +Fine-Design_Updater_UpdateAndUpgrade= +Fine-Design_Updater_Checking_Jar_Update= +Fine-Design_Updater_Update= +Fine-Design_Updater_Restore= +Fine-Design_Updater_New_Version_Available= +Fine-Design_Updater_JarUpdate= +Fine-Design_Updater_No_Previous_Version= +Fine-Design_Updater_Not_Install_Version= +Fine-Design_Updater_Restart_Designer= +Fine-Design_Updater_Connect_VersionUpdateServer_Failed= +Fine-Design_Updater_Already_Latest_Version= +Fine-Design_Updater_Jar_Restore= +Fine-Design_Updater_Restore_To= +Fine-Design_Updater_WorksAfterRestart= +Fine-Design_Updater_Cancel= +Fine-Design_Updater_Ok= +Fine-Design_Updater_Restart_Later= +Fine-Design_Updater_Download_Failed= +Fine-Design_Updater_Alert= +Fine-Design_Updater_Date= +Fine-Design_Updater_Content= +Fine-Design_Updater_Search= +Fine-Design_Updater_SignHeader= +Fine-Design_Updater_Designer_Version= +Fine-Design_Updater_JAR_Version= +Fine-Design_Updater_Latest_JAR= +Fine-Design_Updater_Update_to_V9.0= +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= \ No newline at end of file diff --git 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 index a5a4bd5..2ddb2a0 100644 --- 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 @@ -2133,34 +2133,34 @@ 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 Fine-Design_Basic_Local_Workspace=Local Directory -FR-Desinger-Updater_UpdateAndUpgrade=Update&Upgrade -FR-Desinger-Updater_Checking_Jar_Update=checking jarpackage update -FR-Desinger-Updater_Update=update -FR-Desinger-Updater_Restore=restore to previous? -FR-Desinger-Updater_New_Version_Available=new version available -FR-Desinger-Updater_JarUpdate=JARPack Update -FR-Desinger-Updater_No_Previous_Version=no previous version -FR-Desinger-Updater_Not_Install_Version=not install version -FR-Desinger-Updater_Restart_Designer=restart -FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=cannot connect to version-update-server -FR-Desinger-Updater_Already_Latest_Version=The latest version already -FR-Desinger-Updater_Jar_Restore=JARPackage restore -FR-Desinger-Updater_Restore_To=restore to -FR-Desinger-Updater_WorksAfterRestart=version, works after restart -FR-Designer-Updater_Cancel=Cancel -FR-Designer-Updater_Ok=Ok -FR-Designer-Updater_Restart_Later=restart later -FR-Designer-Updater_Download_Failed=download failed\! -FR-Designer-Updater_Alert=Warning -FR-Designer-Updater_Date=Date -FR-Designer-Updater_Content=Content -FR-Designer-Updater_Search=Search -FR-Designer-Updater_SignHeader=Header -FR-Designer-Updater_Designer_Version=Designer Version -FR-Designer-Updater_JAR_Version=JAR Version -FR-Designer-Updater_Latest_JAR=Latest JAR -FR-Designer-Updater_Update_to_V9.0=Upgrade to FineReport v9.0 -FR-Designer-Updater_Restore_Old_Version=Restore to V8.0 -FR-Designer-Updater_Already_Backup_Old_Project=Designer V8.0 already backups at -FR-Designer-Updater_Unzip_Replace_Restore=,unzip outside /FineReport and run independently. -FR-Designer_Updater_Restore_to_V8=Restore FR8.0 +Fine-Design_Updater_UpdateAndUpgrade=Update&Upgrade +Fine-Design_Updater_Checking_Jar_Update=checking jarpackage update +Fine-Design_Updater_Update=update +Fine-Design_Updater_Restore=restore to previous? +Fine-Design_Updater_New_Version_Available=new version available +Fine-Design_Updater_JarUpdate=JARPack Update +Fine-Design_Updater_No_Previous_Version=no previous version +Fine-Design_Updater_Not_Install_Version=not install version +Fine-Design_Updater_Restart_Designer=restart +Fine-Design_Updater_Connect_VersionUpdateServer_Failed=cannot connect to version-update-server +Fine-Design_Updater_Already_Latest_Version=The latest version already +Fine-Design_Updater_Jar_Restore=JARPackage restore +Fine-Design_Updater_Restore_To=restore to +Fine-Design_Updater_WorksAfterRestart=version, works after restart +Fine-Design_Updater_Cancel=Cancel +Fine-Design_Updater_Ok=Ok +Fine-Design_Updater_Restart_Later=restart later +Fine-Design_Updater_Download_Failed=download failed\! +Fine-Design_Updater_Alert=Warning +Fine-Design_Updater_Date=Date +Fine-Design_Updater_Content=Content +Fine-Design_Updater_Search=Search +Fine-Design_Updater_SignHeader=Header +Fine-Design_Updater_Designer_Version=Designer Version +Fine-Design_Updater_JAR_Version=JAR Version +Fine-Design_Updater_Latest_JAR=Latest JAR +Fine-Design_Updater_Update_to_V9.0=Upgrade to FineReport v9.0 +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 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 22f4e88..5c3ab4a 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 @@ -2125,22 +2125,22 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u9001\u4FE1\u305B\u305A\u306B\u96E2 Fine-Design_Basic_Engine_Event_Write_Failure=\u66F8\u304D\u8FBC\u307F\u5931\u6557 Fine-Design_Basic_Engine_Event_Write_Success=\u66F8\u304D\u8FBC\u307F\u6210\u529F Fine-Design_Basic_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA -FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8 -FR-Desinger-Updater_Checking_Jar_Update=Jar\u30D1\u30C3\u30B1\u30FC\u30B8\u30C1\u30A7\u30C3\u30AF\u66F4\u65B0\u4E2D -FR-Desinger-Updater_Update=\u66F4\u65B0 -FR-Desinger-Updater_Restore=\u5FA9\u5143 -FR-Desinger-Updater_New_Version_Available=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u6709\u308A -FR-Desinger-Updater_JarUpdate=JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u66F4\u65B0 -FR-Desinger-Updater_No_Previous_Version=\u30CE\u30FC\u53E4\u3044\u30D0\u30FC\u30B8\u30E7\u30F3 -FR-Desinger-Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u306A\u3044 -FR-Desinger-Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5 -FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u30FC\u63A5\u7D9A\u3067\u304D\u306A\u3044 -FR-Desinger-Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3 -FR-Desinger-Updater_Jar_Restore=\u65E7JAR\u30D1\u30C3\u30B1\u30FC\u30B8\u5FA9\u5143 -FR-Desinger-Updater_Restore_To=\u5FA9\u5143 -FR-Desinger-Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u3059\u308B -FR-Designer-Updater_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB -FR-Designer-Updater_Ok=\u78BA\u5B9A -FR-Designer-Updater_Restart_Later=\u5F8C\u307B\u3069\u30EA\u30B9\u30BF\u30FC\u30C8 -FR-Designer-Updater_Download_Failed=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B -FR-Designer-Updater_Alert=\u8B66\u544A +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 diff --git 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 index 4e61485..8ea96be 100644 --- 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 @@ -2135,34 +2135,34 @@ Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u62A5\u5931\u8D25 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u62A5\u6210\u529F Fine-Design_Report_Alignment=\u5BF9\u9F50 Fine-Design_Basic_Local_Workspace=\u672C\u5730\u76EE\u5F55 -FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7 -FR-Desinger-Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0 -FR-Desinger-Updater_Update=\u66F4\u65B0 -FR-Desinger-Updater_Restore=\u8FD8\u539F\u5230\u4EE5\u524D? -FR-Desinger-Updater_New_Version_Available=\u6709\u65B0\u7248\u672C -FR-Desinger-Updater_JarUpdate=JAR\u5305\u66F4\u65B0 -FR-Desinger-Updater_No_Previous_Version=\u6CA1\u6709\u66F4\u65E9\u7684\u7248\u672C -FR-Desinger-Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C -FR-Desinger-Updater_Restart_Designer=\u7ACB\u5373\u91CD\u542F -FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668 -FR-Desinger-Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C -FR-Desinger-Updater_Jar_Restore=JAR\u5305\u8FD8\u539F -FR-Desinger-Updater_Restore_To=\u8FD8\u539F\u5230 -FR-Desinger-Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548 -FR-Designer-Updater_Cancel=\u53D6\u6D88 -FR-Designer-Updater_Ok=\u786E\u5B9A -FR-Designer-Updater_Restart_Later=\u7A0D\u540E\u91CD\u542F -FR-Designer-Updater_Download_Failed=\u4E0B\u8F7D\u5931\u8D25 -FR-Designer-Updater_Alert=\u8B66\u544A -FR-Designer-Updater_Date=\u66F4\u65B0\u65E5\u671F -FR-Designer-Updater_Content=\u5185\u5BB9 -FR-Designer-Updater_Search=\u641C\u7D22 -FR-Designer-Updater_SignHeader=\u6807\u5FD7\u4F4D -FR-Designer-Updater_Designer_Version=\u8BBE\u8BA1\u5668\u7248\u672C -FR-Designer-Updater_JAR_Version=JAR\u7248\u672C -FR-Designer-Updater_Latest_JAR=\u6700\u65B0JAR -FR-Designer-Updater_Update_to_V9.0=\u5347\u7EA7\u81F3FineReport9.0\u7248\u672C -FR-Designer-Updater_Restore_Old_Version=\u8FD8\u539F\u81F38.0\u7248\u672C -FR-Designer-Updater_Already_Backup_Old_Project=8.0\u8BBE\u8BA1\u5668\u5DF2\u7ECF\u5907\u4EFD\u5728 -FR-Designer-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 -FR-Designer_Updater_Restore_to_V8=\u8FD8\u539F\u81F3FR8.0 \ No newline at end of file +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 +Fine-Design_Updater_Restore=\u8FD8\u539F\u5230\u4EE5\u524D? +Fine-Design_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +Fine-Design_Updater_JarUpdate=JAR\u5305\u66F4\u65B0 +Fine-Design_Updater_No_Previous_Version=\u6CA1\u6709\u66F4\u65E9\u7684\u7248\u672C +Fine-Design_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C +Fine-Design_Updater_Restart_Designer=\u7ACB\u5373\u91CD\u542F +Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668 +Fine-Design_Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C +Fine-Design_Updater_Jar_Restore=JAR\u5305\u8FD8\u539F +Fine-Design_Updater_Restore_To=\u8FD8\u539F\u5230 +Fine-Design_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548 +Fine-Design_Updater_Cancel=\u53D6\u6D88 +Fine-Design_Updater_Ok=\u786E\u5B9A +Fine-Design_Updater_Restart_Later=\u7A0D\u540E\u91CD\u542F +Fine-Design_Updater_Download_Failed=\u4E0B\u8F7D\u5931\u8D25 +Fine-Design_Updater_Alert=\u8B66\u544A +Fine-Design_Updater_Date=\u66F4\u65B0\u65E5\u671F +Fine-Design_Updater_Content=\u5185\u5BB9 +Fine-Design_Updater_Search=\u641C\u7D22 +Fine-Design_Updater_SignHeader=\u6807\u5FD7\u4F4D +Fine-Design_Updater_Designer_Version=\u8BBE\u8BA1\u5668\u7248\u672C +Fine-Design_Updater_JAR_Version=JAR\u7248\u672C +Fine-Design_Updater_Latest_JAR=\u6700\u65B0JAR +Fine-Design_Updater_Update_to_V9.0=\u5347\u7EA7\u81F3FineReport9.0\u7248\u672C +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 \ 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 4d1dce8..3b53d88 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 @@ -2131,36 +2131,36 @@ 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 Fine-Design_Basic_Local_Workspace=\u672C\u6A5F\u76EE\u9304 -FR-Desinger-Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A -FR-Desinger-Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0 -FR-Desinger-Updater_Update=\u66F4\u65B0 -FR-Desinger-Updater_Restore=\u9084\u539F\u5230\u4EE5\u524D? -FR-Desinger-Updater_New_Version_Available=\u6709\u65B0\u7248\u672C -FR-Desinger-Updater_JarUpdate=JAR\u5305\u66F4\u65B0 -FR-Desinger-Updater_No_Previous_Version=\u6C92\u6709\u66F4\u65E9\u7684\u7248\u672C -FR-Desinger-Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C -FR-Desinger-Updater_Restart_Designer=\u7ACB\u5373\u91CD\u555F -FR-Desinger-Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668 -FR-Desinger-Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C -FR-Desinger-Updater_Jar_Restore=JAR\u5305\u9084\u539F -FR-Desinger-Updater_Restore_To=\u9084\u539F\u5230 -FR-Desinger-Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548 -FR-Designer-Updater_Cancel=\u53D6\u6D88 -FR-Designer-Updater_Ok=\u78BA\u5B9A -FR-Designer-Updater_Restart_Later=\u7A0D\u5F8C\u91CD\u555F -FR-Designer-Updater_Download_Failed=\u4E0B\u8F09\u5931\u6557 -FR-Designer-Updater_Alert=\u8B66\u544A -FR-Designer-Updater_Date=\u66F4\u65B0\u65E5\u671F -FR-Designer-Updater_Content=\u5167\u5BB9 -FR-Designer-Updater_Search=\u641C\u7D22 -FR-Designer-Updater_SignHeader=\u6807\u5FD7\u4F4D -FR-Designer-Updater_Designer_Version=\u8A2D\u8A08\u5668\u7248\u672C -FR-Designer-Updater_JAR_Version=JAR\u7248\u672C -FR-Designer-Updater_Latest_JAR=\u6700\u65B0JAR -FR-Designer-Updater_Update_to_V9.0=\u5347\u7D1A\u81F3FINEREPORT9.0\u7248\u672C -FR-Designer-Updater_Restore_Old_Version=\u9084\u539F\u81F38.0\u7248\u672C -FR-Designer-Updater_Already_Backup_Old_Project=8.0\u8A2D\u8A08\u5668\u5DF2\u7D93\u5099\u4EFD\u5728 -FR-Designer-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 -FR-Designer_Updater_Restore_to_V8=\u9084\u539F\u81F3FR8.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 +Fine-Design_Updater_Restore=\u9084\u539F\u5230\u4EE5\u524D? +Fine-Design_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C +Fine-Design_Updater_JarUpdate=JAR\u5305\u66F4\u65B0 +Fine-Design_Updater_No_Previous_Version=\u6C92\u6709\u66F4\u65E9\u7684\u7248\u672C +Fine-Design_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C +Fine-Design_Updater_Restart_Designer=\u7ACB\u5373\u91CD\u555F +Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668 +Fine-Design_Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C +Fine-Design_Updater_Jar_Restore=JAR\u5305\u9084\u539F +Fine-Design_Updater_Restore_To=\u9084\u539F\u5230 +Fine-Design_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548 +Fine-Design_Updater_Cancel=\u53D6\u6D88 +Fine-Design_Updater_Ok=\u78BA\u5B9A +Fine-Design_Updater_Restart_Later=\u7A0D\u5F8C\u91CD\u555F +Fine-Design_Updater_Download_Failed=\u4E0B\u8F09\u5931\u6557 +Fine-Design_Updater_Alert=\u8B66\u544A +Fine-Design_Updater_Date=\u66F4\u65B0\u65E5\u671F +Fine-Design_Updater_Content=\u5167\u5BB9 +Fine-Design_Updater_Search=\u641C\u7D22 +Fine-Design_Updater_SignHeader=\u6807\u5FD7\u4F4D +Fine-Design_Updater_Designer_Version=\u8A2D\u8A08\u5668\u7248\u672C +Fine-Design_Updater_JAR_Version=JAR\u7248\u672C +Fine-Design_Updater_Latest_JAR=\u6700\u65B0JAR +Fine-Design_Updater_Update_to_V9.0=\u5347\u7D1A\u81F3FINEREPORT9.0\u7248\u672C +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 From 4e320ea4ab053377f036c2ce02f99f3228b8c90e Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 22 Aug 2018 21:14:39 +0800 Subject: [PATCH 5/9] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 1 + .../main/resources/com/fr/design/i18n/main_en_US.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 1 + .../main/resources/com/fr/design/i18n/main_ko_KR.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_CN.properties | 1 + .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) 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 759f843..e15af10 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 @@ -2134,3 +2134,4 @@ Fine-Design_Basic_Engine_Event_Success=Success Fine-Design_Basic_Engine_Event_Unload_Check=Unloading page with data not submitted Fine-Design_Basic_Engine_Event_Write_Failure=Writefailure Fine-Design_Basic_Engine_Event_Write_Success=Writesuccess +Fine-Design_Basic_Engine_Local_Workspace=Local Directory diff --git 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 index ce7f299..b176f69 100644 --- 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 @@ -2131,4 +2131,5 @@ Fine-Design_Basic_Engine_Event_Stop_Edit=Edit end 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 \ No newline at end of file +Fine-Design_Basic_Engine_Event_Write_Success=Filling successfully +Fine-Design_Basic_Engine_Local_Workspace=Local Directory \ 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 5869cd0..8d048f9 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 @@ -2124,3 +2124,4 @@ Fine-Design_Basic_Engine_Event_Success=\u6210\u529F Fine-Design_Basic_Engine_Event_Unload_Check=\u9001\u4FE1\u305B\u305A\u306B\u96E2\u308C\u308B Fine-Design_Basic_Engine_Event_Write_Failure=\u66F8\u304D\u8FBC\u307F\u5931\u6557 Fine-Design_Basic_Engine_Event_Write_Success=\u66F8\u304D\u8FBC\u307F\u6210\u529F +Fine-Design_Basic_Engine_Local_Workspace=\u30ED\u30FC\u30AB\u30EB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA 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 b4994f7..8774660 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 @@ -2127,4 +2127,5 @@ Fine-Design_Basic_Engine_Event_Stop_Edit=\uD3B8\uC9D1\uC885\uB8CC Fine-Design_Basic_Engine_Event_Success=\uC131\uACF5 Fine-Design_Basic_Engine_Event_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328 -Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 \ No newline at end of file +Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 +Fine-Design_Basic_Engine_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC \ No newline at end of file diff --git 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 index 1bb1da2..fd1e9fa 100644 --- 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 @@ -2134,3 +2134,4 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u79BB\u5F00 Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u62A5\u5931\u8D25 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u62A5\u6210\u529F Fine-Design_Report_Alignment=\u5BF9\u9F50 +Fine-Design_Basic_Engine_Local_Workspace=\u672C\u5730\u76EE\u5F55 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 90ea88a..1d00618 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 @@ -2130,4 +2130,5 @@ 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 +Fine-Design_Basic_Engine_Local_Workspace=\u672C\u6A5F\u76EE\u9304 From 0351d1299d843eabfbd6a5d4b2642edab264b1a8 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 23 Aug 2018 10:46:54 +0800 Subject: [PATCH 6/9] REPORT-10171 --- .../main/resources/com/fr/design/i18n/main.properties | 3 +++ .../com/fr/design/i18n/main_en_US.properties | 5 ++++- .../com/fr/design/i18n/main_ja_JP.properties | 9 ++++++--- .../com/fr/design/i18n/main_zh_CN.properties | 11 +++++++---- .../com/fr/design/i18n/main_zh_TW.properties | 11 +++++++---- 5 files changed, 27 insertions(+), 12 deletions(-) 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 12af5cd..d8ea46f 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 @@ -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 diff --git 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 index 2ddb2a0..f1057e7 100644 --- 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 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 5c3ab4a..d17927b 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 @@ -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 diff --git 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 index 8ea96be..e47e7ca 100644 --- 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 @@ -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 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 3b53d88..d58354c 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 @@ -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 From 303f404eeaf9cbfc6eb887ad618dbe79bd7352ce Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 23 Aug 2018 22:13:38 +0800 Subject: [PATCH 7/9] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B=20=E5=88=86=E5=87=BA=20cor?= =?UTF-8?q?e-server=20/=20core-web?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 5 +++-- .../main/resources/com/fr/design/i18n/main_en_US.properties | 5 +++-- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ko_KR.properties | 5 +++-- .../main/resources/com/fr/design/i18n/main_zh_CN.properties | 5 +++-- .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 3 ++- 6 files changed, 16 insertions(+), 10 deletions(-) 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 12af5cd..57adb67 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 @@ -511,7 +511,7 @@ Fine-Design_Report_PageSetup_Landscape=Landscape Fine-Design_Report_PageSetup_Left_To_Right=Left to right Fine-Design_Report_PageSetup_Margin=Margin Fine-Design_Report_Page_Order=Page Order -Fine-Design_Report_PageSetup_Page_Setup=Page Setup +Fine-Engine_Report_PageSetup_Page_Setup=Page Setup Fine-Design_Report_PageSetup_Paper_Size=Paper Size Fine-Design_Report_PageSetup_Placement_Center_On_Page=Page Center Fine-Design_Report_PageSetup_Portrait=Portrait @@ -2165,4 +2165,5 @@ Fine-Design_Updater_Update_to_V9.0= 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= \ No newline at end of file +Fine-Design_Updater_Restore_to_V8= +Fine-Design_Report_Main_Value_Axis=Main Value Axis \ No newline at end of file diff --git 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 index ce50f74..c528562 100644 --- 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 @@ -2028,7 +2028,7 @@ Fine-Design_Form_Orange=Orange Fine-Design_Report_PageSetup-inches=inches Fine-Design_Report_PageSetup_Landscape=Landscape Fine-Design_Report_PageSetup_mm=mm -Fine-Design_Report_PageSetup_Page_Setup=Page Setting +Fine-Engine_Report_PageSetup_Page_Setup=Page Setting Fine-Design_Report_PageSetup_Portrait=Portrait Fine-Design_Basic_Parameter_Boolean=Boolean Fine-Design_Basic_ParameterD_Report_Parameter=Report Parameter @@ -2163,4 +2163,5 @@ Fine-Design_Updater_Update_to_V9.0=Upgrade to FineReport v9.0 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 \ No newline at end of file +Fine-Design_Updater_Restore_to_V8=Restore FR8.0 +Fine-Design_Report_Main_Value_Axis=Primary Value Axis \ 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 5c3ab4a..76b126f 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A2A\u65B9\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5DE6\u304B\u3089\u53F3\u3078 Fine-Design_Report_PageSetup_Margin=\u4F59\u767D Fine-Design_Report_Page_Order=\u5370\u5237\u9806 -Fine-Design_Report_PageSetup_Page_Setup=\u30DA\u30FC\u30B8\u8A2D\u5B9A +Fine-Engine_Report_PageSetup_Page_Setup=\u30DA\u30FC\u30B8\u8A2D\u5B9A Fine-Design_Report_PageSetup_Paper_Size=\u7D19\u30B5\u30A4\u30BA Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u4E2D\u592E\u63C3\u3048 Fine-Design_Report_PageSetup_Portrait=\u7E26\u65B9\u5411 @@ -2144,3 +2144,4 @@ 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 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 502db4a..690ba31 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\uAC00\uB85C Fine-Design_Report_PageSetup_Left_To_Right=\uD589\uBA3C\uC800\uC5F4\uB098\uC911 Fine-Design_Report_PageSetup_Margin=\uD398\uC774\uC9C0\uC5EC\uBC31 Fine-Design_Report_Page_Order=\uC778\uC1C4\uC21C\uC11C -Fine-Design_Report_PageSetup_Page_Setup=\uC6F9\uD398\uC774\uC9C0\uC124\uC815 +Fine-Engine_Report_PageSetup_Page_Setup=\uC6F9\uD398\uC774\uC9C0\uC124\uC815 Fine-Design_Report_PageSetup_Paper_Size=\uC885\uC774\uD06C\uAE30 Fine-Design_Report_PageSetup_Placement_Center_On_Page=\uAC00\uC6B4\uB370\uC815\uB82C\uBC29\uC2DD Fine-Design_Report_PageSetup_Portrait=\uC138\uB85C @@ -2128,4 +2128,5 @@ Fine-Design_Basic_Engine_Event_Success=\uC131\uACF5 Fine-Design_Basic_Engine_Event_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328 Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 -Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC \ No newline at end of file +Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC +Fine-Design_Report_Main_Value_Axis=\uBA54\uC778\uAC12\uCD95 \ No newline at end of file diff --git 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 index 8ea96be..ad6299b 100644 --- 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 @@ -459,7 +459,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A2A\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u884C\u540E\u5217 Fine-Design_Report_PageSetup_Margin=\u9875\u8FB9\u8DDD Fine-Design_Report_Page_Order=\u5206\u9875\u987A\u5E8F -Fine-Design_Report_PageSetup_Page_Setup=\u9875\u9762\u8BBE\u7F6E +Fine-Engine_Report_PageSetup_Page_Setup=\u9875\u9762\u8BBE\u7F6E Fine-Design_Report_PageSetup_Paper_Size=\u7EB8\u5F20\u5927\u5C0F Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u5C45\u4E2D\u65B9\u5F0F Fine-Design_Report_PageSetup_Portrait=\u7EB5\u5411 @@ -2165,4 +2165,5 @@ Fine-Design_Updater_Update_to_V9.0=\u5347\u7EA7\u81F3FineReport9.0\u7248\u672C 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 \ No newline at end of file +Fine-Design_Updater_Restore_to_V8=\u8FD8\u539F\u81F3FR8.0 +Fine-Design_Report_Main_Value_Axis=\u4E3B\u503C\u8F74 \ 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 3b53d88..f4062ef 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A6B\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u5217\u5F8C\u6B04 Fine-Design_Report_PageSetup_Margin=\u9801\u908A\u8DDD Fine-Design_Report_Page_Order=\u5206\u9801\u9806\u5E8F -Fine-Design_Report_PageSetup_Page_Setup=\u9801\u9762\u8A2D\u5B9A +Fine-Engine_Report_PageSetup_Page_Setup=\u9801\u9762\u8A2D\u5B9A Fine-Design_Report_PageSetup_Paper_Size=\u7D19\u5F35\u5927\u5C0F Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u7F6E\u4E2D\u65B9\u5F0F Fine-Design_Report_PageSetup_Portrait=\u7E31\u5411 @@ -2162,5 +2162,6 @@ 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 From f80501c5a2b5500d2cfa96b61ea89fb14a819927 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 23 Aug 2018 22:54:09 +0800 Subject: [PATCH 8/9] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B=20=E6=94=B9=E9=94=99?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8B?= 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_US.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_CN.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 1a03702..60a6b07 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 @@ -511,7 +511,7 @@ Fine-Design_Report_PageSetup_Landscape=Landscape Fine-Design_Report_PageSetup_Left_To_Right=Left to right Fine-Design_Report_PageSetup_Margin=Margin Fine-Design_Report_Page_Order=Page Order -Fine-Engine_Report_PageSetup_Page_Setup=Page Setup +Fine-Design_Report_PageSetup_Page_Setup=Page Setup Fine-Design_Report_PageSetup_Paper_Size=Paper Size Fine-Design_Report_PageSetup_Placement_Center_On_Page=Page Center Fine-Design_Report_PageSetup_Portrait=Portrait diff --git 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 index feb0872..1729ed3 100644 --- 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 @@ -2031,7 +2031,7 @@ Fine-Design_Form_Orange=Orange Fine-Design_Report_PageSetup-inches=inches Fine-Design_Report_PageSetup_Landscape=Landscape Fine-Design_Report_PageSetup_mm=mm -Fine-Engine_Report_PageSetup_Page_Setup=Page Setting +Fine-Design_Report_PageSetup_Page_Setup=Page Setting Fine-Design_Report_PageSetup_Portrait=Portrait Fine-Design_Basic_Parameter_Boolean=Boolean Fine-Design_Basic_ParameterD_Report_Parameter=Report Parameter 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 7aebfff..13a2c1d 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A2A\u65B9\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5DE6\u304B\u3089\u53F3\u3078 Fine-Design_Report_PageSetup_Margin=\u4F59\u767D Fine-Design_Report_Page_Order=\u5370\u5237\u9806 -Fine-Engine_Report_PageSetup_Page_Setup=\u30DA\u30FC\u30B8\u8A2D\u5B9A +Fine-Design_Report_PageSetup_Page_Setup=\u30DA\u30FC\u30B8\u8A2D\u5B9A Fine-Design_Report_PageSetup_Paper_Size=\u7D19\u30B5\u30A4\u30BA Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u4E2D\u592E\u63C3\u3048 Fine-Design_Report_PageSetup_Portrait=\u7E26\u65B9\u5411 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 690ba31..77a8602 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\uAC00\uB85C Fine-Design_Report_PageSetup_Left_To_Right=\uD589\uBA3C\uC800\uC5F4\uB098\uC911 Fine-Design_Report_PageSetup_Margin=\uD398\uC774\uC9C0\uC5EC\uBC31 Fine-Design_Report_Page_Order=\uC778\uC1C4\uC21C\uC11C -Fine-Engine_Report_PageSetup_Page_Setup=\uC6F9\uD398\uC774\uC9C0\uC124\uC815 +Fine-Design_Report_PageSetup_Page_Setup=\uC6F9\uD398\uC774\uC9C0\uC124\uC815 Fine-Design_Report_PageSetup_Paper_Size=\uC885\uC774\uD06C\uAE30 Fine-Design_Report_PageSetup_Placement_Center_On_Page=\uAC00\uC6B4\uB370\uC815\uB82C\uBC29\uC2DD Fine-Design_Report_PageSetup_Portrait=\uC138\uB85C diff --git 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 index c99d430..13d0dea 100644 --- 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 @@ -459,7 +459,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A2A\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u884C\u540E\u5217 Fine-Design_Report_PageSetup_Margin=\u9875\u8FB9\u8DDD Fine-Design_Report_Page_Order=\u5206\u9875\u987A\u5E8F -Fine-Engine_Report_PageSetup_Page_Setup=\u9875\u9762\u8BBE\u7F6E +Fine-Design_Report_PageSetup_Page_Setup=\u9875\u9762\u8BBE\u7F6E Fine-Design_Report_PageSetup_Paper_Size=\u7EB8\u5F20\u5927\u5C0F Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u5C45\u4E2D\u65B9\u5F0F Fine-Design_Report_PageSetup_Portrait=\u7EB5\u5411 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 f010df7..6f87a9b 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 @@ -458,7 +458,7 @@ Fine-Design_Report_PageSetup_Landscape=\u6A6B\u5411 Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u5217\u5F8C\u6B04 Fine-Design_Report_PageSetup_Margin=\u9801\u908A\u8DDD Fine-Design_Report_Page_Order=\u5206\u9801\u9806\u5E8F -Fine-Engine_Report_PageSetup_Page_Setup=\u9801\u9762\u8A2D\u5B9A +Fine-Design_Report_PageSetup_Page_Setup=\u9801\u9762\u8A2D\u5B9A Fine-Design_Report_PageSetup_Paper_Size=\u7D19\u5F35\u5927\u5C0F Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u7F6E\u4E2D\u65B9\u5F0F Fine-Design_Report_PageSetup_Portrait=\u7E31\u5411 From b168c959e3171d7e189fdd0d45c6c6775d14959e Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 24 Aug 2018 16:18:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_en_US.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 1 + .../main/resources/com/fr/design/i18n/main_ko_KR.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_CN.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) 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 60a6b07..df027c6 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 @@ -2169,4 +2169,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 \ No newline at end of file +Fine-Design_Report_Main_Value_Axis=Main Value Axis +Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F \ No newline at end of file diff --git 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 index 1729ed3..3b24f60 100644 --- 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 @@ -2167,4 +2167,5 @@ 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_Report_Main_Value_Axis=Primary Value Axis \ No newline at end of file +Fine-Design_Report_Main_Value_Axis=Primary Value Axis +Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F \ 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 13a2c1d..91c7c91 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 @@ -2148,3 +2148,4 @@ Fine-Design_Updater_Restart_Later=\u5F8C\u307B\u3069\u30EA\u30B9\u30BF\u30FC\u30 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 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 77a8602..b3aa97b 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 @@ -2129,4 +2129,5 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328 Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5 Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC -Fine-Design_Report_Main_Value_Axis=\uBA54\uC778\uAC12\uCD95 \ No newline at end of file +Fine-Design_Report_Main_Value_Axis=\uBA54\uC778\uAC12\uCD95 +Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F \ No newline at end of file diff --git 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 index 13d0dea..41d1e34 100644 --- 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 @@ -2169,4 +2169,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 \ No newline at end of file +Fine-Design_Report_Main_Value_Axis=\u4E3B\u503C\u8F74 +Fine-Design_Parameter_Panel=\u53C2\u6570\u9762\u677F \ 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 6f87a9b..93362ee 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 @@ -2166,5 +2166,6 @@ Fine-Design_Updater_Already_Backup_Old_Project=8.0\u8A2D\u8A08\u5668\u5DF2\u7D93 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