REPORT-7702 - 10.0 清理report.properties中重复以及无用的国际化=> 转移design用到的key

6 years ago · c4abc3bece
3 changed files with 0 additions and 3 deletions
--- a/design-i18n-report/src/com/fr/design/i18n/main.properties
+++ b/design-i18n-report/src/com/fr/design/i18n/main.properties
@ -2304,7 +2304,6 @@ FR-Designer_Display_Position=Display position
 FR-Designer_Template-Version-Warning="Your template file is currently open by a later production designer, will continue to open the original template properties mistakes or risk losing Make sure your design template designer version lower than the deployment server version."
 Fine-Designer_Remote_Design_Template_Authority_Config=Template Design Permission Configuration
 FR-Designer_Initializing=Initializing
-<<<<<<< HEAD
 FR-Designer_Mobile_Screen_Zoom_In=
 FR-Designer_Mobile_Screen_Zoom_Out=
 FR-Engine-List_Filter=
--- a/design-i18n-report/src/com/fr/design/i18n/main_en_US.properties
+++ b/design-i18n-report/src/com/fr/design/i18n/main_en_US.properties
@ -2304,7 +2304,6 @@ FR-Designer_Display_Position=Position
 FR-Designer_Template-Version-Warning=The current template file is designed by higher vision designer. It may cause errors or loss of attributes if continue the operation! Please upgrade your designer. Make sure that your designer version is lower than the deployment server version.
 Fine-Designer_Remote_Design_Template_Authority_Config=Template Design Permission Configuration
 FR-Designer_Initializing=Initializing
-<<<<<<< HEAD
 FR-Designer_Mobile_Screen_Zoom_In=
 FR-Designer_Mobile_Screen_Zoom_Out=
 FR-Engine-List_Filter=list filter
--- a/design-i18n-report/src/com/fr/design/i18n/main_zh_CN.properties
+++ b/design-i18n-report/src/com/fr/design/i18n/main_zh_CN.properties
@ -2304,7 +2304,6 @@ FR-Designer_Display_Position=\u663E\u793A\u4F4D\u7F6E
 FR-Designer_Template-Version-Warning="\u60A8\u5F53\u524D\u6253\u5F00\u7684\u6A21\u677F\u6587\u4EF6\u662F\u7531\u66F4\u9AD8\u7248\u672C\u7684\u8BBE\u8BA1\u5668\u5236\u4F5C\u7684\uFF0C\u7EE7\u7EED\u6253\u5F00\u4F1A\u6709\u51FA\u9519\u6216\u8005\u4E22\u5931\u539F\u6709\u6A21\u677F\u5C5E\u6027\u7684\u98CE\u9669\u3002  \u8BF7\u786E\u4FDD\u60A8\u8BBE\u8BA1\u7684\u6A21\u677F\u7684\u8BBE\u8BA1\u5668\u7248\u672C\u4F4E\u4E8E\u90E8\u7F72\u7684\u670D\u52A1\u5668\u7248\u672C\u3002"
 Fine-Designer_Remote_Design_Template_Authority_Config=\u6A21\u677F\u8BBE\u8BA1\u6743\u9650\u914D\u7F6E
 FR-Designer_Initializing=\u521D\u59CB\u5316
-<<<<<<< HEAD
 FR-Designer_Mobile_Screen_Zoom_In=
 FR-Designer_Mobile_Screen_Zoom_Out=
 FR-Engine-List_Filter=\u5217\u8868\u7B5B\u9009