From fb34b6d461d89d1f1397388c6a00ac706fea01d1 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Sun, 22 Nov 2020 23:45:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-26209=20chore:=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96crm=E6=A8=A1=E6=9D=BF->=E4=BB=A3=E7=A0=81=E5=BA=93?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main_en.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties index 81ef253..19760dc 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties @@ -849,7 +849,7 @@ Fine-Design_Basic_Remote_Design_Decision_User=Decision-making Platform User Fine-Design_Basic_Remote_Design_Invoker_Failed=The current service call failed. Fine-Design_Basic_Remote_Design_Local_Designer=Local Designer: Fine-Design_Basic_Remote_Design_Login_Lock=Password error too many times and has been locked for {} minutes.
Please contact the admin or in the platform -Fine-Design_Basic_Remote_Design_Modify_PassWord=\u0020Change Password +Fine-Design_Basic_Remote_Design_Modify_PassWord=Change Password Fine-Design_Basic_Remote_Design_Permission_Denied=No remote design permission. Please contact the admin. Fine-Design_Basic_Remote_Design_Remind_Show=Don't show again this month Fine-Design_Basic_Remote_Design_Remote_Server=Remote Server: @@ -2523,7 +2523,7 @@ Fine-Design_Report_Y_Coordinate=Vertical Coordinate Fine-Design_Report_Yes=Yes Fine-Design_Report_Zero_Margin_Warn=Physical margins exist in the printer
too small report page margin settings may
print content insufficiently.
  Fine-Design_See_More_New_Features=See more new features -Fine-Design_Send_Report_To_Us=Send reports to help us better optimize our products. We will keep all the information we collect confidential and promise to use it only for product improvement. +Fine-Design_Send_Report_To_Us=Send reports to help us improve. We will keep all the info strictly confidential. Fine-Design_Skip_This_Version=Skip This Version Fine-Design_Software_Download_Url=Software Download Address Fine-Design_Startup_When_Needed=Startup when using (recommended) From 2bb4970bba425450bf59dcf95eec058629d82846 Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 2 Dec 2020 16:48:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:CHART-17209=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties index eb2ad2c..d45b935 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties @@ -371,7 +371,7 @@ Fine-Design_Chart_Map_BaiduMap=\u767E\u5EA6\u5730\u56FE Fine-Design_Chart_Map_Bubble=\u6C14\u6CE1\u56FE\u5730\u56FE--\u65E7\u7248\u672C Fine-Design_Chart_Map_Column=\u67F1\u5F62\u56FE\u5730\u56FE--\u65E7\u7248\u672C Fine-Design_Chart_Map_Corresponding_Fields=\u533A\u57DF\u5BF9\u5E94\u5B57\u6BB5 -Fine-Design_Chart_Map_Data=\u5730\u56FE\u6570\u636E +Fine-Design_Chart_Map_Data=\u5730\u56FE\u914D\u7F6E Fine-Design_Chart_Map_Drill_Level=\u94BB\u53D6\u5C42\u7EA7 Fine-Design_Chart_Map_Field=\u5B57\u6BB5 Fine-Design_Chart_Map_GoogleMap=\u8C37\u6B4C\u5730\u56FE From 812f927568d5c75273c81f1928c8a7d3f9df06ca Mon Sep 17 00:00:00 2001 From: johntsai Date: Wed, 9 Dec 2020 14:39:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?MOBILE-30240=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=A1=BA=E5=BA=8F=E5=90=8D=E5=AD=97=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=20=E4=BF=AE=E6=AD=A3=E4=B8=AD=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main_zh.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index fcf6c15..5a6d43d 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -1558,7 +1558,7 @@ Fine-Design_Form_Widget_Enabled=\u63A7\u4EF6\u53EF\u7528 Fine-Design_Form_Widget_Height=\u63A7\u4EF6\u9AD8\u5EA6 Fine-Design_Form_Widget_Icon=\u63A7\u4EF6\u56FE\u6807 Fine-Design_Form_Widget_No_Repeat=\u53BB\u9664\u91CD\u590D\u9879 -Fine-Design_Form_Widget_Order=\u63A7\u4EF6\u987A\u5E8F +Fine-Design_Form_Widget_Order=\u7EC4\u4EF6\u987A\u5E8F Fine-Design_Form_Widget_Page_Navi_Text=\u5F53\u524D\u9875/\u603B\u9875\u6570 Fine-Design_Form_Widget_Property_Table=\u5C5E\u6027\u8868 Fine-Design_Form_Widget_Rename_Failure=\u5B58\u5728\u91CD\u540D\u7EC4\u4EF6\uFF0C\u8BF7\u8BBE\u7F6E\u5176\u4ED6\u540D\u79F0 From f9c82cbd8868a48916759c4b82e4d1a0f67d843e Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 11 Dec 2020 09:11:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-26209=20chore:=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96crm=E6=A8=A1=E6=9D=BF->=E4=BB=A3=E7=A0=81=E5=BA=93?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/i18n/chart_zh_TW.properties | 6 +++--- .../main/resources/com/fr/design/i18n/main_en.properties | 2 +- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 2 +- .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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 5b833c7..3aa34fa 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 @@ -159,7 +159,7 @@ Fine-Design_Chart_Data_CombineOther=\u5408\u4F75\u5269\u9918\u9805\u70BA\u201C\u Fine-Design_Chart_Data_Configuration=\u8CC7\u6599\u914D\u7F6E Fine-Design_Chart_Data_Field=\u8CC7\u6599\u6B04\u4F4D Fine-Design_Chart_Data_Filter=\u8CC7\u6599\u7BE9\u9078 -Fine-Design_Chart_Data_Form=\u6578\u64DA\u5F62\u5F0F +Fine-Design_Chart_Data_Form=\u8CC7\u6599\u5F62\u5F0F Fine-Design_Chart_Data_Function_Percent=\u4F54\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u8CC7\u6599\u6A19\u7C64\u5167 Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 @@ -187,7 +187,7 @@ Fine-Design_Chart_Delete_Map=\u522A\u9664\u5730\u5716 Fine-Design_Chart_Delimiter_Symbol=\u5206\u9694\u7B26 Fine-Design_Chart_Deploy=\u8A2D\u5B9A Fine-Design_Chart_Descriptor=\u63CF\u8FF0 -Fine-Design_Chart_Detailed_Data=\u660E\u7D30\u6578\u64DA +Fine-Design_Chart_Detailed_Data=\u660E\u7D30\u8CC7\u6599 Fine-Design_Chart_DifferArc_Pie=\u4E0D\u7B49\u5F27\u5EA6\u73AB\u7470\u5716 Fine-Design_Chart_Direction_Horizontal=\u6A6B\u5411 Fine-Design_Chart_Direction_Vertical=\u7E31\u5411 @@ -371,7 +371,7 @@ Fine-Design_Chart_Map_BaiduMap=\u767E\u5EA6\u5730\u5716 Fine-Design_Chart_Map_Bubble=\u6C23\u6CE1\u5716\u5730\u5716 Fine-Design_Chart_Map_Column=\u67F1\u5F62\u5716\u5730\u5716 Fine-Design_Chart_Map_Corresponding_Fields=\u5340\u57DF\u5C0D\u61C9\u6B04\u4F4D -Fine-Design_Chart_Map_Data=\u5730\u5716\u8CC7\u6599 +Fine-Design_Chart_Map_Data=\u5730\u5716\u914D\u7F6E Fine-Design_Chart_Map_Drill_Level=\u947D\u53D6\u5C64\u7D1A Fine-Design_Chart_Map_Field=\u6B04\u4F4D Fine-Design_Chart_Map_GoogleMap=Google Maps diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties index 19760dc..9541434 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties @@ -1111,7 +1111,7 @@ Fine-Design_Basic_Utils_Report_Env_Directory=Report Working Directory Fine-Design_Basic_Utils_Report_Runtime_Env=Report Working Directory Fine-Design_Basic_Utils_Switch_To_Class_Reportlet=Switch to class web report Fine-Design_Basic_Utils_Switch_To_Template_Reportlet=Switch to template web report -Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File=Would you like to cover the current file +Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File=Would you like to replace the current file Fine-Design_Basic_Utils_Would_You_Like_To_Save=Would you like to save Fine-Design_Basic_Validate=Validate Fine-Design_Basic_Value=Value 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 4ae0772..79bdf78 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 @@ -1074,7 +1074,7 @@ Fine-Design_Basic_Tree_Select_Leaf_Only=\u30EA\u30FC\u30D5\u30CE\u30FC\u30C9\u30 Fine-Design_Basic_Tree_Width=\u5E45 Fine-Design_Basic_Tue=\u706B Fine-Design_Basic_Type=\u30BF\u30A4\u30D7 -Fine-Design_Basic_Type_Parameter= "${abc}"\u3092\u5165\u529B\u3057\u3066\u30D1\u30E9\u30E1\u30FC\u30BF\u306B\u3067\u304D\u307E\u3059\u3002
 \u3053\u3053\u3067abc\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3067\u3059\u3002\u4F8B\u3048\u3070
