From 303f404eeaf9cbfc6eb887ad618dbe79bd7352ce Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 23 Aug 2018 22:13:38 +0800 Subject: [PATCH] =?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