fanruan
/
design-i18n
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

处理冲突

feature/10.0
Maksim 4 years ago
parent
15dd910b14
commit
6bf4cd13d8
2 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
  2. 18
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties

18
design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
Unescape View File

@ -2464,23 +2464,23 @@ Fine-Design_Send_Report_To_Us=\u53D1\u9001\u62A5\u544A\u5E2E\u52A9\u6211\u4EEC\u
Fine-Design_Basic_Ok=\u597D
Fine-Design_Error_Process_Occupied_Message=\u8BBE\u8BA1\u5668\u6B8B\u7559\u8FDB\u7A0B\u5360\u7528
Fine-Design_Modify_Designer_Port_Tip=\u68C0\u6D4B\u5230\u8BBE\u8BA1\u5668\u7AEF\u53E3\u51B2\u7A81\uFF0C\u8BF7\u66F4\u6539\u8BBE\u8BA1\u5668\u7AEF\u53E3(1024~65536\u4E4B\u95F4)\u5E76\u91CD\u542F\u8BBE\u8BA1\u5668
Fine-Design_Basic_Remote_Design_Branch_Need_Update=
Fine-Design_Basic_Remote_Design_Branch_Need_Update=\u4E3A\u4E86\u4FDD\u8BC1\u529F\u80FD\u6B63\u5E38\u4F7F\u7528\uFF0C\u5EFA\u8BAE\u60A8\u53CA\u65F6\u66F4\u65B0\uFF0C\u4FDD\u6301\u7248\u672C\u4E00\u81F4
Fine-Design_Form_ConfirmDialog_Title=FineReport 8.0
Fine-Design_Basic_Remote_Design_Title_Hint=
Fine-Design_Basic_Remote_Design_Title_Hint=\u63D0\u793A
Fine-Design_Modify_Designer_Port_Out_Of_Range_Tip=\u8F93\u5165\u7684\u7AEF\u53E3\u8303\u56F4\u4E0D\u6B63\u786E\uFF0C\u5E94\u57281024~65536\u4E4B\u95F4
Fine-Design_Error_Finedb_Problem_Message=finedb\u635F\u574F\u6216\u88AB\u5176\u4ED6\u7A0B\u5E8F\u5360\u7528
Fine-Design_Basic_Remote_Design_Branch_Is_Old=
Fine-Design_Basic_Remote_Design_Branch_Is_Old=\u7248\u672C\u4F4E\u4E8E
Fine-Design_End_Occupied_Process=\u7ED3\u675F\u8FDB\u7A0B
Fine-Design_Basic_Error_Tittle=\u62A5\u9519
Fine-Design_Basic_Remote_Design_Invoker_Failed=
Fine-Design_Basic_Remote_Design_Invoker_Failed=\u5F53\u524D\u670D\u52A1\u8C03\u7528\u5931\u8D25
Fine-Design_Modify_Designer_Port_Not_Number_Tip=\u8F93\u5165\u7684\u4E0D\u662F\u6570\u5B57
Fine-Design_Modify_Designer_Port=\u66F4\u6539\u7AEF\u53E3
Fine-Design_Error_Start_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u542F\u52A8\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF
Fine-Design_Basic_Remote_Design_Remote_Server=
Fine-Design_Basic_Remote_Design_Remote_Server=\u8FDC\u7A0B\u670D\u52A1\u5668
Fine-Design_Report_Support_Scan_Code=\u652F\u6301\u626B\u7801\u8F93\u5165
Fine-Design_Error_Remote_No_Response_Message=\u8FDC\u7A0B\u8BBE\u8BA1\u670D\u52A1\u5668\u65E0\u54CD\u5E94
Fine-Design_Basic_Remote_Design_Branch_Inconsistency=
Fine-Design_Basic_Remote_Design_Affected_Function=
Fine-Design_Basic_Remote_Design_Branch_Inconsistency=\u7248\u672C\u4E0D\u4E00\u81F4\uFF0C\u8FDC\u7A0B\u8BBE\u8BA1\u65F6\u90E8\u5206\u529F\u80FD\u5C06\u53D7\u5F71\u54CD
Fine-Design_Basic_Remote_Design_Affected_Function=\u53EF\u80FD\u53D7\u5F71\u54CD\u7684\u529F\u80FD
Fine-Design_Error_Fall_Back_Report=\u8BBE\u8BA1\u5668\u95EA\u9000\u62A5\u544A
Fine-Design_Problem_Detail_Message=\u95EE\u9898\u8BE6\u7EC6\u4FE1\u606F
Fine-Design_Error_UnExcepted_Start_Failed=\u9884\u671F\u5916\u7684\u542F\u52A8\u9519\u8BEF
@ -2488,8 +2488,8 @@ Fine-Design_Error_Out_Of_Memory_Message=\u8BBE\u8BA1\u5668\u5185\u5B58\u4E0D\u8D
Fine-Design_Error_Start_Report=\u542F\u52A8\u5931\u8D25\u62A5\u544A
Fine-Design_Error_UnExcepted_Fall_Back=\u9884\u671F\u5916\u7684\u95EA\u9000\u9519\u8BEF
Fine-Design_Last_Designer_Process_Not_Exist=\u4E0A\u6B21\u8BBE\u8BA1\u5668\u8FDB\u7A0B\u672A\u6B63\u5E38\u5173\u95ED\uFF0C\u662F\u5426\u7ED3\u675F\u8FDB\u7A0B\u5E76\u91CD\u542F
Fine-Design_Basic_Remote_Design_Local_Designer=
Fine-Design_Basic_Remote_Design_Button_Confirm=
Fine-Design_Basic_Remote_Design_Local_Designer=\u672C\u5730\u8BBE\u8BA1\u5668
Fine-Design_Basic_Remote_Design_Button_Confirm=\u786E\u5B9A
Fine-Design_Basic_Restart=\u91CD\u542F
Fine-Design_Error_Port_Occupied_Message=\u7AEF\u53E3\u88AB\u4ED6\u8FDB\u7A0B\u5360\u7528
Fine-Design_Error_Fall_Back_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF

