Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev

merge

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

@@ -561,3 +561,4 @@ 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.

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

@@ -561,3 +561,4 @@ FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_Role=Role
 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.

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

@@ -540,4 +540,4 @@ FR-Designer-Move_Tab_Prev=
 FR-Designer_Role=
 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

@@ -535,3 +535,5 @@ FR-Designer-Move_Tab_Prev=
 FR-Designer_Role=
 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

@@ -565,3 +565,4 @@ FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52A8
 FR-Designer_Role=\u89D2\u8272
 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

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

@@ -553,3 +553,4 @@ FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52D5
 FR-Designer_Role=
 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

designer_base/src/com/fr/start/BaseDesigner.java

@@ -124,7 +124,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 public void actionPerformed(ActionEvent e) {
                     String[] plugins = PluginCollector.getCollector().getErrorPlugins();
                     if (ArrayUtils.isNotEmpty(plugins)) {
-                        String text = StableUtils.join(plugins, ",") + Inter.getLocText("FR-Designer_Plugin_Should_Update");
+                        String text = StableUtils.join(plugins, ",") + ": " + Inter.getLocText("FR-Designer_Plugin_Should_Update_Please_Contact_Developer");
                         int r = JOptionPane.showConfirmDialog(null, text, Inter.getLocText("FR-Designer_Plugin_Should_Update_Title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
                         if (r == JOptionPane.OK_OPTION) {
                             WebDialog.createPluginDialog();