Pull request #1592: 无jira 解决冲突

Merge in DESIGN/design-i18n from ~HADES/design-i18n:feature/10.0 to feature/10.0 * commit '4b7ffc916b8f6777f6d1a1bfce2d5a73ea7250c5': REPORT-45689 添加国际化
4 years ago · aee3df3944
6 changed files with 10 additions and 4 deletions
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
@ -2674,4 +2674,5 @@ 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=
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=
+Fine-Design_Mobile_Param_Style=
--- 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
@ -2674,4 +2674,5 @@ 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
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=Not Process
+Fine-Design_Mobile_Param_Style=
--- 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
@ -2672,3 +2672,4 @@ 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_Mobile_Param_Style=
--- 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
@ -2671,3 +2671,4 @@ Fine-Design_Basic_Remote_Design_Weak_Password=
 Fine-Design_Basic_Remote_Design_Update_Password=
 Fine-Design_Basic_Remote_Design_Permission_Denied=
 Fine-Design_Basic_Dialog_Message_Title=
+Fine-Design_Mobile_Param_Style=
--- 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
@ -2674,4 +2674,5 @@ 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
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u6682\u4E0D\u5904\u7406
+Fine-Design_Mobile_Param_Style=\u6837\u5F0F\u6A21\u677F
--- 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
@ -2674,4 +2674,5 @@ 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
+Fine-Design_Plugin_Error_Remind_Not_Deal_With=\u66AB\u4E0D\u8655\u7406
+Fine-Design_Mobile_Param_Style=