Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release

designer_base/src/com/fr/design/locale/designer.properties

@@ -542,14 +542,14 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Blank
+FR-Designer_Allow_Null=Allow null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
 FR-Designer_ClassName=Class Name
 
 FR-Designer_Polyblock_Edit=Polyblock Edit
-FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}WEB-INF{R2}classes' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R3}classes}
+FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R2}}
 FR-Designer_PageSetup_Horizontal=Horizontal
 FR-Designer_PageSetup_Vertical=Vertical
 FR-Designer_Gradient_Direction=Gradient Direction
@@ -569,3 +569,7 @@ FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -542,14 +542,14 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Null
+FR-Designer_Allow_Null=Allow null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
 FR-Designer_ClassName=Class Name
 
 FR-Designer_Polyblock_Edit=Aggregation block edition
-FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class files should be copied to\nJ2EE server '{R1}WEB-INF{R2}classes' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R3}classes
+FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R2}}
 FR-Designer_PageSetup_Horizontal=Horizontal
 FR-Designer_PageSetup_Vertical=Vertical
 FR-Designer_Gradient_Direction=Gradient Direction
@@ -569,3 +569,7 @@ FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -516,14 +516,14 @@ FR-Designer_Left_Display=\u5DE6\u8868\u793A
 FR-Designer_About_Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 FR-Designer_About_CopyRight=\u8457\u4F5C\u6A29\u6240\u6709
 FR-Designer_Service_Phone=\u30B5\u30FC\u30D3\u30B9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u7A7A\u6B04\u3042\u308A
+FR-Designer_Allow_Null=\u7A7A\u6B04\u3042\u308A
 FR-Designer_PageSetup_Page=\u30DA\u30FC\u30B8
 FR-Designer_Custom_Job_Description=\u8A18\u8FF0
 FR-Designer_Property=\u5C5E\u6027
 FR-Designer_ClassName=\u985E\u540D
 
 FR-Designer_Polyblock_Edit=\u30A2\u30B0\u30EA\u30B2\u30FC\u30B7\u30E7\u30F3\u30D6\u30ED\u30C3\u30AF\u7DE8\u96C6
-FR-Designer_Function_Description_Area_Text=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u7D99\u627F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"com.fr.script.AbstractFunction"\u3002\u3092\u7D99\u627F\u3059\u3079\u304D\u3067\u3059\u3002\u30B3\u30F3\u30D1\u30A4\u30EB\u5F8C\u306E\u985E\u30D5\u30A1\u30A4\u30EB\u3092\nJ2EE\u30B5\u30FC\u30D0\u30FC "{R1}WEB-INF{R2}classes" \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u306B\u30B3\u30D4\u30FC\u3057\u3066\u3001class\u306B\u5BFE\u5FDC\u3059\u308Bjava\u30D5\u30A1\u30A4\u30EB\u3082\u5F53\u76EE\u6B21\u306B\u7F6E\u3044\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u7D99\u627F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"com.fr.script.AbstractFunction"\u3002\u3092\u7D99\u627F\u3059\u3079\u304D\u3067\u3059\u3002\u30B3\u30F3\u30D1\u30A4\u30EB\u5F8C\u306E\u985E\u30D5\u30A1\u30A4\u30EB\u3092\nJ2EE\u30B5\u30FC\u30D0\u30FC "{R1}" \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u306B\u30B3\u30D4\u30FC\u3057\u3066\u3001class\u306B\u5BFE\u5FDC\u3059\u308Bjava\u30D5\u30A1\u30A4\u30EB\u3082\u5F53\u76EE\u6B21\u306B\u7F6E\u3044\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u65B9\u5411
 FR-Designer_PageSetup_Vertical=\u7E26\u65B9\u5411
 FR-Designer_Gradient_Direction=\u65B9\u5411\u3092\u5F90\u3005\u306B\u5909\u5316
@@ -543,3 +543,4 @@ FR-Designer-Move_Tab_Next=
 FR-Designer-Move_Tab_Prev=
 FR-Designer_DS_TableData=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
 FR-Designer_Parameter-Formula=\u6570\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -512,7 +512,7 @@ FR-Designer_Left_Display=\uC67C\uCABD\uBCF4\uC774\uAE30
 FR-Designer_About_Version=\uBC84\uC804
 FR-Designer_About_CopyRight=\uD310\uAD8C\uC18C\uC720
 FR-Designer_Service_Phone=\uC11C\uBE44\uC2A4\uC804\uD654\uFF1A
