Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~ju/design-i18n into 10.0

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.properties

@@ -2264,4 +2264,11 @@ Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=Intelligent Customer Se
 Fine-Design_Report_Alpha_Hot_No_Item=
 Fine-Design_Report_AlphaFine_Conjunction_HE=
 Fine-Design_Report_AlphaFine_Conjunction_YU=
-Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Basic_Hyperlink_Dialog_Title=Dialog Title
+Fine-Design_Basic_Hyperlink_Dialog_Size=Dialog Size
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=Center
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=Custom
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=Left
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=Top
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=Position

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,13 @@ 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
+Fine-Design_Basic_Hyperlink_Dialog_Title=Dialog Title
+Fine-Design_Basic_Hyperlink_Dialog_Size=Dialog Size
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=Center
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=Custom
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=Left
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=Top
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=Position

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

@@ -2148,8 +2148,8 @@ 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_Designer_Version=\u30C7\u30B6\u30A4\u30F3\u5668\u30D0\u30FC\u30B8\u30E7\u30F3
+Fine-Design_Updater_JAR_Version=jar\u30D0\u30FC\u30B8\u30E7\u30F3
 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
@@ -2246,4 +2246,11 @@ Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
 Fine-Design_Report_AlphaFine_Conjunction_HE=
 Fine-Design_Report_AlphaFine_Conjunction_YU=
-Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Basic_Hyperlink_Dialog_Title=Dialog Title
+Fine-Design_Basic_Hyperlink_Dialog_Size=Dialog Size
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=Center
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=Custom
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=Left
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=Top
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=Position

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

@@ -2125,32 +2125,32 @@ Fine-Design_Basic_Engine_Event_Write_Failure=\uAE30\uC785\uC2E4\uD328
 Fine-Design_Basic_Engine_Event_Write_Success=\uAE30\uC785\uC131\uACF5
 Fine-Design_Report_Alignment=\uC815\uB82C
 Fine-Design_Basic_Local_Workspace=\uB85C\uCEEC\uB514\uB809\uD130\uB9AC
-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_UpdateAndUpgrade=\uC5C5\uADF8\uB808\uC774\uB4DC\uB97C \uAC31\uC2E0\uD558\uB2E4
+Fine-Design_Updater_Checking_Jar_Update=Jar \uACBD\uC2E0\uC744 \uAC80\uD1A0 \uC911\uC774\uB2E4
+Fine-Design_Updater_Update=\uC1C4\uC2E0
+Fine-Design_Updater_Restore=\uC774\uC804\uC5D0 \uD658\uC6D0\uD558 \uC168 \uB098\uC694?
+Fine-Design_Updater_New_Version_Available=\uC0C8\uB85C \uC6B4 \uBC84\uC804\uC774 \uC788\uB2E4
+Fine-Design_Updater_JarUpdate=JAR \uAC00\uBC29\uC744 \uAC31\uC2E0\uD558\uB2E4
+Fine-Design_Updater_No_Previous_Version=\uB354 \uBE60 \uB978 \uD310\uBCF8\uC740 \uC5C6\uB2E4
+Fine-Design_Updater_Not_Install_Version=\uD310\uBCF8\uC774 \uC544\uB2C8\uB2E4
+Fine-Design_Updater_Restart_Designer=\uC989\uC2DC \uC7AC\uAC1C\uD558\uB2E4
+Fine-Design_Updater_Connect_VersionUpdateServer_Failed=\uBC84\uC804 \uC5C5 \uB370\uC774\uD2B8 \uC11C\uBC84 \uC5C5 \uB370\uC774\uD2B8 \uBD88\uAC00
+Fine-Design_Updater_Already_Latest_Version=\uCD5C\uC2E0 \uBC84\uC804 \uC785\uB2C8\uB2E4
+Fine-Design_Updater_Jar_Restore=JAR\uAC00\uBC29\uC744 \uBC18\uD658\uD558\uB2E4
+Fine-Design_Updater_Restore_To=\uD658\uC6D0\uD558\uB2E4
+Fine-Design_Updater_WorksAfterRestart=\uBCF8, \uBC1C\uD6A8
+Fine-Design_Updater_Cancel=\uCDE8\uC18C
+Fine-Design_Updater_Ok=\uD655\uC815
+Fine-Design_Updater_Restart_Later=\uC7A0\uC2DC \uD6C4\uC5D0 \uC7AC\uAC1C\uD558\uB2E4
+Fine-Design_Updater_Download_Failed=\uB2E4\uC6B4\uC744 \uBC1B\uB2E4
 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_Designer_Version=\uC124\uACC4 \uAE30\uC758 \uD310\uBCF8
+Fine-Design_Updater_JAR_Version=JAR \uBC84\uC804
+Fine-Design_Updater_Latest_JAR=\uCD5C\uC2E0JAR
 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
@@ -2246,4 +2246,11 @@ Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
 Fine-Design_Report_AlphaFine_Conjunction_HE=
 Fine-Design_Report_AlphaFine_Conjunction_YU=
-Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Basic_Hyperlink_Dialog_Title=Dialog Title
+Fine-Design_Basic_Hyperlink_Dialog_Size=Dialog Size
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=Center
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=Custom
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=Left
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=Top
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=Position

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

@@ -2264,4 +2264,11 @@ Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=\u667A\u80FD\u5BA2\u670
 Fine-Design_Report_Alpha_Hot_No_Item=\u8BE5\u680F\u76EE\u4E0B\u6682\u65E0\u70ED\u70B9\u95EE\u9898
 Fine-Design_Report_AlphaFine_Conjunction_HE=\u548C
 Fine-Design_Report_AlphaFine_Conjunction_YU=\u4E0E
-Fine-Design_Report_AlphaFine_Conjunction_DE=\u7684
+Fine-Design_Report_AlphaFine_Conjunction_DE=\u7684
+Fine-Design_Basic_Hyperlink_Dialog_Title=\u5BF9\u8BDD\u6846\u6807\u9898
+Fine-Design_Basic_Hyperlink_Dialog_Size=\u5BF9\u8BDD\u6846\u5927\u5C0F
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=\u5C45\u4E2D
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=\u81EA\u5B9A\u4E49
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=\u8DDD\u5DE6
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=\u8DDD\u4E0A
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=\u663E\u793A\u4F4D\u7F6E

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

@@ -2264,4 +2264,11 @@ Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Report_Alpha_Hot_No_Item=
 Fine-Design_Report_AlphaFine_Conjunction_HE=
 Fine-Design_Report_AlphaFine_Conjunction_YU=
-Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Report_AlphaFine_Conjunction_DE=
+Fine-Design_Basic_Hyperlink_Dialog_Title=\u5C0D\u8A71\u6846\u6A19\u984C
+Fine-Design_Basic_Hyperlink_Dialog_Size=\u5C0D\u8A71\u6846\u5927\u5C0F
+Fine-Design_Basic_Hyperlink_Dialog_Position_Center=\u5C45\u4E2D
+Fine-Design_Basic_Hyperlink_Dialog_Position_Custom=\u81EA\u5B9A\u7FA9
+Fine-Design_Basic_Hyperlink_Dialog_Position_Left=\u8DDD\u5DE6
+Fine-Design_Basic_Hyperlink_Dialog_Position_Top=\u8DDD\u4E0A
+Fine-Design_Basic_Hyperlink_Dialog_Show_Position=\u986F\u793A\u4F4D\u7F6E