Merge pull request #152 in DESIGN/design-i18n from ~LEWIS/design-i18n:release/10.0 to release/10.0

* commit '966a5c1dd699e329037a605cb61badb70bd3711d':
  国际化—英语—报表设计器

design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en_US.properties

@@ -524,7 +524,7 @@ Fine-Design_Chart_Change_Pie_Size=Change Pie Size To
 Fine-Design_Chart_Change_Percent=Change percentage
 Fine-Design_Chart_Change_Config_Attributes=Chart switch attributes
 Fine-Design_Chart_Change_Bubble_Size=Change Bubble Size as:
-Fine-Design_Chart_Change_Bar_Size=Change Column Size To
+Fine-Design_Chart_Change_Bar_Size=Change Column Size to
 Fine-Design_Chart_Change=Change
 Fine-Design_Chart_Cell_Data=Cell data
 Fine-Design_Chart_Category_Name=Category

design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties

@@ -2211,7 +2211,6 @@ Fine-Design_Basic_Plugin_Estate_Default_Font=Default font
 Fine-Design_Basic_Plugin_Estate_Default_Null=Default null
 Fine-Design_Basic_Plugin_Estate_Default_Text=Default
 Fine-Design_Basic_Plugin_Estate_Parameter_Null_Text=Parameter is null, then display as
-Fine-Design_Basic_Plugin_Estate_Radio-Group=Common button group controls for real estate
 Fine-Design_Basic_Plugin_Estate_Selected_Font=Selected Font
 Fine-Design_Basic_Plugin_Estate_Widget_Value=Control Value
 Fine-Design_Basic_Plugin_Dec_Init_DB_Type=Database Type
@@ -2229,8 +2228,6 @@ Fine-Design_Basic_Plugin_Language=Language
 Fine-Design_Basic_Plugin_Engine_Detail_Message=Detail Message
 Fine-Design_Basic_Plugin_Save_Path=Saving Path
 Fine-Design_Basic_Plugin_Estate_Radio-Group=Common button group controls of real estate
-Fine-Design_Basic_Plugin_Engine_Detail_Message=Detail Message
-Fine-Design_Basic_Plugin_Save_Path=need work
 Fine-Design_Function_Form_Widget_Edit_Toolbar=form widget edit(toolbar)
 Fine-Design_Function_Form_Widget_Edit_Popup_Menu=form widget edit(popup menu)
 Fine-Design_Function_Mobile_Template_Frm=mobile template(frm)
@@ -2242,9 +2239,8 @@ Fine-Design_Basic_Plugin_Refresh_Parameter_In_SQL=Whether to refresh parameters
 Fine-Design_Basic_Plugin_Query_Type=Query Type=
 Fine-Design_Basic_Plugin_Format_explan=Format explain
 Fine-Design_Basic_Plugin_Row_Dimension=Row Dimension
-Fine-Design_Basic_Plugin_MDX_Explain=Syntax Reference MDX syntax.\nFor example\:\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\nNOTE\: COLUMNS, ROWS can be replaced by 0,1, the query axis only supports returning two axis
+Fine-Design_Basic_Plugin_MDX_Explain=Syntax Reference MDX syntax.\nFor example:\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\nNOTE: COLUMNS, ROWS can be replaced by 0,1, the query axis only supports returning two axis
 Fine-Design_Basic_Plugin_Index=index
-Fine-Design_Basic_Plugin_Get_Cube=
 Fine-Design_Basic_Plugin_DataBase_Connection=Database Connection
 Fine-Design_Basic_Plugin_Web_Apply=Web Application
 Fine-Design_Mobile_Preview=Mobile Preview
@@ -2261,7 +2257,7 @@ Fine-Design_Report_AlphaFine_Back=back
 Fine-Design_Basic_Rename_Failure=Failed
 Fine-Design_Basic_Enter_New_Folder_Name=Please enter a new folder name
 Fine-Design_Report_AlphaFine_Relation_Item=Relation Questions
-Fine-Design_Basic_Mkdir=new folder
+Fine-Design_Basic_Mkdir=New Folder
 Fine-Design_Basic_Make_Failure=Failed
 Fine-Design_Report_AlphaFine_Internet_Forum=Can not find answer?Go to internet forum to find the answer.
 Fine-Design_Basic_Unable_Rename_Locked_File=The locked template cannot be renamed.
@@ -2275,6 +2271,6 @@ Fine-Design_Basic_AlphaFine_Search_Type=Search Type
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Service
 Fine-Design_Report_Alpha_Hot_No_Item=There is no content in this topic.
 Fine-Design_Chart_Hyperlink_Form_Link=Current dashboard object
-Fine-Design_Report_AlphaFine_Conjunction_HE=
-Fine-Design_Report_AlphaFine_Conjunction_YU=
-Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Report_AlphaFine_Conjunction_HE=and
+Fine-Design_Report_AlphaFine_Conjunction_YU=or
+Fine-Design_Report_AlphaFine_Conjunction_DE=and