-FR-Designer_Allow_Blank=\uBE48\uCE78\uD5C8\uC6A9
+FR-Designer_Allow_Null=\uBE48\uCE78\uD5C8\uC6A9
 FR-Designer_PageSetup_Page=\uC6F9\uD398\uC774\uC9C0
 FR-Designer_Custom_Job_Description=\uC124\uBA85
 FR-Designer_Property=\uC18D\uC131
@@ -520,7 +520,7 @@ FR-Designer_ClassName=\uD074\uB798\uC2A4\uB124\uC784
 FR-Designer_Template_Web_Attributes=\uD15C\uD50C\uB9BF \uC6F9 \uC18D\uC131
 
 FR-Designer_Polyblock_Edit=\uCDE8\uD569\uBE14\uB7ED\uD3B8\uC9D1
-FR-Designer_Function_Description_Area_Text=\uD574\uB2F9\uD074\uB798\uC2A4\uB294\uACC4\uC2B9\uD574\uC57C\uD55C\uB2E4."com.fr.script.AbstractFunction".\uCEF4\uD30C\uC77C\uD6C4\uC758\uD074\uB798\uC2A4\uD30C\uC77C\uC744~\uB85C\uBCF5\uC0AC\nJ2EE\uC11C\uBC84 "{R1}WEB-INF{R2}classes" \uB514\uB809\uD130\uB9AC, \uD544\uC694\uC2DC class \uC0C1\uC751\uD558\uB294 java\uC18C\uC2A4\uD30C\uC77C\uB3C4\uD574\uB2F9\uB514\uB809\uD130\uB9AC\uD558\uB2E8\uC5D0\uB450\uC5B4\uD3B8\uC9D1\uBC0F\uCC3E\uC544\uBCF4\uAE30\uB97C\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\n\uC608: {R3}classes
+FR-Designer_Function_Description_Area_Text=\uD574\uB2F9\uD074\uB798\uC2A4\uB294\uACC4\uC2B9\uD574\uC57C\uD55C\uB2E4."com.fr.script.AbstractFunction".\uCEF4\uD30C\uC77C\uD6C4\uC758\uD074\uB798\uC2A4\uD30C\uC77C\uC744~\uB85C\uBCF5\uC0AC\nJ2EE\uC11C\uBC84 "{R1}" \uB514\uB809\uD130\uB9AC, \uD544\uC694\uC2DC class \uC0C1\uC751\uD558\uB294 java\uC18C\uC2A4\uD30C\uC77C\uB3C4\uD574\uB2F9\uB514\uB809\uD130\uB9AC\uD558\uB2E8\uC5D0\uB450\uC5B4\uD3B8\uC9D1\uBC0F\uCC3E\uC544\uBCF4\uAE30\uB97C\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\n\uC608: {R2}
 FR-Designer_PageSetup_Horizontal=\uAC00\uB85C
 FR-Designer_PageSetup_Vertical=\uC138\uB85C
 FR-Designer_Gradient_Direction=\uADF8\uB77C\uB370\uC774\uC158 \uBC29\uD5A5
@@ -540,3 +540,4 @@ FR-Designer-Move_Tab_Next=
 FR-Designer-Move_Tab_Prev=
 FR-Designer_DS_TableData=\uB370\uC774\uD130\uC138\uD2B8
 FR-Designer_Parameter-Formula=\uC218\uC2DD
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -546,14 +546,14 @@ FR-Designer_Left_Display=\u5DE6\u5C55\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6743\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52A1\u7535\u8BDD\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8BB8\u4E3A\u7A7A
+FR-Designer_Allow_Null=\u5141\u8BB8\u4E3A\u7A7A
 FR-Designer_PageSetup_Page=\u9875\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C5E\u6027
 FR-Designer_ClassName=\u7C7B\u540D
 
 FR-Designer_Polyblock_Edit=\u805A\u5408\u5757\u7F16\u8F91
