Merge branch 'release/8.0' of http://cloud.finedevelop.com:2015/scm/~mango/m_design into release/8.0

8 years ago · d0ab66d465
6 changed files with 6 additions and 0 deletions
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -1945,3 +1945,4 @@ FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load resource file
 FR-Designer_Get_Activation_Code=Click\! Get user information code
 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."
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -1946,3 +1946,4 @@ FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load Configuration File
 FR-Designer_Get_Activation_Code=Get Activation Code
 FR-Designer_Display_Position=Position
+FR-Designer_Template-Version-Warning=The current template file is designed by higher vision designer. Open it may result in losing original attributes or error. Please upgrade your designer. Make sure your designer version lower than the deployment server version.
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@ -1946,3 +1946,4 @@ FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
 FR-Designer_Get_Activation_Code=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\!\u30A2\u30AF\u30C6\u30A3\u30D9\u30FC\u30C8\u30B3\u30FC\u30C9\u3092\u53D6\u5F97
 FR-Designer_Display_Position=\u8868\u793A\u4F4D\u7F6E
+FR-Designer_Template-Version-Warning=\u958B\u3044\u305F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u4E0A\u4F4D\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u306E\u30C7\u30B6\u30A4\u30CA\u30FC\u3067\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4E0A\u4F4D\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3067\u4F5C\u6210\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u3068\u30A8\u30E9\u30FC\u306E\u767A\u751F\u539F\u56E0\u3068\u306A\u308B\u307B\u304B\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u6A5F\u80FD\u3084\u5C5E\u6027\u306E\u4E00\u90E8\u3092\u5931\u3046\u6050\u308C\u304C\u3042\u308A\u307E\u3059\u3002\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210\u7528\u306E\u30C7\u30B6\u30A4\u30CA\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3001\u914D\u5099\u3055\u308C\u308B\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3088\u308A\u3082\u4E0B\u4F4D\u306E\u30A8\u30C7\u30A3\u30B7\u30E7\u30F3\u3067\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@ -1945,3 +1945,4 @@ FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
 FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
 FR-Designer_Get_Activation_Code=\!\uB97C\uD074\uB9AD\uD558\uC5EC\uD65C\uC131\uCF54\uB4DC\uB97C\uC5BB\uC2B5\uB2C8\uB2E4.
 FR-Designer_Display_Position=\uC704\uCE58\uBCF4\uC774\uAE30
+FR-Designer_Template-Version-Warning=\uD604\uC7AC\uC5F0\uD15C\uD50C\uB9BF\uD30C\uC77C\uC740\uB354\uB192\uC740\uBC84\uC804\uC758\uC124\uACC4\uAE30\uB85C\uC791\uC131\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\uC5F4\uACBD\uC6B0\uAE30\uC874\uD15C\uD50C\uB9BF\uC18D\uC131\uC774\uC624\uB958\uAC00\uB098\uAC70\uB098\uC190\uC0C1\uB420\uC704\uD5D8\uC774\uC788\uC2B5\uB2C8\uB2E4.   \uC124\uACC4\uD55C\uD15C\uD50C\uB9BF\uC758\uC124\uACC4\uAE30\uBC84\uC804\uC774\uC124\uCE58\uB41C\uC11C\uBC84\uBC84\uC804\uBCF4\uB2E4\uB0AE\uC9C0\uC54A\uB3C4\uB85D\uD558\uC2ED\uC2DC\uC624.
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@ -1945,3 +1945,4 @@ FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
 FR-Designer_Get_Activation_Code=\u70B9\u51FB\!\u83B7\u53D6\u6FC0\u6D3B\u7801
 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"
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -1946,3 +1946,4 @@ FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
 FR-Designer_Get_Activation_Code=\u9EDE\u64CA\!\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC
 FR-Designer_Display_Position=\u986F\u793A\u4F4D\u7F6E
+FR-Designer_Template-Version-Warning="\u60A8\u7576\u524D\u6253\u958B\u7684\u6A21\u677F\u6A94\u6848\u662F\u7531\u66F4\u9AD8\u7248\u672C\u7684\u8A2D\u8A08\u5668\u88FD\u4F5C\u7684\uFF0C\u7E7C\u7E8C\u6253\u958B\u6703\u6709\u51FA\u932F\u6216\u8005\u4E1F\u5931\u539F\u6709\u6A21\u677F\u5C6C\u6027\u7684\u98A8\u96AA\u3002 \u8ACB\u78BA\u4FDD\u60A8\u8A2D\u8A08\u7684\u6A21\u677F\u7684\u8A2D\u8A08\u5668\u7248\u672C\u4F4E\u65BC\u90E8\u7F72\u7684\u4F3A\u670D\u5668\u7248\u672C\u3002"