From 6f43d7ecf51303ccdc653e0056dc0ddc7cdd6f98 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 16 Oct 2020 09:15:45 +0800 Subject: [PATCH] =?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 --- .../resources/com/fr/design/i18n/main_en.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 798d62b..1d6db54 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 @@ -261,7 +261,7 @@ Fine-Design_Basic_Database=Database Fine-Design_Basic_Database_Connection_Failed=Database Connection Failed Fine-Design_Basic_Database_Manager=Database Manager Fine-Design_Basic_Database_Select_Table=Select Database Table -Fine-Design_Basic_Datasource_Charset=Code +Fine-Design_Basic_Datasource_Charset=Encoding Fine-Design_Basic_Datasource_Column_Index=Column Index Fine-Design_Basic_Datasource_Connection_Successfully=Successfully Connected Fine-Design_Basic_Datasource_Context=Context @@ -270,8 +270,8 @@ Fine-Design_Basic_Datasource_From_Database=Database Table Fine-Design_Basic_Datasource_JNDI_DES=Note: .jar files containing INITIAL_CONTEXT_FACTORY need to be copied into the /lib directory in the installation directory Fine-Design_Basic_Datasource_JNDI_Name=JNDI Name Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows=Maximum Number of Preview Rows -Fine-Design_Basic_Datasource_New_Charset=New Code -Fine-Design_Basic_Datasource_Original_Charset=Original Code +Fine-Design_Basic_Datasource_New_Charset=New Encoding +Fine-Design_Basic_Datasource_Original_Charset=Original Encoding Fine-Design_Basic_Datasource_Other_Attributes=Other Attributes Fine-Design_Basic_Datasource_Param_DES= You can type "${abc}" as a parameter, here, abc is a parameter name.
 for example: select * from table where id=${abc}.
 select * from table where id='${abc}'.(if the type of id is string) Fine-Design_Basic_Datasource_Stored_Procedure=Stored Procedure @@ -319,7 +319,7 @@ Fine-Design_Basic_EmailPane_Tips= You can type $ {abc} as a parameter, whe Fine-Design_Basic_EmailPane_Warnings=Visit platform or contact administrator to configure sender mailbox. Fine-Design_Basic_Email_Can_Preview_Report_Content=Preview report content in the body Fine-Design_Basic_Empty_Parameter_Name=The parameter name cannot be null, please rename it. -Fine-Design_Basic_Encoding_Type=Encoding Type +Fine-Design_Basic_Encoding_Type=Encoding Fine-Design_Basic_Engine_Attribute=Report Engine Attributes Fine-Design_Basic_Engine_Cancel=Cancel Fine-Design_Basic_Engine_DEFAULT=DEFAULT @@ -2282,7 +2282,7 @@ Fine-Design_Report_Select_Widget=Select Widget Fine-Design_Report_Selection=Selection Fine-Design_Report_ServerM_Predefined_Styles=Predefined Styles Fine-Design_Report_ServerM_Widget_Manager=Widget Manager -Fine-Design_Report_Server_Charset=Server Code +Fine-Design_Report_Server_Charset=Server Encoding Fine-Design_Report_Server_Datasource_Parameter=Server Datasource Parameter Fine-Design_Report_Server_Toolbar_Choose_Role=Server Toolbar Permission Setting Fine-Design_Report_Set=Setting