解决冲突

6 years ago · 7a59424fe2
6 changed files with 10 additions and 6 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
@ -2140,4 +2140,5 @@ Fine-Design_Basic_AlphaFine_Enable_Segmentation=Enable Segmentation
 Fine-Design_Report_AlphaFine_Internet_Forum=Can not find answer?Go to internet forum to find the answer.
 Fine-Design_Report_AlphaFine_Hot=hot
 Fine-Design_Report_AlphaFine_Relation_Item=Relation Questions
-Fine-Design_Report_AlphaFine_Back=  <  back
+Fine-Design_Report_AlphaFine_Back=  <  back
+Fine-Design_Basic_Loading_Embed_Server=
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
@ -2138,4 +2138,5 @@ Fine-Design_Basic_AlphaFine_Enable_Segmentation=Enable Segmentation
 Fine-Design_Report_AlphaFine_Internet_Forum=Can not find answer?Go to internet forum to find the answer.
 Fine-Design_Report_AlphaFine_Hot=hot
 Fine-Design_Report_AlphaFine_Relation_Item=Relation Questions
-Fine-Design_Report_AlphaFine_Back=  <  back
+Fine-Design_Report_AlphaFine_Back=  <  back
+Fine-Design_Basic_Loading_Embed_Server=Embed Server is Starting...
--- 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
@ -2124,7 +2124,7 @@ Fine-Design_Basic_Engine_Event_Success=\u6210\u529F
 Fine-Design_Basic_Engine_Event_Unload_Check=\u9001\u4FE1\u305B\u305A\u306B\u96E2\u308C\u308B
 Fine-Design_Basic_Engine_Event_Write_Failure=\u66F8\u304D\u8FBC\u307F\u5931\u6557
 Fine-Design_Basic_Engine_Event_Write_Success=\u66F8\u304D\u8FBC\u307F\u6210\u529F
-
+Fine-Design_Basic_Loading_Embed_Server=
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Basic_AlphaFine_Enable_Segmentation=
--- 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
@ -2134,4 +2134,5 @@ Fine-Design_Basic_AlphaFine_Enable_Segmentation=
 Fine-Design_Report_AlphaFine_Internet_Forum=
 Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
-Fine-Design_Report_AlphaFine_Back=
+Fine-Design_Report_AlphaFine_Back=
+Fine-Design_Basic_Loading_Embed_Server=
--- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
+++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
@ -2140,4 +2140,5 @@ Fine-Design_Basic_AlphaFine_Enable_Segmentation=\u5206\u8BCD\u641C\u7D22
 Fine-Design_Report_AlphaFine_Internet_Forum=\u627E\u4E0D\u5230\u7B54\u6848\uFF1F\u53BB\u8BBA\u575B\u63D0\u95EE
 Fine-Design_Report_AlphaFine_Hot=\u70ED\u95E8\u95EE\u9898
 Fine-Design_Report_AlphaFine_Relation_Item=\u76F8\u5173\u95EE\u9898
-Fine-Design_Report_AlphaFine_Back=  <  \u8FD4\u56DE
+Fine-Design_Report_AlphaFine_Back=  <  \u8FD4\u56DE
+Fine-Design_Basic_Loading_Embed_Server=\u5185\u7F6E\u670D\u52A1\u5668\u542F\u52A8\u4E2D...
--- 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
@ -2130,7 +2130,6 @@ Fine-Design_Basic_Engine_Event_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B
 Fine-Design_Basic_Engine_Event_Write_Failure=\u586B\u5831\u5931\u6557
 Fine-Design_Basic_Engine_Event_Write_Success=\u586B\u5831\u6210\u529F
 Fine-Design_Report_Alignment=\u5C0D\u9F4A
-
 Fine-Design_Basic_AlphaFine_Search_Type=
 Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service=
 Fine-Design_Basic_AlphaFine_Enable_Segmentation=
@ -2138,3 +2137,4 @@ Fine-Design_Report_AlphaFine_Internet_Forum=
 Fine-Design_Report_AlphaFine_Hot=
 Fine-Design_Report_AlphaFine_Relation_Item=
 Fine-Design_Report_AlphaFine_Back=
+Fine-Design_Basic_Loading_Embed_Server=