无jira 解决冲突

4 years ago · 0d341d52eb
6 changed files with 35 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
@ -2620,3 +2620,9 @@ Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=
 Fine-Design_Basic_Predefined_Style_Header=
 Fine-Design_Basic_Predefined_Style_Highlight_Text=
+Fine-Design_Basic_Remote_Design_Login_Lock=
+Fine-Design_Basic_Remote_Design_Weak_Password=
+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=
--- 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
@ -2620,3 +2620,9 @@ Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=
 Fine-Design_Basic_Predefined_Style_Header=Header
 Fine-Design_Basic_Predefined_Style_Highlight_Text=Highlight text
+Fine-Design_Basic_Remote_Design_Login_Lock=
+Fine-Design_Basic_Remote_Design_Weak_Password=
+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=
--- 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
@ -2580,7 +2580,6 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30
 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3
 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C
 Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790
-<<<<<<< HEAD
 Fine_Design_Chart_Year=\u5E74
 \u3001Fine-Design_Basic_Community_TechSupport=
 Fine-Design_Predefined_Dark_Pattern=
@ -2618,7 +2617,12 @@ Fine-Design_Basic_Predefined_Applicate_Format=
 Fine-Design_Basic_Predefined_Set_Default=
 Fine-Design_Basic_Predefined_Preview_Title_Text=
 Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
-Fine_Design_Chart_Year=\u5E74
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=
 Fine-Design_Basic_Predefined_Style_Header=
 Fine-Design_Basic_Predefined_Style_Highlight_Text=
+Fine-Design_Basic_Remote_Design_Login_Lock=
+Fine-Design_Basic_Remote_Design_Weak_Password=
+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=
--- 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
@ -2580,7 +2580,6 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr
 Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778
 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4
 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D
-<<<<<<< HEAD
 Fine_Design_Chart_Year=\uB144
 \u3001Fine-Design_Basic_Community_TechSupport=
 Fine-Design_Predefined_Dark_Pattern=
@ -2618,7 +2617,11 @@ Fine-Design_Basic_Predefined_Applicate_Format=
 Fine-Design_Basic_Predefined_Set_Default=
 Fine-Design_Basic_Predefined_Preview_Title_Text=
 Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
-Fine_Design_Chart_Year=\uB144
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=
 Fine-Design_Basic_Predefined_Style_Header=
 Fine-Design_Basic_Predefined_Style_Highlight_Text=
+Fine-Design_Basic_Remote_Design_Login_Lock=
+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=
--- 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
@ -2620,3 +2620,9 @@ Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=\u6837\u5F0F\u540D\u4E0D\u8
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=\u63D0\u793A\uFF1A\u7EC4\u4EF6\u6837\u5F0F\u6682\u4E0D\u5BF9Tab\u5757\u751F\u6548
 Fine-Design_Basic_Predefined_Style_Header=\u8868\u5934
 Fine-Design_Basic_Predefined_Style_Highlight_Text=\u9AD8\u4EAE\u6587\u672C
+Fine-Design_Basic_Remote_Design_Login_Lock=\u5BC6\u7801\u9519\u8BEF\u6B21\u6570\u5DF2\u8FBE\u4E0A\u9650\uFF0C\u5DF2\u88AB\u9501\u5B9A{}\u5206\u949F<br/>\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u5728\u51B3\u7B56\u5E73\u53F0\u4E2D
+Fine-Design_Basic_Remote_Design_Weak_Password=\u5F53\u524D\u5BC6\u7801\u4E0D\u7B26\u5408\u5BC6\u7801\u5F3A\u5EA6\u8981\u6C42<br/>\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u5728\u51B3\u7B56\u5E73\u53F0\u4E2D
+Fine-Design_Basic_Remote_Design_Update_Password=\u5F53\u524D\u5BC6\u7801\u5DF2\u5931\u6548<br/>\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6216\u5728\u51B3\u7B56\u5E73\u53F0\u4E2D
+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
--- 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
@ -2620,3 +2620,9 @@ Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty=
 Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip=
 Fine-Design_Basic_Predefined_Style_Header=
 Fine-Design_Basic_Predefined_Style_Highlight_Text=
+Fine-Design_Basic_Remote_Design_Login_Lock=
+Fine-Design_Basic_Remote_Design_Weak_Password=
+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=