Browse Source

解决冲突

release/10.0
lidongy 4 years ago
parent
commit
5743a19f62
  1. 4
      design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties

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

@ -1593,7 +1593,6 @@ Fine-Design_Function_Form_Widget_Edit_Toolbar=\u8868\u55AE\u5143\u4EF6\u7DE8\u8F
Fine-Design_Function_Mobile_Template_Cpt=\u884C\u52D5\u7AEF\u7BC4\u672C\uFF08cpt\uFF09
Fine-Design_Function_Mobile_Template_Frm=\u884C\u52D5\u7AEF\u7BC4\u672C\uFF08frm\uFF09
Fine-Design_Last_Designer_Process_Not_Exist=\u4E0A\u6B21\u8A2D\u8A08\u5668\u7A0B\u5E8F\u672A\u6B63\u5E38\u95DC\u9589\uFF0C\u662F\u5426\u7D50\u675F\u7A0B\u5E8F\u4E26\u91CD\u555F
Fine-Design_Mobile_Attribute_Settings=\u5C6C\u6027\u8A2D\u5B9A
Fine-Design_Mobile_BookMark=\u5C0E\u822A
Fine-Design_Mobile_BookMark_Name=\u5C0E\u822A\u540D\u7A31
Fine-Design_Mobile_BookMark_Rename_Failure=\u5B58\u5728\u91CD\u540D\u5C0E\u822A\uFF0C\u8ACB\u8A2D\u5B9A\u5176\u4ED6\u540D\u7A31
@ -2572,5 +2571,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027
Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6
Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C
Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790
Fine_Design_Chart_Year=\u5E74
Fine-Design_Basic_DataSet_Rename_Warning=\u8CC7\u6599\u96C6\u540D\u7A31\u4E0D\u5408\u898F\u7BC4\uFF0C\u8ACB\u52FF\u547D\u540D\u70BA{}\uFF01
Fine_Design_Chart_Year=\u5E74
Loading…
Cancel
Save