Pull request #1498: 无jira任务，bugfix合feature，解决冲突

Merge in DESIGN/design-i18n from ~LUCIAN.CHEN/design-i18n:feature/10.0 to feature/10.0

* commit 'b820f463ea7a1cf284049ca0cad2453eb195122e':
  REPORT-43744 【10.0.13】插件与jar包不匹配问题优化

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

@@ -2672,3 +2672,6 @@ Fine-Design_Basic_Remote_Design_Update_Password=
 Fine-Design_Basic_Remote_Design_Permission_Denied=
 Fine-Design_Basic_Remote_Design_Modify_PassWord=
 Fine-Design_Basic_Dialog_Message_Title=
+Fine-Design_Plugin_Error_Remind_Title=
+Fine-Design_Plugin_Error_Remind_Deal_With=
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=

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

@@ -717,7 +717,7 @@ Fine-Design_Basic_Plugin_Function_Description=Plugin Function Description
 Fine-Design_Basic_Plugin_Get_Cube=Getting Cube
 Fine-Design_Basic_Plugin_Has_Been_Actived=Plugin is now active, restart the designer and server to enable it and the server need to be manually restarted
 Fine-Design_Basic_Plugin_Has_Been_Disabled=Plugin has been disabled, restart the designer and server to enable it and the server need to be manually restarted
-Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate=Plugin has been disabled
+Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate= has been disabled
 Fine-Design_Basic_Plugin_Has_Install_Lower=The plugin is in lower version, update it?
 Fine-Design_Basic_Plugin_Host_Name=Host Name
 Fine-Design_Basic_Plugin_Index=Index
@@ -1488,7 +1488,7 @@ Fine-Design_Form_Light_Orange=Light Orange
 Fine-Design_Form_Local_Widget=Local Component Library
 Fine-Design_Form_M_Edit_Copy=Copy(C)
 Fine-Design_Form_M_Edit_Cut=Cut(T)
-Fine-Design_Form_M_PC_Preview=Dashboard Preview
+Fine-Design_Form_M_Form_Preview=Dashboard Preview
 Fine-Design_Form_Max_Height_Cannot_Be_Negative=The maximum height cannot be negative
 Fine-Design_Form_Max_Value=Max Value
 Fine-Design_Form_Min_Height=Min Height
@@ -2672,3 +2672,6 @@ Fine-Design_Basic_Remote_Design_Update_Password=
 Fine-Design_Basic_Remote_Design_Permission_Denied=
 Fine-Design_Basic_Remote_Design_Modify_PassWord=
 Fine-Design_Basic_Dialog_Message_Title=
+Fine-Design_Plugin_Error_Remind_Title=The following plugin does not match the JAR version and has been disabled
+Fine-Design_Plugin_Error_Remind_Deal_With=Process
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=Not Process

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

@@ -715,9 +715,9 @@ Fine-Design_Basic_Plugin_Estate_Widget_Value=\u63A7\u4EF6\u503C
 Fine-Design_Basic_Plugin_Format_explan=\u683C\u5F0F\u8BF4\u660E
 Fine-Design_Basic_Plugin_Function_Description=\u63D2\u4EF6\u529F\u80FD\u63CF\u8FF0
 Fine-Design_Basic_Plugin_Get_Cube=\u6B63\u5728\u83B7\u53D6cube
-Fine-Design_Basic_Plugin_Has_Been_Actived=\u63D2\u4EF6\u5DF2\u88AB\u542F\u7528
+Fine-Design_Basic_Plugin_Has_Been_Actived=\u5DF2\u88AB\u542F\u7528
 Fine-Design_Basic_Plugin_Has_Been_Disabled=Plugin has been disabled, restart the designer and sever to enable it and the sever need to be manually restarted
-Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528
+Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate=\u5DF2\u88AB\u7981\u7528
 Fine-Design_Basic_Plugin_Has_Install_Lower=\u5DF2\u7ECF\u5B89\u88C5\u4F4E\u7248\u672C\u63D2\u4EF6\uFF0C\u662F\u5426\u8FDB\u884C\u66F4\u65B0\uFF1F
 Fine-Design_Basic_Plugin_Host_Name=
 Fine-Design_Basic_Plugin_Index=\u5217\u8F74/\u6307\u6807
