From c40f3371cd46dae8c16a6749f5853c30566b9337 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 28 Jun 2017 10:03:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-2354=20=E4=B8=80=E4=BA=9B=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/extra/PluginOperateUtils.java | 22 ++++++++----------- .../exe/callback/UninstallPluginCallback.java | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index 9b661543b..fd107b913 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -296,21 +296,17 @@ public class PluginOperateUtils { && StringUtils.isNotEmpty(pluginView.getEnvVersion()); } - public static String getSuccessInfo(PluginTaskResult result){ + public static String getSuccessInfo(PluginTaskResult result) { StringBuilder pluginInfo = new StringBuilder(); - PluginTask currentTask = result.getCurrentTask(); - PluginContext context = PluginManager.getContext(currentTask.getMarker()); - if(context != null){ - pluginInfo.append(context.getName()); - } List pluginTaskResults = result.asList(); - for(PluginTaskResult pluginTaskResult : pluginTaskResults){ - List pluginTasks = pluginTaskResult.getPreTasks(); - for(PluginTask pluginTask : pluginTasks){ - PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); - if(pluginContext != null){ - pluginInfo.append(pluginContext.getName()); - } + for (PluginTaskResult pluginTaskResult : pluginTaskResults) { + if(pluginInfo.length() != 0){ + pluginInfo.append("、"); + } + PluginTask pluginTask = pluginTaskResult.getCurrentTask(); + PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); + if (pluginContext != null) { + pluginInfo.append(pluginContext.getName()); } } return pluginInfo.toString(); diff --git a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java index 75a017705..2ad36842b 100644 --- a/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java +++ b/designer_base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java @@ -27,7 +27,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { jsCallback.execute("success"); FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Success")); JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Delete_Success")); - }else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { + }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Delete_Dependence")), From c5d99706b41d4011a2c3c02e50fc1c722c10b4be Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 29 Jun 2017 17:19:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-2354=20=E5=9C=8B=E9=9A=9B=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/extra/PluginOperateUtils.java | 13 ++- .../src/com/fr/design/extra/PluginUtils.java | 3 + .../com/fr/design/extra/PluginWebBridge.java | 3 +- .../exe/callback/InstallOnlineCallback.java | 5 +- .../com/fr/design/locale/designer.properties | 80 ------------------ .../design/locale/designer_en_US.properties | 80 ------------------ .../design/locale/designer_ja_JP.properties | 82 +------------------ .../design/locale/designer_ko_KR.properties | 82 +------------------ .../design/locale/designer_zh_CN.properties | 80 ------------------ .../design/locale/designer_zh_TW.properties | 80 ------------------ 10 files changed, 18 insertions(+), 490 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java index fd107b913..5cba0622b 100644 --- a/designer_base/src/com/fr/design/extra/PluginOperateUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginOperateUtils.java @@ -301,12 +301,19 @@ public class PluginOperateUtils { List pluginTaskResults = result.asList(); for (PluginTaskResult pluginTaskResult : pluginTaskResults) { if(pluginInfo.length() != 0){ - pluginInfo.append("、"); + pluginInfo.append("\n"); } PluginTask pluginTask = pluginTaskResult.getCurrentTask(); - PluginContext pluginContext = PluginManager.getContext(pluginTask.getMarker()); + if(pluginTask == null){ + pluginInfo.append(PluginUtils.getMessageByErrorCode(pluginTaskResult.errorCode())); + continue; + } + PluginMarker pluginMarker = pluginTask.getMarker(); + PluginContext pluginContext = PluginManager.getContext(pluginMarker); if (pluginContext != null) { - pluginInfo.append(pluginContext.getName()); + pluginInfo.append(pluginContext.getName()).append(PluginUtils.getMessageByErrorCode(pluginTaskResult.errorCode())); + }else{ + pluginInfo.append(pluginMarker.getPluginID()).append(PluginUtils.getMessageByErrorCode(pluginTaskResult.errorCode())); } } return pluginInfo.toString(); diff --git a/designer_base/src/com/fr/design/extra/PluginUtils.java b/designer_base/src/com/fr/design/extra/PluginUtils.java index 0e6ae15a1..049ab28f9 100644 --- a/designer_base/src/com/fr/design/extra/PluginUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginUtils.java @@ -166,6 +166,9 @@ public class PluginUtils { } public static String getMessageByErrorCode(PluginErrorCode errorCode) { + if(errorCode == PluginErrorCode.None){ + return ""; + } return Inter.getLocText(getInterKeyByErrorCode(errorCode)); } diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index b468f351d..d79b04e0e 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -44,7 +44,6 @@ public class PluginWebBridge { private UILabel uiLabel; - private static final String DESIGNERI18PREFIX = "FR-Designer-"; /** * 动作枚举 @@ -517,7 +516,7 @@ public class PluginWebBridge { * 国际化 */ public String parseI18(final String key){ - return Inter.getLocText(DESIGNERI18PREFIX + key); + return Inter.getLocText(key); } /** diff --git a/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java b/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java index 1bccef3c4..1e05d1269 100644 --- a/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java +++ b/designer_base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java @@ -1,6 +1,5 @@ package com.fr.design.extra.exe.callback; -import com.fr.design.extra.PluginUtils; import com.fr.design.extra.PluginOperateUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; @@ -33,8 +32,8 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { @Override protected void allDone(PluginTaskResult result) { + String pluginInfo = PluginOperateUtils.getSuccessInfo(result); if (result.isSuccess()) { - String pluginInfo = PluginOperateUtils.getSuccessInfo(result); jsCallback.execute("success"); FRLogger.getLogger().info(pluginInfo + Inter.getLocText("FR-Designer-Plugin_Install_Success")); JOptionPane.showMessageDialog(null, pluginInfo + Inter.getLocText("FR-Designer-Plugin_Install_Success")); @@ -57,7 +56,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { }else { jsCallback.execute("failed"); FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Failed")); - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, pluginInfo, Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index d113fa563..3c6d79d4d 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2002,86 +2002,6 @@ FR-Designer_AlphaFine_ShowLess=show less FR-Designer_Alphafine=AlphaFine FR-Designer-Alphafine_No_Remind= <<<<<<< HEAD -FR-Designer-Plugin_Install_Success= -FR-Designer-Plugin_Install_Failed= -FR-Designer-Plugin_Install_Dependence= -FR-Designer-Plugin_Has_Install_Lower= -FR-Designer-Plugin_No_Plugin_Update= -FR-Designer-Plugin-Install_Package= -FR-Designer-Plugin-Update_Dependence_Success= -FR-Designer-Plugin-Update_Dependence_Failed= -FR-Designer-Plugin-Install_Dependence_Success= -FR-Designer-Plugin-Install_Dependence_Failed= -FR-Designer-Plugin_Delete_Confirmed= -FR-Designer-Plugin_Delete_Dependence= -FR-Designer-Plugin_Delete_Success= -FR-Designer-Plugin_Delete_Failed= -FR-Designer-Plugin_Update_Dependence= -FR-Designer-Plugin_Update_Success= -FR-Designer-Plugin_Update_Failed= -FR-Designer-Plugin_Actived= -FR-Designer-Plugin_Disabled= -FR-Designer-Plugin-Store_App= -FR-Designer-Plugin-Store_Businesses= -FR-Designer-Plugin-Store_Official= -FR-Designer-Plugin-Store_Not_Official= -FR-Designer-Plugin-Store_Cost= -FR-Designer-Plugin-Store_Pay= -FR-Designer-Plugin-Store_Free= -FR-Designer-Plugin-Store_Category= -FR-Designer-Plugin-Store_Designer= -FR-Designer-Plugin-Store_Front_End_Display= -FR-Designer-Plugin-Store_Report_Write= -FR-Designer-Plugin-Store_Chart= -FR-Designer-Plugin-Store_BI= -FR-Designer-Plugin-Store_Export_Print= -FR-Designer-Plugin-Store_Mobile_Terminal= -FR-Designer-Plugin-Store_Integrate_Deployment= -FR-Designer-Plugin-Store_Data_Interface= -FR-Designer-Plugin-Store_Form_Components= -FR-Designer-Plugin-Store_Function= -FR-Designer-Plugin-Store_Recommend= -FR-Designer-Plugin-Store_Commodity_Description= -FR-Designer-Plugin-Store_Install= -FR-Designer-Plugin-Store_Install_From_Local= -FR-Designer-Plugin-Store_My_Plugins= -FR-Designer-Plugin-Store_No_Plugins= -FR-Designer-Plugin-Store_Disabled= -FR-Designer-Plugin-Store_Enable= -FR-Designer-Plugin-Store_Delete= -FR-Designer-Plugin-Store_Update= -FR-Designer-Plugin-Store_Update-ALL= -FR-Designer-Plugin-Store_Update_From_Local= -FR-Designer-Plugin-Store_BBS_Account_Login= -FR-Designer-Plugin-Store_Register= -FR-Designer-Plugin-Store_Forgot_Password= -FR-Designer-Plugin-Store_Quick_Login= -FR-Designer-Plugin-Store_Account= -FR-Designer-Plugin-Store_Password= -FR-Designer-Plugin-Store_Not_Login= -FR-Designer-Plugin-Store_Installed= -FR-Designer-Plugin-Store_Plugins_Count= -FR-Designer-Plugin-Store_Key_Word= -FR-Designer-Plugin-Store_Login= -FR-Designer-Plugin-Store_Login_By_QQ= -FR-Designer-Plugin-Store_User_Not_Exist= -FR-Designer-Plugin-Store_User_Password_Error= -FR-Designer-Plugin-Store_Unexpected_Error= -FR-Designer-Plugin-Store_Net_Connect_Failed= -FR-Designer-Plugin-Store_Not_Null= -FR-Designer-Plugin-Store_Switch_Account= -FR-Designer-Plugin-Store_Private_Message= -FR-Designer-Plugin-Store_Jar_Damaged= -FR-Designer-Plugin-Store_Probation= -FR-Designer-Plugin-Store_Authorize= -FR-Designer-Plugin-Store_Permanent= -FR-Designer-Plugin-Store_Expired= -FR-Designer-Plugin-Store_Day= -FR-Designer-Plugin-Store_Finereport= -FR-Designer-Plugin-Store_Version= -FR-Designer-Plugin-Store_Developer= -FR-Designer-Plugin-Store_Jar= -FR-Designer-Plugin-Store_Disconnected= FR-Designer_AlphaFine_NoResult=no results FR-Designer_ConnectionFailed=connection failed FR-Designer_NoResult=No results diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index a6c6508a2..1d11d02d1 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -2000,86 +2000,6 @@ FR-Designer_AlphaFine_ShowLess=Show less FR-Designer_Alphafine=AlphaFine <<<<<<< HEAD FR-Designer-Alphafine_No_Remind=don't remind -Designer-Plugin_Install_Success= -FR-Designer-Plugin_Install_Failed= -FR-Designer-Plugin_Install_Dependence= -FR-Designer-Plugin_Has_Install_Lower= -FR-Designer-Plugin_No_Plugin_Update= -FR-Designer-Plugin-Install_Package= -FR-Designer-Plugin-Update_Dependence_Success= -FR-Designer-Plugin-Update_Dependence_Failed= -FR-Designer-Plugin-Install_Dependence_Success= -FR-Designer-Plugin-Install_Dependence_Failed= -FR-Designer-Plugin_Delete_Confirmed= -FR-Designer-Plugin_Delete_Dependence= -FR-Designer-Plugin_Delete_Success= -FR-Designer-Plugin_Delete_Failed= -FR-Designer-Plugin_Update_Dependence= -FR-Designer-Plugin_Update_Success= -FR-Designer-Plugin_Update_Failed= -FR-Designer-Plugin_Actived= -FR-Designer-Plugin_Disabled= -FR-Designer-Plugin-Store_App= -FR-Designer-Plugin-Store_Businesses= -FR-Designer-Plugin-Store_Official= -FR-Designer-Plugin-Store_Not_Official= -FR-Designer-Plugin-Store_Cost= -FR-Designer-Plugin-Store_Pay= -FR-Designer-Plugin-Store_Free= -FR-Designer-Plugin-Store_Category= -FR-Designer-Plugin-Store_Designer= -FR-Designer-Plugin-Store_Front_End_Display= -FR-Designer-Plugin-Store_Report_Write= -FR-Designer-Plugin-Store_Chart= -FR-Designer-Plugin-Store_BI= -FR-Designer-Plugin-Store_Export_Print= -FR-Designer-Plugin-Store_Mobile_Terminal= -FR-Designer-Plugin-Store_Integrate_Deployment= -FR-Designer-Plugin-Store_Data_Interface= -FR-Designer-Plugin-Store_Form_Components= -FR-Designer-Plugin-Store_Function= -FR-Designer-Plugin-Store_Recommend= -FR-Designer-Plugin-Store_Commodity_Description= -FR-Designer-Plugin-Store_Install= -FR-Designer-Plugin-Store_Install_From_Local= -FR-Designer-Plugin-Store_My_Plugins= -FR-Designer-Plugin-Store_No_Plugins= -FR-Designer-Plugin-Store_Disabled= -FR-Designer-Plugin-Store_Enable= -FR-Designer-Plugin-Store_Delete= -FR-Designer-Plugin-Store_Update= -FR-Designer-Plugin-Store_Update-ALL= -FR-Designer-Plugin-Store_Update_From_Local= -FR-Designer-Plugin-Store_BBS_Account_Login= -FR-Designer-Plugin-Store_Register= -FR-Designer-Plugin-Store_Forgot_Password= -FR-Designer-Plugin-Store_Quick_Login= -FR-Designer-Plugin-Store_Account= -FR-Designer-Plugin-Store_Password= -FR-Designer-Plugin-Store_Not_Login= -FR-Designer-Plugin-Store_Installed= -FR-Designer-Plugin-Store_Plugins_Count= -FR-Designer-Plugin-Store_Key_Word= -FR-Designer-Plugin-Store_Login= -FR-Designer-Plugin-Store_Login_By_QQ= -FR-Designer-Plugin-Store_User_Not_Exist= -FR-Designer-Plugin-Store_User_Password_Error= -FR-Designer-Plugin-Store_Unexpected_Error= -FR-Designer-Plugin-Store_Net_Connect_Failed= -FR-Designer-Plugin-Store_Not_Null= -FR-Designer-Plugin-Store_Switch_Account= -FR-Designer-Plugin-Store_Private_Message= -FR-Designer-Plugin-Store_Jar_Damaged= -FR-Designer-Plugin-Store_Probation= -FR-Designer-Plugin-Store_Authorize= -FR-Designer-Plugin-Store_Permanent= -FR-Designer-Plugin-Store_Expired= -FR-Designer-Plugin-Store_Day= -FR-Designer-Plugin-Store_Finereport= -FR-Designer-Plugin-Store_Version= -FR-Designer-Plugin-Store_Developer= -FR-Designer-Plugin-Store_Jar= -FR-Designer-Plugin-Store_Disconnected= FR-Designer_AlphaFine_NoResult=No results FR-Designer_ConnectionFailed=Connection failed FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index ad2005631..5b7316040 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1981,84 +1981,4 @@ FR-Designer_Edit_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5 FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3 Every=\u6BCF CellWrite-Preview_Cell_Content=\u30BB\u30EB\u306E\u5185\u5BB9\u3092\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B -FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9 -Designer-Plugin_Install_Success= -FR-Designer-Plugin_Install_Failed= -FR-Designer-Plugin_Install_Dependence= -FR-Designer-Plugin_Has_Install_Lower= -FR-Designer-Plugin_No_Plugin_Update= -FR-Designer-Plugin-Install_Package= -FR-Designer-Plugin-Update_Dependence_Success= -FR-Designer-Plugin-Update_Dependence_Failed= -FR-Designer-Plugin-Install_Dependence_Success= -FR-Designer-Plugin-Install_Dependence_Failed= -FR-Designer-Plugin_Delete_Confirmed= -FR-Designer-Plugin_Delete_Dependence= -FR-Designer-Plugin_Delete_Success= -FR-Designer-Plugin_Delete_Failed= -FR-Designer-Plugin_Update_Dependence= -FR-Designer-Plugin_Update_Success= -FR-Designer-Plugin_Update_Failed= -FR-Designer-Plugin_Actived= -FR-Designer-Plugin_Disabled= -FR-Designer-Plugin-Store_App= -FR-Designer-Plugin-Store_Businesses= -FR-Designer-Plugin-Store_Official= -FR-Designer-Plugin-Store_Not_Official= -FR-Designer-Plugin-Store_Cost= -FR-Designer-Plugin-Store_Pay= -FR-Designer-Plugin-Store_Free= -FR-Designer-Plugin-Store_Category= -FR-Designer-Plugin-Store_Designer= -FR-Designer-Plugin-Store_Front_End_Display= -FR-Designer-Plugin-Store_Report_Write= -FR-Designer-Plugin-Store_Chart= -FR-Designer-Plugin-Store_BI= -FR-Designer-Plugin-Store_Export_Print= -FR-Designer-Plugin-Store_Mobile_Terminal= -FR-Designer-Plugin-Store_Integrate_Deployment= -FR-Designer-Plugin-Store_Data_Interface= -FR-Designer-Plugin-Store_Form_Components= -FR-Designer-Plugin-Store_Function= -FR-Designer-Plugin-Store_Recommend= -FR-Designer-Plugin-Store_Commodity_Description= -FR-Designer-Plugin-Store_Install= -FR-Designer-Plugin-Store_Install_From_Local= -FR-Designer-Plugin-Store_My_Plugins= -FR-Designer-Plugin-Store_No_Plugins= -FR-Designer-Plugin-Store_Disabled= -FR-Designer-Plugin-Store_Enable= -FR-Designer-Plugin-Store_Delete= -FR-Designer-Plugin-Store_Update= -FR-Designer-Plugin-Store_Update-ALL= -FR-Designer-Plugin-Store_Update_From_Local= -FR-Designer-Plugin-Store_BBS_Account_Login= -FR-Designer-Plugin-Store_Register= -FR-Designer-Plugin-Store_Forgot_Password= -FR-Designer-Plugin-Store_Quick_Login= -FR-Designer-Plugin-Store_Account= -FR-Designer-Plugin-Store_Password= -FR-Designer-Plugin-Store_Not_Login= -FR-Designer-Plugin-Store_Installed= -FR-Designer-Plugin-Store_Plugins_Count= -FR-Designer-Plugin-Store_Key_Word= -FR-Designer-Plugin-Store_Login= -FR-Designer-Plugin-Store_Login_By_QQ= -FR-Designer-Plugin-Store_User_Not_Exist= -FR-Designer-Plugin-Store_User_Password_Error= -FR-Designer-Plugin-Store_Unexpected_Error= -FR-Designer-Plugin-Store_Net_Connect_Failed= -FR-Designer-Plugin-Store_Not_Null= -FR-Designer-Plugin-Store_Switch_Account= -FR-Designer-Plugin-Store_Private_Message= -FR-Designer-Plugin-Store_Jar_Damaged= -FR-Designer-Plugin-Store_Probation= -FR-Designer-Plugin-Store_Authorize= -FR-Designer-Plugin-Store_Permanent= -FR-Designer-Plugin-Store_Expired= -FR-Designer-Plugin-Store_Day= -FR-Designer-Plugin-Store_Finereport= -FR-Designer-Plugin-Store_Version= -FR-Designer-Plugin-Store_Developer= -FR-Designer-Plugin-Store_Jar= -FR-Designer-Plugin-Store_Disconnected= \ No newline at end of file +FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9 \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 112c1eeeb..43c9eb1bc 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -1982,84 +1982,4 @@ FR-Designer_Edit_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D Every=\uAC01 CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30 -FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9 -Designer-Plugin_Install_Success= -FR-Designer-Plugin_Install_Failed= -FR-Designer-Plugin_Install_Dependence= -FR-Designer-Plugin_Has_Install_Lower= -FR-Designer-Plugin_No_Plugin_Update= -FR-Designer-Plugin-Install_Package= -FR-Designer-Plugin-Update_Dependence_Success= -FR-Designer-Plugin-Update_Dependence_Failed= -FR-Designer-Plugin-Install_Dependence_Success= -FR-Designer-Plugin-Install_Dependence_Failed= -FR-Designer-Plugin_Delete_Confirmed= -FR-Designer-Plugin_Delete_Dependence= -FR-Designer-Plugin_Delete_Success= -FR-Designer-Plugin_Delete_Failed= -FR-Designer-Plugin_Update_Dependence= -FR-Designer-Plugin_Update_Success= -FR-Designer-Plugin_Update_Failed= -FR-Designer-Plugin_Actived= -FR-Designer-Plugin_Disabled= -FR-Designer-Plugin-Store_App= -FR-Designer-Plugin-Store_Businesses= -FR-Designer-Plugin-Store_Official= -FR-Designer-Plugin-Store_Not_Official= -FR-Designer-Plugin-Store_Cost= -FR-Designer-Plugin-Store_Pay= -FR-Designer-Plugin-Store_Free= -FR-Designer-Plugin-Store_Category= -FR-Designer-Plugin-Store_Designer= -FR-Designer-Plugin-Store_Front_End_Display= -FR-Designer-Plugin-Store_Report_Write= -FR-Designer-Plugin-Store_Chart= -FR-Designer-Plugin-Store_BI= -FR-Designer-Plugin-Store_Export_Print= -FR-Designer-Plugin-Store_Mobile_Terminal= -FR-Designer-Plugin-Store_Integrate_Deployment= -FR-Designer-Plugin-Store_Data_Interface= -FR-Designer-Plugin-Store_Form_Components= -FR-Designer-Plugin-Store_Function= -FR-Designer-Plugin-Store_Recommend= -FR-Designer-Plugin-Store_Commodity_Description= -FR-Designer-Plugin-Store_Install= -FR-Designer-Plugin-Store_Install_From_Local= -FR-Designer-Plugin-Store_My_Plugins= -FR-Designer-Plugin-Store_No_Plugins= -FR-Designer-Plugin-Store_Disabled= -FR-Designer-Plugin-Store_Enable= -FR-Designer-Plugin-Store_Delete= -FR-Designer-Plugin-Store_Update= -FR-Designer-Plugin-Store_Update-ALL= -FR-Designer-Plugin-Store_Update_From_Local= -FR-Designer-Plugin-Store_BBS_Account_Login= -FR-Designer-Plugin-Store_Register= -FR-Designer-Plugin-Store_Forgot_Password= -FR-Designer-Plugin-Store_Quick_Login= -FR-Designer-Plugin-Store_Account= -FR-Designer-Plugin-Store_Password= -FR-Designer-Plugin-Store_Not_Login= -FR-Designer-Plugin-Store_Installed= -FR-Designer-Plugin-Store_Plugins_Count= -FR-Designer-Plugin-Store_Key_Word= -FR-Designer-Plugin-Store_Login= -FR-Designer-Plugin-Store_Login_By_QQ= -FR-Designer-Plugin-Store_User_Not_Exist= -FR-Designer-Plugin-Store_User_Password_Error= -FR-Designer-Plugin-Store_Unexpected_Error= -FR-Designer-Plugin-Store_Net_Connect_Failed= -FR-Designer-Plugin-Store_Not_Null= -FR-Designer-Plugin-Store_Switch_Account= -FR-Designer-Plugin-Store_Private_Message= -FR-Designer-Plugin-Store_Jar_Damaged= -FR-Designer-Plugin-Store_Probation= -FR-Designer-Plugin-Store_Authorize= -FR-Designer-Plugin-Store_Permanent= -FR-Designer-Plugin-Store_Expired= -FR-Designer-Plugin-Store_Day= -FR-Designer-Plugin-Store_Finereport= -FR-Designer-Plugin-Store_Version= -FR-Designer-Plugin-Store_Developer= -FR-Designer-Plugin-Store_Jar= -FR-Designer-Plugin-Store_Disconnected= \ No newline at end of file +FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9 \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 2b37385e8..9e5a80bfa 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1999,86 +1999,6 @@ FR-Designer_AlphaFine_Latest=\u672C\u5730\u5E38\u7528 FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A -FR-Designer-Plugin_Install_Success=\u63D2\u4EF6\u5B89\u88C5\u6210\u529F -FR-Designer-Plugin_Install_Failed=\u63D2\u4EF6\u5B89\u88C5\u5931\u8D25 -FR-Designer-Plugin_Install_Dependence=\u662F\u5426\u5B89\u88C5\u4F9D\u8D56\u63D2\u4EF6 -FR-Designer-Plugin_Has_Install_Lower=\u5DF2\u7ECF\u5B89\u88C5\u4F4E\u7248\u672C\u63D2\u4EF6\uFF0C\u662F\u5426\u8FDB\u884C\u66F4\u65B0\uFF1F -FR-Designer-Plugin_No_Plugin_Update=\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u7684\u63D2\u4EF6\uFF0C\u662F\u5426\u5B89\u88C5\uFF1F -FR-Designer-Plugin-Install_Package=\u63D2\u4EF6\u5B89\u88C5\u5305 -FR-Designer-Plugin-Update_Dependence_Success=\u4F9D\u8D56\u63D2\u4EF6\u66F4\u65B0\u6210\u529F -FR-Designer-Plugin-Update_Dependence_Failed=\u4F9D\u8D56\u63D2\u4EF6\u66F4\u65B0\u5931\u8D25 -FR-Designer-Plugin-Install_Dependence_Success=\u4F9D\u8D56\u63D2\u4EF6\u5B89\u88C5\u6210\u529F -FR-Designer-Plugin-Install_Dependence_Failed=\u4F9D\u8D56\u63D2\u4EF6\u5B89\u88C5\u5931\u8D25 -FR-Designer-Plugin_Delete_Confirmed=\u786E\u5B9A\u5220\u9664\u6B64\u63D2\u4EF6\uFF1F -FR-Designer-Plugin_Delete_Dependence=\u662F\u5426\u5220\u9664\u4F9D\u8D56\u73AF\u5883 -FR-Designer-Plugin_Delete_Success=\u63D2\u4EF6\u5220\u9664\u6210\u529F -FR-Designer-Plugin_Delete_Failed=\u63D2\u4EF6\u5220\u9664\u5931\u8D25 -FR-Designer-Plugin_Update_Dependence=\u662F\u5426\u66F4\u65B0\u4F9D\u8D56\u63D2\u4EF6 -FR-Designer-Plugin_Update_Success=\u63D2\u4EF6\u66F4\u65B0\u6210\u529F -FR-Designer-Plugin_Update_Failed=\u63D2\u4EF6\u66F4\u65B0\u5931\u8D25 -FR-Designer-Plugin_Actived=\u63D2\u4EF6\u5DF2\u88AB\u542F\u7528 -FR-Designer-Plugin_Disabled=\u63D2\u4EF6\u5DF2\u88AB\u7981\u7528 -FR-Designer-Plugin-Store_App=\u5E94\u7528\u5546\u57CE -FR-Designer-Plugin-Store_Businesses=\u5546\u5BB6 -FR-Designer-Plugin-Store_Official=\u5B98\u65B9(\u5E06\u8F6F) -FR-Designer-Plugin-Store_Not_Official=\u975E\u5B98\u65B9 -FR-Designer-Plugin-Store_Cost=\u8D39\u7528 -FR-Designer-Plugin-Store_Pay=\u4ED8\u8D39 -FR-Designer-Plugin-Store_Free=\u514D\u8D39 -FR-Designer-Plugin-Store_Category=\u7C7B\u522B -FR-Designer-Plugin-Store_Designer=\u8BBE\u8BA1\u5668 -FR-Designer-Plugin-Store_Front_End_Display=\u524D\u7AEF\u5C55\u73B0 -FR-Designer-Plugin-Store_Report_Write=\u586B\u62A5 -FR-Designer-Plugin-Store_Chart=\u56FE\u8868 -FR-Designer-Plugin-Store_BI=\u51B3\u7B56\u5E73\u53F0 -FR-Designer-Plugin-Store_Export_Print=\u5BFC\u51FA\u6253\u5370 -FR-Designer-Plugin-Store_Mobile_Terminal=\u79FB\u52A8\u7AEF -FR-Designer-Plugin-Store_Integrate_Deployment=\u90E8\u7F72\u96C6\u6210 -FR-Designer-Plugin-Store_Data_Interface=\u6570\u636E\u63A5\u53E3 -FR-Designer-Plugin-Store_Form_Components=\u8868\u5355\u7EC4\u4EF6 -FR-Designer-Plugin-Store_Function=\u51FD\u6570 -FR-Designer-Plugin-Store_Recommend=\u63A8\u8350 -FR-Designer-Plugin-Store_Commodity_Description=\u5546\u54C1|\u7248\u672C\u53F7|\u8BF4\u660E -FR-Designer-Plugin-Store_Install=\u5B89\u88C5 -FR-Designer-Plugin-Store_Install_From_Local=\u4ECE\u672C\u5730\u5B89\u88C5 -FR-Designer-Plugin-Store_My_Plugins=\u6211\u7684\u63D2\u4EF6 -FR-Designer-Plugin-Store_No_Plugins=\u5DF2\u5B89\u88C5\u4E860\u4E2A\u63D2\u4EF6 -FR-Designer-Plugin-Store_Disabled=\u7981\u7528 -FR-Designer-Plugin-Store_Enable=\u542F\u7528 -FR-Designer-Plugin-Store_Delete=\u5220\u9664 -FR-Designer-Plugin-Store_Update=\u66F4\u65B0 -FR-Designer-Plugin-Store_Update-ALL=\u5168\u90E8\u66F4\u65B0 -FR-Designer-Plugin-Store_Update_From_Local=\u4ECE\u672C\u5730\u66F4\u65B0 -FR-Designer-Plugin-Store_BBS_Account_Login=\u8BBA\u575B\u8D26\u53F7\u767B\u5F55 -FR-Designer-Plugin-Store_Register=\u6CE8\u518C -FR-Designer-Plugin-Store_Forgot_Password=\u5FD8\u8BB0\u5BC6\u7801 -FR-Designer-Plugin-Store_Quick_Login=\u5FEB\u6377\u767B\u5F55: -FR-Designer-Plugin-Store_Account=\u8D26\u53F7 -FR-Designer-Plugin-Store_Password=\u5BC6\u7801 -FR-Designer-Plugin-Store_Not_Login=\u672A\u767B\u5F55 -FR-Designer-Plugin-Store_Installed=\u5DF2\u5B89\u88C5 -FR-Designer-Plugin-Store_Plugins_Count=\u4E2A\u63D2\u4EF6 -FR-Designer-Plugin-Store_Key_Word=\u5173\u952E\u5B57 -FR-Designer-Plugin-Store_Login=\u767B\u5F55 -FR-Designer-Plugin-Store_Login_By_QQ=\u7528QQ\u53F7\u767B\u5F55 -FR-Designer-Plugin-Store_User_Not_Exist=\u7528\u6237\u540D\u4E0D\u5B58\u5728 -FR-Designer-Plugin-Store_User_Password_Error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF -FR-Designer-Plugin-Store_Unexpected_Error=\u672A\u77E5\u9519\u8BEF -FR-Designer-Plugin-Store_Net_Connect_Failed=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25 -FR-Designer-Plugin-Store_Not_Null=\u7528\u6237\u540D\u6216\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A -FR-Designer-Plugin-Store_Switch_Account=\u5207\u6362\u8D26\u6237 -FR-Designer-Plugin-Store_Private_Message=\u79C1\u4EBA\u6D88\u606F -FR-Designer-Plugin-Store_Jar_Damaged=Jar\u5305\u635F\u574F -FR-Designer-Plugin-Store_Probation=\u8BD5\u7528: -FR-Designer-Plugin-Store_Authorize=\u6388\u6743: -FR-Designer-Plugin-Store_Permanent=\u6C38\u4E45 -FR-Designer-Plugin-Store_Expired=\u8FC7\u671F -FR-Designer-Plugin-Store_Day=\u5929 -FR-Designer-Plugin-Store_Finereport=\u5E06\u8F6F -FR-Designer-Plugin-Store_Version=\u7248\u672C -FR-Designer-Plugin-Store_Developer=\u5F00\u53D1\u8005 -FR-Designer-Plugin-Store_Jar=jar\u5305 -FR-Designer-Plugin-Store_Disconnected=\u65E0\u6CD5\u8FDE\u63A5\u5E94\u7528\u4E2D\u5FC3 FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25 FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index be2e56a8d..313e86740 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -2000,86 +2000,6 @@ FR-Designer_AlphaFine_ShowLess=\u6536\u8D77 FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A -Designer-Plugin_Install_Success= -FR-Designer-Plugin_Install_Failed= -FR-Designer-Plugin_Install_Dependence= -FR-Designer-Plugin_Has_Install_Lower= -FR-Designer-Plugin_No_Plugin_Update= -FR-Designer-Plugin-Install_Package= -FR-Designer-Plugin-Update_Dependence_Success= -FR-Designer-Plugin-Update_Dependence_Failed= -FR-Designer-Plugin-Install_Dependence_Success= -FR-Designer-Plugin-Install_Dependence_Failed= -FR-Designer-Plugin_Delete_Confirmed= -FR-Designer-Plugin_Delete_Dependence= -FR-Designer-Plugin_Delete_Success= -FR-Designer-Plugin_Delete_Failed= -FR-Designer-Plugin_Update_Dependence= -FR-Designer-Plugin_Update_Success= -FR-Designer-Plugin_Update_Failed= -FR-Designer-Plugin_Actived= -FR-Designer-Plugin_Disabled= -FR-Designer-Plugin-Store_App= -FR-Designer-Plugin-Store_Businesses= -FR-Designer-Plugin-Store_Official= -FR-Designer-Plugin-Store_Not_Official= -FR-Designer-Plugin-Store_Cost= -FR-Designer-Plugin-Store_Pay= -FR-Designer-Plugin-Store_Free= -FR-Designer-Plugin-Store_Category= -FR-Designer-Plugin-Store_Designer= -FR-Designer-Plugin-Store_Front_End_Display= -FR-Designer-Plugin-Store_Report_Write= -FR-Designer-Plugin-Store_Chart= -FR-Designer-Plugin-Store_BI= -FR-Designer-Plugin-Store_Export_Print= -FR-Designer-Plugin-Store_Mobile_Terminal= -FR-Designer-Plugin-Store_Integrate_Deployment= -FR-Designer-Plugin-Store_Data_Interface= -FR-Designer-Plugin-Store_Form_Components= -FR-Designer-Plugin-Store_Function= -FR-Designer-Plugin-Store_Recommend= -FR-Designer-Plugin-Store_Commodity_Description= -FR-Designer-Plugin-Store_Install= -FR-Designer-Plugin-Store_Install_From_Local= -FR-Designer-Plugin-Store_My_Plugins= -FR-Designer-Plugin-Store_No_Plugins= -FR-Designer-Plugin-Store_Disabled= -FR-Designer-Plugin-Store_Enable= -FR-Designer-Plugin-Store_Delete= -FR-Designer-Plugin-Store_Update= -FR-Designer-Plugin-Store_Update-ALL= -FR-Designer-Plugin-Store_Update_From_Local= -FR-Designer-Plugin-Store_BBS_Account_Login= -FR-Designer-Plugin-Store_Register= -FR-Designer-Plugin-Store_Forgot_Password= -FR-Designer-Plugin-Store_Quick_Login= -FR-Designer-Plugin-Store_Account= -FR-Designer-Plugin-Store_Password= -FR-Designer-Plugin-Store_Not_Login= -FR-Designer-Plugin-Store_Installed= -FR-Designer-Plugin-Store_Plugins_Count= -FR-Designer-Plugin-Store_Key_Word= -FR-Designer-Plugin-Store_Login= -FR-Designer-Plugin-Store_Login_By_QQ= -FR-Designer-Plugin-Store_User_Not_Exist= -FR-Designer-Plugin-Store_User_Password_Error= -FR-Designer-Plugin-Store_Unexpected_Error= -FR-Designer-Plugin-Store_Net_Connect_Failed= -FR-Designer-Plugin-Store_Not_Null= -FR-Designer-Plugin-Store_Switch_Account= -FR-Designer-Plugin-Store_Private_Message= -FR-Designer-Plugin-Store_Jar_Damaged= -FR-Designer-Plugin-Store_Probation= -FR-Designer-Plugin-Store_Authorize= -FR-Designer-Plugin-Store_Permanent= -FR-Designer-Plugin-Store_Expired= -FR-Designer-Plugin-Store_Day= -FR-Designer-Plugin-Store_Finereport= -FR-Designer-Plugin-Store_Version= -FR-Designer-Plugin-Store_Developer= -FR-Designer-Plugin-Store_Jar= -FR-Designer-Plugin-Store_Disconnected= FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9 FR-Designer_ConnectionFailed=\u93C8\u63A5\u5931\u6557 FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A