From c4abc3bece4e67d4d84013c22144278ed7a6a5d2 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 12 Jun 2018 20:32:28 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-7702=20-=2010.0=20=E6=B8=85=E7=90=86repo?= =?UTF-8?q?rt.properties=E4=B8=AD=E9=87=8D=E5=A4=8D=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=3D>=20?= =?UTF-8?q?=E8=BD=AC=E7=A7=BBdesign=E7=94=A8=E5=88=B0=E7=9A=84key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- design-i18n-report/src/com/fr/design/i18n/main.properties | 1 - design-i18n-report/src/com/fr/design/i18n/main_en_US.properties | 1 - design-i18n-report/src/com/fr/design/i18n/main_zh_CN.properties | 1 - 3 files changed, 3 deletions(-) diff --git a/design-i18n-report/src/com/fr/design/i18n/main.properties b/design-i18n-report/src/com/fr/design/i18n/main.properties index 41b1d35..f5c7aee 100644 --- 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= diff --git 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 index 6361c93..bfcab5d 100644 --- 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 diff --git 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 index 468f618..9f02a69 100644 --- 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