-FR-Designer_Function_Description_Area_Text=\u8BE5\u7C7B\u5FC5\u987B\u7EE7\u627F"com.fr.script.AbstractFunction"\u3002\u5E94\u5C06\u7F16\u8BD1\u540E\u7684\u7C7B\u6587\u4EF6\u62F7\u8D1D\u5230\nJ2EE\u670D\u52A1\u5668 "{R1}WEB-INF{R2}classes" \u76EE\u5F55\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8BDD\u5C06class\u5BF9\u5E94\u7684java\u6E90\u6587\u4EF6\u4E5F\u653E\u7F6E\u5230\u8BE5\u76EE\u5F55\u4E0B\u65B9\u4FBF\u7F16\u8F91\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u8BE5\u7C7B\u5FC5\u987B\u7EE7\u627F"com.fr.script.AbstractFunction"\u3002\u5E94\u5C06\u7F16\u8BD1\u540E\u7684\u7C7B\u6587\u4EF6\u62F7\u8D1D\u5230\nJ2EE\u670D\u52A1\u5668 "{R1}" \u76EE\u5F55\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8BDD\u5C06class\u5BF9\u5E94\u7684java\u6E90\u6587\u4EF6\u4E5F\u653E\u7F6E\u5230\u8BE5\u76EE\u5F55\u4E0B\u65B9\u4FBF\u7F16\u8F91\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u5411
 FR-Designer_PageSetup_Vertical=\u7EB5\u5411
 FR-Designer_Gradient_Direction=\u6E10\u53D8\u65B9\u5411
@@ -573,3 +573,7 @@ FR-Designer-Move_Tab_Next=\u5F80\u540E\u79FB\u52A8
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52A8
 FR-Designer_DS_TableData=\u6570\u636E\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u63D2\u4EF6\u7248\u672C\u8FC7\u4F4E, \u5B58\u5728API\u4E0D\u517C\u5BB9, \u8BF7\u8054\u7CFB\u5F00\u53D1\u8005\u5347\u7EA7\u63D2\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u987A\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CA\uFF1A\u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u8868\u5355\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CA: \u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u62A5\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9875\u9884\u89C8\uFF0C\u586B\u62A5\u9884\u89C8\u65F6\u5C5E\u6027\u65E0\u6548.

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -534,14 +534,14 @@ FR-Designer_Left_Display=\u5DE6\u986F\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6B0A\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52D9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8A31\u70BA\u7A7A\u767D
+FR-Designer_Allow_Null=\u5141\u8A31\u70BA\u7A7A\u767D
 FR-Designer_PageSetup_Page=\u9801\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C6C\u6027
 FR-Designer_ClassName=\u985E\u540D
 
 FR-Designer_Polyblock_Edit=\u805A\u5408\u584A\u7DE8\u8F2F
-FR-Designer_Function_Description_Area_Text=\u8A72\u985E\u5FC5\u9808\u7E7C\u627F"com.fr.script.AbstractFunction"\u3002\u61C9\u5C07\u7DE8\u8B6F\u5F8C\u7684\u985E\u6A94\u6848\u62F7\u8C9D\u5230\nJ2EE\u4F3A\u670D\u5668 "{R1}WEB-INF{R2}classes" \u76EE\u9304\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8A71\u5C07class\u5C0D\u61C9\u7684java\u539F\u59CB\u6A94\u6848\u4E5F\u653E\u7F6E\u5230\u8A72\u76EE\u9304\u4E0B\u65B9\u4FBF\u7DE8\u8F2F\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u8A72\u985E\u5FC5\u9808\u7E7C\u627F"com.fr.script.AbstractFunction"\u3002\u61C9\u5C07\u7DE8\u8B6F\u5F8C\u7684\u985E\u6A94\u6848\u62F7\u8C9D\u5230\nJ2EE\u4F3A\u670D\u5668 "{R1}" \u76EE\u9304\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8A71\u5C07class\u5C0D\u61C9\u7684java\u539F\u59CB\u6A94\u6848\u4E5F\u653E\u7F6E\u5230\u8A72\u76EE\u9304\u4E0B\u65B9\u4FBF\u7DE8\u8F2F\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u5411
 FR-Designer_PageSetup_Vertical=\u7E31\u5411
 FR-Designer_Gradient_Direction=\u6F38\u8B8A\u65B9\u5411
@@ -561,3 +561,7 @@ FR-Designer-Move_Tab_Next=\u5F80\u5F8C\u79FB\u52D5
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52D5
 FR-Designer_DS_TableData=\u8CC7\u6599\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u633F\u4EF6\u7248\u672C\u904E\u4F4E\uFF0C\u5B58\u5728API\u4E0D\u76F8\u5BB9\uFF0C\u8ACB\u806F\u7CFB\u958B\u767C\u8005\u965E\u7D1A\u633F\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548