+Fine-Design_Basic_Type_Parameter= "${abc}"\u3092\u5165\u529B\u3057\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u3057\u3066\u4F7F\u3048\u307E\u3059\u3002
 \u3053\u3053\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3067\u3059\u3002\u4F8B\u3048\u3070
Fine-Design_Basic_Type_Set=\u30BF\u30A4\u30D7\u8A2D\u5B9A Fine-Design_Basic_Unable_Delete_Locked_File=\u30ED\u30C3\u30AF\u4E2D\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002 Fine-Design_Basic_Unable_Rename_Locked_File=\u30ED\u30C3\u30AF\u4E2D\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u540D\u524D\u304C\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002 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 15a358a..396a13d 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 @@ -678,7 +678,7 @@ Fine-Design_Basic_Parameter_UI_Display=\u5C55\u793A\u53C3\u6578\u4ECB\u9762 Fine-Design_Basic_Parameters=\u53C3\u6578 Fine-Design_Basic_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D Fine-Design_Basic_Password=\u5BC6\u78BC -Fine-Design_Basic_Performance_First=\u6027\u80FD\u512A\u5148 +Fine-Design_Basic_Performance_First=\u6548\u80FD\u512A\u5148 Fine-Design_Basic_Phone=\u96FB\u8A71 Fine-Design_Basic_Plain_Report=\u666E\u901A\u5831\u8868 Fine-Design_Basic_Please_Rename=\u8ACB\u91CD\u547D\u540D @@ -817,7 +817,7 @@ Fine-Design_Basic_ProgressBar_Title=\u9032\u5EA6... Fine-Design_Basic_Property=\u5C6C\u6027 Fine-Design_Basic_Px=\u50CF\u7D20 Fine-Design_Basic_RWA_Add_Field=\u65B0\u589E\u6B04\u4F4D -Fine-Design_Basic_RWA_Help=\u8A2D\u5B9A\u672A\u4FEE\u6539\u4E0D\u66F4\u65B0\u5F8C\uFF0C\u586B\u5831\u9810\u89BD\u5831\u8868\uFF0C\u8A18\u9304\u6240\u5728\u5132\u5B58\u683C\u6C92\u6709\u88AB\u7DE8\u8F2F\u4FEE\u6539\uFF0C\u5247\u6B64\u8A18\u9304\u4E0D\u6703\u9032\u884C\u66F4\u65B0\uFF1B\n\u5728\u5927\u8CC7\u6599\u91CF\u8A18\u9304\u67E5\u8A62\u4E26\u56DE\u586B\u60C5\u6CC1\u4E0B\uFF0C\u555F\u7528\u8A72\u8A2D\u5B9A\uFF0C\u53EF\u4EE5\u63D0\u9AD8\u586B\u5831\u63D0\u4EA4\u6027\u80FD\u3002 +Fine-Design_Basic_RWA_Help=\u8A2D\u5B9A\u672A\u4FEE\u6539\u4E0D\u66F4\u65B0\u5F8C\uFF0C\u586B\u5831\u9810\u89BD\u5831\u8868\uFF0C\u8A18\u9304\u6240\u5728\u5132\u5B58\u683C\u6C92\u6709\u88AB\u7DE8\u8F2F\u4FEE\u6539\uFF0C\u5247\u6B64\u8A18\u9304\u4E0D\u6703\u9032\u884C\u66F4\u65B0\uFF1B\n\u5728\u5927\u8CC7\u6599\u91CF\u8A18\u9304\u67E5\u8A62\u4E26\u56DE\u586B\u60C5\u6CC1\u4E0B\uFF0C\u555F\u7528\u8A72\u8A2D\u5B9A\uFF0C\u53EF\u4EE5\u63D0\u9AD8\u586B\u5831\u63D0\u4EA4\u6548\u80FD\u3002 Fine-Design_Basic_RWA_NotChange_Unmodified=\u4E0D\u6539\u8B8A\u6642\u4E0D\u66F4\u65B0 Fine-Design_Basic_RWA_Remove_Field=\u79FB\u9664\u6B04\u4F4D Fine-Design_Basic_RWA_Smart_Add_Fields=\u667A\u6167\u65B0\u589E\u6B04\u4F4D From c3955533d7da1d5891ad3a2d01679328982b207b Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 11 Dec 2020 10:08:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-26209=20chore:=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96crm=E6=A8=A1=E6=9D=BF->=E4=BB=A3=E7=A0=81=E5=BA=93?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main_en.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_ko_KR.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties index 9541434..a80d861 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties @@ -1583,7 +1583,7 @@ Fine-Design_Form_Widget_Enabled=Widget Available Fine-Design_Form_Widget_Height=Height Fine-Design_Form_Widget_Icon=Widget Icon Fine-Design_Form_Widget_No_Repeat=No Repeat -Fine-Design_Form_Widget_Order=Widget Order +Fine-Design_Form_Widget_Order=Component Order Fine-Design_Form_Widget_Page_Navi_Text=Current/Total Fine-Design_Form_Widget_Property_Table=Attribute Table Fine-Design_Form_Widget_Rename_Failure=Name already exists, please set another name 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 afb86ae..c7bd81e 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 @@ -1583,7 +1583,7 @@ Fine-Design_Form_Widget_Enabled=\uC0AC\uC6A9\uAC00\uB2A5 Fine-Design_Form_Widget_Height=\uB192\uC774 Fine-Design_Form_Widget_Icon=\uCEE8\uD2B8\uB864 \uC544\uC774\uCF58 Fine-Design_Form_Widget_No_Repeat=\uC911\uBCF5 \uC81C\uAC70 -Fine-Design_Form_Widget_Order=\uCEE8\uD2B8\uB864 \uC21C\uC11C +Fine-Design_Form_Widget_Order=\uCEF4\uD3EC\uB10C\uD2B8 \uC21C\uC11C Fine-Design_Form_Widget_Page_Navi_Text=\uD604\uC7AC\uD398\uC774\uC9C0/\uCD1D\uD398\uC774\uC9C0 Fine-Design_Form_Widget_Property_Table=\uC18D\uC131 \uD14C\uC774\uBE14 Fine-Design_Form_Widget_Rename_Failure=\uC911\uBCF5\uB41C \uCEF4\uD3EC\uB10C\uD2B8 \uC774\uB984\uC785\uB2C8\uB2E4. 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 396a13d..3368e92 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 @@ -1583,7 +1583,7 @@ Fine-Design_Form_Widget_Enabled=\u5143\u4EF6\u53EF\u7528 Fine-Design_Form_Widget_Height=\u5143\u4EF6\u9AD8\u5EA6 Fine-Design_Form_Widget_Icon=\u63A7\u4EF6\u5716\u793A Fine-Design_Form_Widget_No_Repeat=\u53BB\u9664\u91CD\u8907\u9805 -Fine-Design_Form_Widget_Order=\u5143\u4EF6\u9806\u5E8F +Fine-Design_Form_Widget_Order=\u7D44\u4EF6\u9806\u5E8F Fine-Design_Form_Widget_Page_Navi_Text=\u7576\u524D\u9801/\u7E3D\u9801\u6578 Fine-Design_Form_Widget_Property_Table=\u5C6C\u6027\u8868 Fine-Design_Form_Widget_Rename_Failure=\u5B58\u5728\u91CD\u540D\u5143\u4EF6\uFF0C\u8ACB\u8A2D\u5B9A\u5176\u4ED6\u540D\u7A31