merge

design-i18n-report/src/com/fr/design/i18n/main.properties

@@ -2304,6 +2304,7 @@ 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=
@@ -2630,3 +2631,12 @@ FR-Engine_Native_Print=Native Printing
 FR-Engine_Print_Compatible=Printing (compatible)
 Size=Size
 Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated?
+Fine-Designer_Basic_Remote_Env_Config=Remote Env Configuration
+Fine-Designer_Basic_Remote_Env_Try=Try Connect
+Fine-Designer_Basic_Remote_Env_Host=Host
+Fine-Designer_Basic_Remote_Env_Port=Port
+Fine-Designer_Basic_Remote_Env_User=Username
+Fine-Designer_Basic_Remote_Env_Password=Password
+Fine-Designer_Basic_Remote_Connect_Failed=Connect Failed
+Fine-Designer_Basic_Remote_Connect_Successful Connected
+Fine-Designer_Basic_Remote_Env=Remote

design-i18n-report/src/com/fr/design/i18n/main_en_US.properties

@@ -2304,6 +2304,7 @@ 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
@@ -2630,3 +2631,12 @@ FR-Engine_Native_Print=Native Printing
 FR-Engine_Print_Compatible=Printing (compatible)
 Size=Size
 Fine-Plugin_Shop_Need_Install_Version=Need to update to the 10.0 plug-in store, updated?
+Fine-Designer_Basic_Remote_Env_Config=Remote Env Configuration
+Fine-Designer_Basic_Remote_Env_Try=Try Connect
+Fine-Designer_Basic_Remote_Env_Host=Host
+Fine-Designer_Basic_Remote_Env_Port=Port
+Fine-Designer_Basic_Remote_Env_User=Username
+Fine-Designer_Basic_Remote_Env_Password=Password
+Fine-Designer_Basic_Remote_Connect_Failed=Connect Failed
+Fine-Designer_Basic_Remote_Connect_Successful=Connected
+Fine-Designer_Basic_Remote_Env=Remote

design-i18n-report/src/com/fr/design/i18n/main_zh_CN.properties

@@ -2304,6 +2304,7 @@ 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
@@ -2630,3 +2631,12 @@ FR-Engine_Native_Print=\u672C\u5730\u8F6F\u4EF6\u6253\u5370
 FR-Engine_Print_Compatible=\u6253\u5370\uFF08\u517C\u5BB9\uFF09
 Size=\u5C3A\u5BF8
 Fine-Plugin_Shop_Need_Install_Version=\u9700\u8981\u66F4\u65B0\u523010.0\u63D2\u4EF6\u5546\u5E97\uFF0C\u662F\u5426\u66F4\u65B0\uFF1F
+Fine-Designer_Basic_Remote_Env_Config=\u8FDC\u7A0B\u670D\u52A1\u5668\u914D\u7F6E
+Fine-Designer_Basic_Remote_Env_Try=\u6D4B\u8BD5\u8FDE\u63A5
+Fine-Designer_Basic_Remote_Env_Host=\u670D\u52A1\u5668\u5730\u5740
+Fine-Designer_Basic_Remote_Env_Port=\u8FDC\u7A0B\u8BBE\u8BA1\u7AEF\u53E3
+Fine-Designer_Basic_Remote_Env_User=\u7528\u6237\u540D
+Fine-Designer_Basic_Remote_Env_Password=\u5BC6\u7801
+Fine-Designer_Basic_Remote_Connect_Failed=\u8FDC\u7A0B\u8FDE\u63A5\u5931\u8D25
+Fine-Designer_Basic_Remote_Connect_Successful=\u8FDC\u7A0B\u8FDE\u63A5\u6210\u529F
+Fine-Designer_Basic_Remote_Env=\u8FDC\u7A0B\u73AF\u5883