18
design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
Unescape View File

@ -2477,22 +2477,22 @@ Fine-Design_Send_Report_To_Us=\u53D1\u9001\u62A5\u544A\u5E2E\u52A9\u6211\u4EEC\u
Fine-Design_Basic_Ok=\u597D
Fine-Design_Error_Process_Occupied_Message=\u8BBE\u8BA1\u5668\u6B8B\u7559\u8FDB\u7A0B\u5360\u7528
Fine-Design_Modify_Designer_Port_Tip=\u8BF7\u8F93\u5165\u65B0\u7684\u7AEF\u53E3\u53F7
Fine-Design_Basic_Remote_Design_Branch_Need_Update=
Fine-Design_Basic_Remote_Design_Title_Hint=
Fine-Design_Basic_Remote_Design_Branch_Need_Update=In order to ensure the normal use of functions\uFF0CIt is recommended that you update in time to keep the version consistent.
Fine-Design_Basic_Remote_Design_Title_Hint=Prompt
Fine-Design_Modify_Designer_Port_Out_Of_Range_Tip=\u8F93\u5165\u7684\u7AEF\u53E3\u8303\u56F4\u4E0D\u6B63\u786E\uFF0C\u5E94\u57281024~65536\u4E4B\u95F4
Fine-Design_Error_Finedb_Problem_Message=finedb\u635F\u574F\u6216\u88AB\u5176\u4ED6\u7A0B\u5E8F\u5360\u7528
Fine-Design_Basic_Remote_Design_Branch_Is_Old=
Fine-Design_Basic_Remote_Design_Branch_Is_Old=Version older than
Fine-Design_End_Occupied_Process=\u7ED3\u675F\u8FDB\u7A0B
Fine-Design_Basic_Error_Tittle=\u62A5\u9519
Fine-Design_Basic_Remote_Design_Invoker_Failed=
Fine-Design_Basic_Remote_Design_Invoker_Failed=The current service call failed.
Fine-Design_Modify_Designer_Port_Not_Number_Tip=\u8F93\u5165\u7684\u4E0D\u662F\u6570\u5B57
Fine-Design_Modify_Designer_Port=\u66F4\u6539\u7AEF\u53E3
Fine-Design_Error_Start_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u542F\u52A8\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF
Fine-Design_Basic_Remote_Design_Remote_Server=
Fine-Design_Basic_Remote_Design_Remote_Server=Remote Server
Fine-Design_Report_Support_Scan_Code=\u652F\u6301\u626B\u7801\u8F93\u5165
Fine-Design_Error_Remote_No_Response_Message=\u8FDC\u7A0B\u8BBE\u8BA1\u670D\u52A1\u5668\u65E0\u54CD\u5E94
Fine-Design_Basic_Remote_Design_Branch_Inconsistency=
Fine-Design_Basic_Remote_Design_Affected_Function=
Fine-Design_Basic_Remote_Design_Branch_Inconsistency=Remote Design will be partially affected by inconsistent versions.
Fine-Design_Basic_Remote_Design_Affected_Function=Potentially affected features
Fine-Design_Error_Fall_Back_Report=\u8BBE\u8BA1\u5668\u95EA\u9000\u62A5\u544A
Fine-Design_Problem_Detail_Message=\u95EE\u9898\u8BE6\u7EC6\u4FE1\u606F
Fine-Design_Error_UnExcepted_Start_Failed=\u9884\u671F\u5916\u7684\u542F\u52A8\u9519\u8BEF
@ -2501,8 +2501,8 @@ Fine-Design_Error_Start_Report=\u542F\u52A8\u5931\u8D25\u62A5\u544A
Fine-Design_Error_UnExcepted_Fall_Back=\u9884\u671F\u5916\u7684\u95EA\u9000\u9519\u8BEF
Fine-Design_Report_Mobile_Screen_Zoom_In=
Fine-Design_Last_Designer_Process_Not_Exist=\u4E0A\u6B21\u8BBE\u8BA1\u5668\u8FDB\u7A0B\u672A\u6B63\u5E38\u5173\u95ED\uFF0C\u662F\u5426\u7ED3\u675F\u8FDB\u7A0B\u5E76\u91CD\u542F
Fine-Design_Basic_Remote_Design_Local_Designer=
Fine-Design_Basic_Remote_Design_Button_Confirm=
Fine-Design_Basic_Remote_Design_Local_Designer=Local Designer
Fine-Design_Basic_Remote_Design_Button_Confirm=OK
Fine-Design_Basic_Restart=\u91CD\u542F
Fine-Design_Error_Port_Occupied_Message=\u7AEF\u53E3\u88AB\u4ED6\u8FDB\u7A0B\u5360\u7528
Fine-Design_Error_Fall_Back_Apology_Message=\u62B1\u6B49\uFF01\u8BBE\u8BA1\u5668\u51FA\u73B0\u9884\u671F\u5916\u7684\u9519\u8BEF

Write Preview
Loading…
Cancel
Save