@@ -1488,7 +1488,7 @@ Fine-Design_Form_Light_Orange=\u6D45\u6A58\u9EC4
 Fine-Design_Form_Local_Widget=\u672C\u5730\u7EC4\u4EF6\u5E93
 Fine-Design_Form_M_Edit_Copy=\u590D\u5236(C)
 Fine-Design_Form_M_Edit_Cut=\u526A\u5207(T)
-Fine-Design_Form_M_PC_Preview=PC\u7AEF\u9884\u89C8
+Fine-Design_Form_M_Form_Preview=\u8868\u5355\u9884\u89C8
 Fine-Design_Form_Max_Height_Cannot_Be_Negative=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u4E3A\u8D1F\u503C
 Fine-Design_Form_Max_Value=\u6700\u5927\u503C
 Fine-Design_Form_Min_Height=\u6700\u5C0F\u9AD8\u5EA6
@@ -2672,3 +2672,6 @@ Fine-Design_Basic_Remote_Design_Update_Password=\u5F53\u524D\u5BC6\u7801\u5DF2\u
 Fine-Design_Basic_Remote_Design_Permission_Denied=\u8FDC\u7A0B\u8BBE\u8BA1\u65E0\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
 Fine-Design_Basic_Remote_Design_Modify_PassWord=\u4FEE\u6539\u5BC6\u7801
 Fine-Design_Basic_Dialog_Message_Title=\u6D88\u606F
+Fine-Design_Plugin_Error_Remind_Title=\u4EE5\u4E0B\u63D2\u4EF6\u4E0EJAR\u5305\u7248\u672C\u4E0D\u5339\u914D\uFF0C\u5DF2\u88AB\u7981\u7528
+Fine-Design_Plugin_Error_Remind_Deal_With=\u7ACB\u5373\u5904\u7406
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u6682\u4E0D\u5904\u7406

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

@@ -717,7 +717,7 @@ Fine-Design_Basic_Plugin_Function_Description=\u63D2\u4EF6\u529F\u80FD\u63CF\u8F
 Fine-Design_Basic_Plugin_Get_Cube=\u6B63\u5728\u7372\u53D6cube
 Fine-Design_Basic_Plugin_Has_Been_Actived=\u63D2\u4EF6\u5DF2\u88AB\u555F\u7528
 Fine-Design_Basic_Plugin_Has_Been_Disabled=Plugin has been disabled, restart the designer and sever to enable it and the sever need to be manually restarted
-Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528
+Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate=\u5DF2\u88AB\u7981\u7528
 Fine-Design_Basic_Plugin_Has_Install_Lower=\u5DF2\u7D93\u5B89\u88DD\u4F4E\u7248\u672C\u63D2\u4EF6\uFF0C\u662F\u5426\u9032\u884C\u66F4\u65B0\uFF1F
 Fine-Design_Basic_Plugin_Host_Name=
 Fine-Design_Basic_Plugin_Index=\u5217\u8EF8/\u6307\u6A19
@@ -1488,7 +1488,7 @@ Fine-Design_Form_Light_Orange=\u6DFA\u6854\u9EC3
 Fine-Design_Form_Local_Widget=\u672C\u6A5F\u5143\u4EF6\u5EAB
 Fine-Design_Form_M_Edit_Copy=\u8907\u88FD(C)
 Fine-Design_Form_M_Edit_Cut=\u526A\u4E0B(T)
-Fine-Design_Form_M_PC_Preview=\u8868\u55AE\u9810\u89BD
+Fine-Design_Form_M_Form_Preview=\u8868\u55AE\u9810\u89BD
 Fine-Design_Form_Max_Height_Cannot_Be_Negative=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u70BA\u8CA0\u503C
 Fine-Design_Form_Max_Value=\u6700\u5927\u503C
 Fine-Design_Form_Min_Height=\u6700\u5C0F\u9AD8\u5EA6
@@ -2672,3 +2672,6 @@ Fine-Design_Basic_Remote_Design_Update_Password=
 Fine-Design_Basic_Remote_Design_Permission_Denied=
 Fine-Design_Basic_Remote_Design_Modify_PassWord=
 Fine-Design_Basic_Dialog_Message_Title=
+Fine-Design_Plugin_Error_Remind_Title=\u4EE5\u4E0B\u63D2\u4EF6\u8207JAR\u5305\u7248\u672C\u4E0D\u5339\u914D\uFF0C\u5DF2\u88AB\u7981\u7528
+Fine-Design_Plugin_Error_Remind_Deal_With=\u7ACB\u5373\u8655\u7406
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u66AB\u4E0D\u8655\u7406