modify on 0809 designer-chart

designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java

@@ -61,7 +61,7 @@ public class BBSAction extends UpdateAction
 
 	        @Override
 	        public String getMenuName() {
-	            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BBS");
+	            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bbs");
 	        }
 
 	        @Override

designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@@ -52,7 +52,7 @@ public void actionPerformed(ActionEvent arg0)
   
        @Override
        public String getMenuName() {
-           return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BUG");
+           return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bug");
        }
 
        @Override

designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@@ -57,7 +57,7 @@ public class NeedAction extends UpdateAction
 
 	        @Override
 	        public String getMenuName() {
-	            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_NEED");
+	            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Need");
 	        }
 
 	        @Override

designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

@@ -56,7 +56,7 @@ public void actionPerformed(ActionEvent arg0)
 
        @Override
        public String getMenuName() {
-           return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_QUESTIONS");
+           return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Questions");
        }
 
        @Override

designer-base/src/main/java/com/fr/design/actions/community/SignAction.java

@@ -57,7 +57,7 @@ public class SignAction extends UpdateAction
 
 	        @Override
 	        public String getMenuName() {
-	            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_SIGN");
+	            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_sign");
 	        }
 
 	        @Override

designer-base/src/main/java/com/fr/design/actions/community/UpAction.java

@@ -57,7 +57,7 @@ public class UpAction extends UpdateAction
 
 	        @Override
 	        public String getMenuName() {
-	            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_UPDATE");
+	            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Update");
 	        }
 
 	        @Override

designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java

@@ -63,7 +63,7 @@ public class VideoAction extends UpdateAction
 
 	        @Override
 	        public String getMenuName() {
-	            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_VIDEO");
+	            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Video");
 	        }
 
 	        @Override

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -128,7 +128,7 @@ public class PreferencePane extends BasicPane {
 
         UITabbedPane jtabPane = new UITabbedPane();
         JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_General"), generalPane);
+        jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_General"), generalPane);
         JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), advancePane);
         contentPane.add(jtabPane, BorderLayout.NORTH);
@@ -153,12 +153,12 @@ public class PreferencePane extends BasicPane {
 
         createJdkHomePane(advancePane);
 
-        JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables"));
+        JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Oracle_All_Tables"));
         oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
         oraclePane.add(oracleSpace);
 
-        JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Product_improve"));
-        joinProductImprove = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Join_Product_improve"));
+        JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Product_Improve"));
+        joinProductImprove = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Join_Product_Improve"));
         improvePane.add(joinProductImprove);
 
         JPanel spaceUpPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -169,7 +169,7 @@ public class PreferencePane extends BasicPane {
     }
 
     private void createFunctionPane(JPanel generalPane) {
-        JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference-Function"));
+        JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Function"));
         generalPane.add(functionPane);
 
         //添加supportUndo选择项
@@ -177,7 +177,7 @@ public class PreferencePane extends BasicPane {
         functionPane.add(supportUndoCheckBox);
         //添加maxUndoLimit
         //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"};
-        String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_max_undo_limit"), MAX_UNDO_LIMIT_5 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_10 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)")
+        String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_10 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)")
                 , MAX_UNDO_LIMIT_15 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_20 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_50 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)")};
         maxUndoLimit = new UIComboBox(undoTimes);
         functionPane.add(maxUndoLimit);
@@ -319,9 +319,9 @@ public class PreferencePane extends BasicPane {
         //richer:选择导出log文件的目录.
         JPanel logPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
         advancePane.add(logPane);
-        JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_Setting"));
+        JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export_Setting"));
         logPane.add(logExportPane);
-        UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Export_Log_Directory") + ":");
+        UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":");
         logExportPane.add(logLabel, BorderLayout.WEST);
         logExportDirectoryField = new UITextField(24);
         logExportPane.add(logExportDirectoryField, BorderLayout.CENTER);
@@ -340,7 +340,7 @@ public class PreferencePane extends BasicPane {
             }
         });
 
-        JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Level_Setting"));
+        JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Level_Setting"));
         logPane.add(logLevelPane);
         logLevelComboBox = new UIComboBox(LOG);
         logLevelPane.add(logLevelComboBox);
@@ -355,13 +355,13 @@ public class PreferencePane extends BasicPane {
     private void createLanPane(JPanel generalPane) {
         // ben:选择版本语言;
         JPanel languageAndDashBoard_pane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
-        JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Choose_Language"));
+        JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_Language"));
         generalPane.add(languageAndDashBoard_pane);
         languageAndDashBoard_pane.add(LanguagePane);
 
         languageComboBox = createLanguageComboBox();
 
-        ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Designer_Language"));
+        ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Language"));
         languageLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -420,16 +420,16 @@ public class PreferencePane extends BasicPane {
         double rowSize[] = {p};
 
         // 长度单位选择
-        JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Setting-Ruler-Units"));
+        JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
         advancePane.add(lengthPane);
-        pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-mm"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH")});
+        pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH")});
         pageLengthComboBox.setPreferredSize(new Dimension(80, 20));
         pageLengthComboBox.setMinimumSize(new Dimension(80, 20));
-        reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-mm"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT")});
+        reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT")});
         reportLengthComboBox.setPreferredSize(new Dimension(80, 20));
         reportLengthComboBox.setMinimumSize(new Dimension(80, 20));
-        UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Page-Setup-Scale-Units") + ":");
-        UILabel reportLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Report-Design-Ruler-Units") + ":");
+        UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":");
+        UILabel reportLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Design_Ruler_Units") + ":");
         Component[][] lengthComponents = {
                 {pagelengthLabel, pageLengthComboBox, reportLengthLabel, reportLengthComboBox},
         };
@@ -442,13 +442,13 @@ public class PreferencePane extends BasicPane {
         double rowSize[] = {p};
         double columnSize[] = {p, p, p};
 
-        JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Web_Preview_Port_Setting"));
+        JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port_Setting"));
         advancePane.add(serverPortPane);
         portEditor = new IntegerEditor();
         portEditor.setPreferredSize(new Dimension(80, 20));
         portEditor.setMinimumSize(new Dimension(80, 20));
         UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));
-        UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Web_Preview_Port") + ":");
+        UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port") + ":");
         Component[][] portComponents = {
                 {serverPortLabel, portEditor, notiJlabel},
         };
@@ -493,9 +493,9 @@ public class PreferencePane extends BasicPane {
     }
 
     private JPanel createMemoryPane() {
-        JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_CachingTemplate"));
-        UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_MaxCachingTemplate"));
-        UILabel memoryTipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_CachingTemplateTip"));
+        JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template"));
+        UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Max_Caching_Template"));
+        UILabel memoryTipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip"));
         memoryTipLabel.setBorder(BorderFactory.createEmptyBorder(0, CACHING_GAP, 0, 0));
         cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT);
         JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
@@ -645,7 +645,7 @@ public class PreferencePane extends BasicPane {
         }
         int rv = JOptionPane.showOptionDialog(
                 null,
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Language_Change_Successful"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"),
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -72,11 +72,11 @@ public class AboutPane extends JPanel {
         addPhoneAndQQPane(contentPane);
 
         // 官网
-        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL));
+        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL));
 
         // 支持邮箱
         String defaultEmail = CloudCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL);
-        JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + GeneralContext.getLocale(), defaultEmail));
+        JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + GeneralContext.getLocale(), defaultEmail));
 
         contentPane.add(urlActionPane);
         contentPane.add(emailPane);
@@ -96,7 +96,7 @@ public class AboutPane extends JPanel {
         if (GeneralContext.getLocale().equals(Locale.US)) {
             return;
         }
-        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE));
+        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE));
         contentPane.add(boxCenterAlignmentPane);
         // 繁体版不显示QQ
         if (GeneralContext.getLocale().equals(Locale.TAIWAN)) {

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -93,7 +93,7 @@ public class AlphaFineConfigPane extends BasicPane {
         isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon"));
         isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"));
         isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"));
-        isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates_Content"));
+        isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
         JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
         northPane.add(searchConfigPane);
         contentPane.add(northPane);

designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

@@ -54,16 +54,16 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
     private static final long serialVersionUID = 1L;
     // peter:这两个变量在弹出公式编辑器的时候,需要用.
-    private UIRadioButton commonRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Common"));
-    private UIRadioButton formulaRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula"));
+    private UIRadioButton commonRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common"));
+    private UIRadioButton formulaRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula"));
     private JPanel conditionCardPane;
     protected BasicBeanPane<T> defaultConditionPane;
     // card2
     private UITextArea formulaTextArea;
     private UIButton modifyButton;
     private UIButton addButton;
-    private UIRadioButton andRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_ConditionB-AND") + "  ");
-    private UIRadioButton orRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_ConditionB-OR"));
+    private UIRadioButton andRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_ConditionB_AND") + "  ");
+    private UIRadioButton orRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_ConditionB_OR"));
     protected JTree conditionsTree;// Conditions
     private UIButton removeButton;
     private UIButton moveUpButton;
@@ -530,10 +530,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         formulaPane.setPreferredSize(new Dimension(450, 40));
         formulaConditionPane.add(formulaPane, BorderLayout.CENTER);
         formulaPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 2));
-        formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST);
+        formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST);
         formulaTextArea = new UITextArea();
         formulaPane.add(new JScrollPane(formulaTextArea), BorderLayout.CENTER);
-        UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Define"));
+        UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Define"));
         formulaPane.add(GUICoreUtils.createBorderPane(editFormulaButton, BorderLayout.NORTH), BorderLayout.EAST);
         editFormulaButton.addActionListener(actionListener1);
         applyCardsPane();
@@ -571,7 +571,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
         addControlPane.add(Box.createHorizontalStrut(STRUT_TWO));
 
-        modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png"));
+        modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png"));
         modifyButton.setMnemonic('M');
         addControlPane.add(modifyButton);
         modifyButton.addActionListener(actionListener8);
@@ -654,10 +654,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
     private void applyCardsPane() {
         CardLayout cl = (CardLayout) (conditionCardPane.getLayout());
         if (this.commonRadioButton.isSelected()) {
-            this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Common_Condition"), null));
+            this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common_Condition"), null));
             cl.show(conditionCardPane, "DEFAULT");
         } else {
-            this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula_Condition"), null));
+            this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula_Condition"), null));
             cl.show(conditionCardPane, "FORMULA");
         }
     }

designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java

@@ -79,7 +79,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 
 			conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane();
 
-			Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConditionB-Operator") + ":"), new UILabel() },
+			Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"), new UILabel() },
 					{ conditionOPComboBox, conditionValuePane } };
 
 			double p = TableLayout.PREFERRED;

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -79,7 +79,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
      */
     @Override
     public String getViewTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData");
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -208,8 +208,8 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     }
 
     protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) {
-        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database") + ":");
-        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model") + ":");
+        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":");
+        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model") + ":");
         UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Table") + ":");
 
         if (labelSize > 0) {
@@ -327,7 +327,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         DBUtils.refreshDatabase();
         String schema = StringUtils.isEmpty(schemaBox.getSelectedItem()) ? null : schemaBox.getSelectedItem();
         DataCoreUtils.refreshTables(getConnection(), TableProcedure.TABLE, schema);
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Database"),
+        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Database"),
                 JOptionPane.INFORMATION_MESSAGE);
     }
 
@@ -405,7 +405,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             String schema = StringUtils.isEmpty(this.schemaBox.getSelectedItem()) ? null : this.schemaBox.getSelectedItem();
             TableProcedure[] sqlTableArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
             if (sqlTableArray.length > 0) {
-                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table"));
+                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
                 rootTreeNode.add(tableTreeNode);
                 for (int i = 0; i < sqlTableArray.length; i++) {
                     ExpandMutableTreeNode tableChildTreeNode = new ExpandMutableTreeNode(sqlTableArray[i]);
@@ -414,7 +414,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             }
             TableProcedure[] sqlViewArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
             if (sqlViewArray.length > 0) {
-                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View"));
+                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
                 rootTreeNode.add(viewTreeNode);
                 for (int i = 0; i < sqlViewArray.length; i++) {
                     ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(sqlViewArray[i]);
@@ -456,7 +456,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         if (!connect) {
             DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
             JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.INFORMATION_MESSAGE);
             failedToFindTable();
             return null;
         }

designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java

@@ -68,8 +68,8 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         this.add(tableFlowPane, BorderLayout.NORTH);
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.add(centerPane, BorderLayout.CENTER);
-        parentMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build_Tree_Accord_Parent_Marked_Filed"), true);
-        lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build_Tree_Accord_Marked_Filed_Length"));
+        parentMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed"), true);
+        lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length"));
         parentMarkRadio.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 if (isBuildByParentFiled()) {
@@ -90,11 +90,11 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         markButtonGroup.add(parentMarkRadio);
         markButtonGroup.add(lengthMarkRadio);
 
-        originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
-        parentFieldLabel = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parent_Marked_Field") + " :", SwingConstants.RIGHT);
-        treeDataFieldLabel1 = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT);
-        originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
-        treeDataFieldLabel2 = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT);
+        originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
+        parentFieldLabel = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field") + " :", SwingConstants.RIGHT);
+        treeDataFieldLabel1 = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT);
+        originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
+        treeDataFieldLabel2 = new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT);
 
 //		originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});
 //		parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});

designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java

@@ -38,8 +38,8 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
         rs.add(tableNameComboBox, BorderLayout.CENTER);
         rs.add(GUICoreUtils.createFlowPane(new Component[]{new RefreshLabel(this), previewLabel}, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
         rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
-        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT);
-        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT);
+        UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEFT);
+        UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEFT);
         UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT);
 
         if (labelSize > 0) {

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java

@@ -112,15 +112,15 @@ public class ConnectionTableProcedurePane extends BasicPane {
 
 		// 根据环境是否为中文设置不同的显示
 		if (GeneralContext.isChineseEnv()) {
-			first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table"),
+			first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"),
 					BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING));
-			second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View"),
+			second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"),
 					BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING));
 		} else {
 			UILabel ui1 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING);
 			UILabel ui2 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING);
-			ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table"));
-			ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View"));
+			ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
+			ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
 			first.add(ui1);
 			second.add(ui2);
 		}

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java

@@ -187,7 +187,7 @@ public class PreviewTableModel extends AbstractTableModel {
         if (o == null) {
             s = "?";
         } else if (o instanceof String) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_String");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String");
             if (!WorkContext.getCurrent().isLocal() && dataModel instanceof EmbeddedTDDataModel) {
                 Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column);
                 if (clzz != null) {
@@ -199,7 +199,7 @@ public class PreviewTableModel extends AbstractTableModel {
                 }
             }
         } else if (o instanceof Integer) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Integer");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer");
         } else if (o instanceof Double || o instanceof Float) {
             s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Double");
         } else if (o instanceof java.sql.Date || o instanceof java.util.Date) {

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -78,7 +78,7 @@ public class PreviewTablePane extends BasicPane {
 
         JPanel currentPreviewPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         previewNumberPanel.add(currentPreviewPanel);
-        currentPreviewPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_Preview_Rows") + ":"));
+        currentPreviewPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Current_Preview_Rows") + ":"));
 
         currentRowsField = new UINumberField();
         currentPreviewPanel.add(currentRowsField);
@@ -155,7 +155,7 @@ public class PreviewTablePane extends BasicPane {
         if (this.dialog == null) {
             this.dialog = this.showWindow(DesignerContext.getDesignerFrame());
         }
-        progressBar = new AutoProgressBar(this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading_Data"), "", 0, 100) {
+        progressBar = new AutoProgressBar(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {
                 if (getWorker() != null) {
                     getWorker().cancel(true);

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@@ -111,7 +111,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
                         new RemoveParaAction()
                 };
             }
-        }, " " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData-Default-Para"));
+        }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Default_Para"));
 
         jpanel.add(editorPane, BorderLayout.CENTER);
 

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -195,7 +195,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 			toolBarDef.addShortCut(SeparatorDef.DEFAULT);
 			toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction());
 		}
-		isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData"));
+		isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Is_Share_DBTableData"));
 		isShareCheckBox.setBackground(Color.WHITE);
 		maxPanel = new MaxMemRowCountPanel();
 		maxPanel.setBorder(null);
@@ -271,7 +271,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		String dbName = this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName();
 		if (StringUtils.isBlank(dbName) || StringUtils.isBlank(this.sqlTextPane.getText())) {
 			try {
-				throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + ".");
+				throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
 			} catch (Exception e) {
 				// JOptionPane.showMessageDialog(DBTableDataPane.this,
 				// com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") + ".");

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -348,13 +348,13 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         double columnSize[] = {f, p, p};
         double rowSize[] = {B, B, B, B, B, B, B};
         needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true);
-        dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dismenber") + ":");
-        tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember"), false);
-        tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember"));
-        spaceDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Space"), true);
-        spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Space"));
-        commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CommaDismenber"), false);
-        commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CommaDismenber"));
+        dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dismenber") + ":");
+        tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember"), false);
+        tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember"));
+        spaceDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space"), true);
+        spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space"));
+        commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"), false);
+        commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"));
         otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other") + ":", false);
         otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"));
         otherDismenberTextField = new UITextField(8);
@@ -782,7 +782,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             xmlNodeTree = new XMLNodeTree();
             this.add(new JScrollPane(xmlNodeTree));
 
-            keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_KeyPoint") + ":");
+            keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key_Point") + ":");
             refreshAction = new RefreshParameterAction();
             ToolBarDef toolbarDef = new ToolBarDef();
             toolbarDef.addShortCut(refreshAction);
@@ -939,7 +939,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
 
         private void loadedTreeModel(){
-            ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_loadedTreeModel"));
+            ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loaded_Tree_Model"));
             rootTreeNode.setExpanded(false);
             rootTreeNode.setAllowsChildren(false);
             DefaultTreeModel loadedTreeModel = new DefaultTreeModel(rootTreeNode);

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@@ -88,7 +88,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
         storeProcedureContextPane.setPreferredSize(new Dimension(680, 600));
 
         JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure") + ":"));
+        namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + ":"));
         namePane.add(queryText);
         inAutoeditorPane = new UITableEditorPane<StoreProcedureParameter>(new StoreProcedureTableModel());
         autoEditorPane = new UITableEditorPane<StoreProcedureParameter>(new AutoStoreProcedureTableModel());
@@ -153,7 +153,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
         toolBarDef.addShortCut(new PreviewAction());
         toolBarDef.addShortCut(new RefreshAction());
         toolBarDef.addShortCut(SeparatorDef.DEFAULT);
-        isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData"));
+        isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Is_Share_DBTableData"));
         maxPanel = new MaxMemRowCountPanel();
         maxPanel.setBorder(null);
         UIToolbar toolbar = ToolBarDef.createJToolBar();
@@ -170,7 +170,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure");
     }
 
     @Override
@@ -237,9 +237,9 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
 
         if (StringUtils.isBlank(dbName)) {
             try {
-                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + ".");
+                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             } catch (Exception e) {
-                JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + ".");
+                JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             }
         }
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -79,7 +79,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                 getWorker().cancel(true);
             }
         });
-        loadingBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading_Data"), "", 0, 100) {
+        loadingBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {
                 getDialog().setVisible(false);
                 getWorker().cancel(true);

designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java

@@ -116,7 +116,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Values_Editor");
     }
 
     public Editor getCurrentEditor() {
@@ -302,7 +302,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
-                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_String_To_Formula")
+                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
                             + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 

designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@@ -101,7 +101,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Values_Editor");
     }
 
     public Editor getCurrentEditor() {
@@ -283,7 +283,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
             DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager();
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
-                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_String_To_Formula")
+                    int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
                             + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 

designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java

@@ -18,7 +18,7 @@ public class IntegerEditor extends NumberEditor<Integer> {
 	}
 
 	public IntegerEditor(Integer value) {
-		super(value, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer"));
+		super(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Integer"));
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java

@@ -21,7 +21,7 @@ public class SpinnerIntegerEditor extends Editor<Integer> {
         spinner = new UISpinner(-Integer.MAX_VALUE, Integer.MAX_VALUE, 1, 0);
         this.add(spinner, BorderLayout.CENTER);
         this.spinner.addKeyListener(textKeyListener);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Integer"));
     }
 
     @Override

designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@@ -56,13 +56,13 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
 
             @Override
             public String textForInstallButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Plugin_Normal_Update");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Normal_Update");
             }
 
 
             @Override
             public String textForInstallFromDiskButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Plugin_Normal_Update_From_Local");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Normal_Update_From_Local");
             }
 
             @Override
@@ -104,13 +104,13 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
 
             @Override
             public String textForInstallButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Plugin_Normal_Update");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Normal_Update");
             }
 
 
             @Override
             public String textForInstallFromDiskButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Plugin_Normal_Update_From_Local");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Normal_Update_From_Local");
             }
 
             @Override
@@ -214,7 +214,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
      */
     @Override
     public String textForInstallFromDiskFileButton() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Plugin_Normal_Update_From_Local");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Normal_Update_From_Local");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -174,7 +174,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
     }
 
     private UIMenuItem initCloseOther() {
-        UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Close_Other_Templates"));
+        UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Close_Other_Templates"));
         setListDownItemPreferredSize(closeOther);
         closeOther.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -694,7 +694,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
                 //如果在权限编辑情况下，不允许切换到表单类型的工作簿
                 if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
-                    JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-AuthorityEdited_Cannot_be_Supported")
+                    JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
                             + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
                     this.repaint();
                     return;

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -89,7 +89,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 String text = formulaTextArea.getText();
                 // 判断在中文输入状态是否还包含提示符 要删掉
                 //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
-                String tip = "\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips");
+                String tip = "\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Tips");
                 if (text.contains(tip)) {
                     text = text.substring(0, text.indexOf(tip));
                     insertPosition = 0;
@@ -161,7 +161,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         JPanel searchPane = new JPanel(new BorderLayout(4, 4));
         searchPane.add(keyWordTextField, BorderLayout.CENTER);
-        UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Search"));
+        UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search"));
         searchPane.add(searchButton, BorderLayout.EAST);
         tipsPane.add(searchPane, BorderLayout.NORTH);
         initKeyWordTextFieldKeyListener();
@@ -496,7 +496,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             if (content.trim().equals("=")) {
                 this.formulaTextArea.setForeground(Color.gray);
                 //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
-                this.formulaTextArea.setText("\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips"));
+                this.formulaTextArea.setText("\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Tips"));
                 this.formulaTextArea.setCaretPosition(0);
                 ifHasBeenWriten = 0;
                 this.listModel.removeAllElements();
@@ -716,7 +716,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
             UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
             desScrollPane.setBorder(null);
-            this.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
+            this.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
             descriptionTextArea.setBackground(Color.white);
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);
@@ -789,7 +789,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);
             variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
             this.add(this.createNamePane(
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER);
             variablesTree.setRootVisible(false);
             variablesTree.setShowsRootHandles(true);
             variablesTree.addMouseListener(applyTextMouseListener);
@@ -818,7 +818,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         private class LookDetailAction extends UpdateAction {
 
             public LookDetailAction() {
-                this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail"));
+                this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail"));
                 this.setMnemonic('L');
                 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
             }
@@ -833,7 +833,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             BasicPane basicPane = new BasicPane() {
                 @Override
                 protected String title4PopupWindow() {
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail");
                 }
             };
             basicPane.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -929,7 +929,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     variableResolver.resolveColumnNames()).createMutableTreeNode());
 
             // Set cutReport Variable
-            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables"),
+            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"),
                     BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
                     variableResolver.resolveCurReportVariables()).createMutableTreeNode());
 

designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java

@@ -25,7 +25,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
     @Override
     protected void extendCheckBoxPane(JPanel checkBoxPane) {
         // peter:添加公式是否兼容Excel的属性
-        reserveCheckBox4Result = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export-Save-Formula"));
+        reserveCheckBox4Result = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export_Save_Formula"));
         reserveCheckBox4Result.setSelected(false);
         reserveCheckBox4Result.addChangeListener(new ChangeListener() {
 
@@ -38,7 +38,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
                 }
             }
         });
-        reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write-Save-Formula"));
+        reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Save_Formula"));
         reserveCheckBox4Write.setSelected(false);
 
         checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER);

designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@@ -123,19 +123,19 @@ public abstract class FunctionConstants {
 	
 	public static NameAndTypeAndFunctionList[] EMBFUNCTIONS = new NameAndTypeAndFunctionList[] {
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Text"), Function.TEXT),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Text"), Function.TEXT),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Logical"), Function.LOGIC),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Logical"), Function.LOGIC),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Array"), Function.ARRAY),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Report"), Function.REPORT),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Other"), Function.OTHER),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
 	};
 	
 	public static FunctionGroup ALL = new FunctionGroup() {
 		@Override
 		public String getGroupName() {
-			return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-All");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_All");
 		}
 		
 		@Override

designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java

@@ -94,7 +94,7 @@ public class FunctionManagerPane extends BasicPane {
 
         @Override
         public NameableCreator[] createNameableCreators() {
-            NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function"), FunctionDef.class,
+            NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"), FunctionDef.class,
             		FunctionContentPane.class);
             return new NameableCreator[]{funcDef};
         }
@@ -151,12 +151,12 @@ public class FunctionManagerPane extends BasicPane {
 
             String path1 = getEscapePath(File.separator + ProjectConstants.WEBINF_NAME + File.separator + ProjectConstants.CLASSES_NAME);
             String path2 = getEscapePath(WorkContext.getCurrent().getPath() + File.separator + ProjectConstants.CLASSES_NAME);
-            descriptionArea.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function_Description_Area_Text", path1, path2));
+            descriptionArea.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Description_Area_Text", path1, path2));
 
             JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane();  //Description Pane
             this.add(descriptionPane, BorderLayout.SOUTH);
             descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
-            descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Description") + ":"), BorderLayout.NORTH);
+            descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description") + ":"), BorderLayout.NORTH);
             this.descriptionTextArea = new UITextArea(6, 24);
             descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER);
         }

designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java

@@ -57,7 +57,7 @@ public class JTreeControlPane extends ControlPane {
         // LeftPane
         JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         JPanel northPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root"));
+        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root"));
         defaultTreeModel = new DefaultTreeModel(rootNode);
         DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new TreeNodeAttr()));
         tree = new JTree(defaultTreeModel);
@@ -84,7 +84,7 @@ public class JTreeControlPane extends ControlPane {
         leftPane.add(toolBar, BorderLayout.NORTH);
 
 
-        isPerformanceFirst = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Performance_First"));
+        isPerformanceFirst = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Performance_First"));
         northPane.add(new UILabel("                 "));
         northPane.add(isPerformanceFirst);
         this.add(northPane, BorderLayout.NORTH);

designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@@ -337,7 +337,7 @@ public class RegPane extends BasicPane {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             dataTypeComboBox = new UIComboBox(DefaultComboBoxModel);
             JTextField editFiled = (JTextField)(dataTypeComboBox.getEditor().getEditorComponent());
-            UILabel dataTypeLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data_Type"));
+            UILabel dataTypeLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data_Type"));
             dataTypeLable.setPreferredSize(new Dimension(60, 20));
             JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{dataTypeLable, dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, 0);
             this.add(panel);
@@ -401,8 +401,8 @@ public class RegPane extends BasicPane {
             this.setPreferredSize(new Dimension(210, 56));
             minLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
             maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
-            UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Min_Length"));
-            UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Max_Length"));
+            UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Min_Length"));
+            UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Max_Length"));
             minLabel.setPreferredSize(new Dimension(60, 20));
             maxLabel.setPreferredSize(new Dimension(60, 20));
             double f = TableLayout.FILL;
@@ -456,7 +456,7 @@ public class RegPane extends BasicPane {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             regTextField = new UITextField();
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
         }
 
@@ -492,17 +492,17 @@ public class RegPane extends BasicPane {
             if (value instanceof NoneReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None"));
             } else if (value instanceof LengthReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Length"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"));
             } else if (value instanceof MailReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"));
             } else if (value instanceof PhoneReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Phone"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone"));
             } else if (value instanceof MobileReg) {
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_MobilePhone"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Phone"));
             } else if (value instanceof IDCardReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_IDCard"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ID_Card"));
             } else if (value instanceof PostCardReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PostCode"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Post_Code"));
             } else if (value instanceof CustomReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom"));
             }

designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java

@@ -42,8 +42,8 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	 */
 	private static final long serialVersionUID = 1762889323082827111L;
 
-	private String[] buildWay = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build"),
-		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layer-Build")};
+	private String[] buildWay = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DataTable_Build"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Build")};
 
 	public TreeSettingPane(boolean isEditor) {
 		this.initComponents(isEditor);
@@ -53,7 +53,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 		buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build-Way") + " ：");
+		UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Way") + " ：");
 		buildWayPanel.add(buildWayLabel);
 		buildBox = new UIComboBox(buildWay);
 		buildBox.addItemListener(new ItemListener() {

designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java

@@ -47,7 +47,7 @@ public class LayerDataControlPane extends ControlPane {
         configPane = new LayerDataConfigPane();
         //创建树结构及树控件
         JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root"));
+        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root"));
         defaultTreeModel = new DefaultTreeModel(rootNode);
         tree = new JTree(defaultTreeModel);
         DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new LayerConfig(1)));

designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java

@@ -392,7 +392,7 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener {
 
             String name;
             if (column == 0) {
-                name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_layerIndex");
+                name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Index");
             } else {
                 name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_filedChosen");
             }

designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java

@@ -54,7 +54,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private static final int GAP = 23;
     private static final int VERGAP = 3;
     private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20);
-    private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line"),
+    private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"),
             com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")};
 
     private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
@@ -173,7 +173,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
     private void initTextRotationCombox() {
         ArrayList<String> selectOption = new ArrayList<String>();
-        selectOption.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom-Angle"));
+        selectOption.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Angle"));
         VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
         selectOption.addAll(Arrays.asList(processor.getComboxOption()));
 
@@ -183,15 +183,15 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private void initAllNames() {
         hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal"));
         vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical"));
-        imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout"));
-        textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style"));
+        imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout"));
+        textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"));
         textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"));
         rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"));
-        leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Left_Indent"));
-        rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Right_Indent"));
-        spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_Before"));
-        spaceAfterSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_After"));
-        lineSpaceSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Line_Spacing"));
+        leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"));
+        rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"));
+        spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"));
+        spaceAfterSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"));
+        lineSpaceSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"));
     }
 
     private JPanel createPane() {
@@ -229,9 +229,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout")) + "   ", SwingConstants.LEFT), imageLayoutComboBox},
+                new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout")) + "   ", SwingConstants.LEFT), imageLayoutComboBox},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style") + "   ", SwingConstants.LEFT), textComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + "   ", SwingConstants.LEFT), textComboBox},
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation") + "   ", SwingConstants.LEFT), textRotationComboBox},
                 new Component[]{null, rotationBarCC},
@@ -273,7 +273,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 new Component[]{null, null, null},
                 new Component[]{null, null, null},
                 new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
-                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Front")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Behind")), SwingConstants.CENTER)},
+                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)},
                 new Component[]{null, null, null},
                 new Component[]{null, null, null},
                 new Component[]{spacingPane, creatSpinnerPane(lineSpaceSpinner), null},
@@ -369,7 +369,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
             }
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"))) {
             if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[0])) {
                 style = style.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT);
             } else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[1])) {
@@ -389,7 +389,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
 
     private Style updateImageLayout(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout"))) {
             if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[1])) {
                 style = style.deriveImageLayout(Constants.IMAGE_TILED);
             } else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[2])) {
@@ -419,21 +419,21 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private Style updateOther(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Left_Indent"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"))) {
             style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.leftIndentSpinner.getValue())));
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Right_Indent"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"))) {
             style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.rightIndentSpinner.getValue())));
         }
         //间距
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_Before"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"))) {
             style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue()));
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_After"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"))) {
             style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue()));
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Line_Spacing"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"))) {
             style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue()));
         }
         return style;

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -18,8 +18,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
 import com.fr.design.style.color.NewColorSelectBox;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.ComparatorUtils;
 
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
@@ -80,12 +78,12 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style") + "    ", SwingConstants.LEFT), currentLineCombo},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_outBorder") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border") + "    ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
                 new Component[]{null, externalPane},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_inBorder") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border") + "    ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
                 new Component[]{null, insidePane},
                 new Component[]{null, null}
         };

designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java

@@ -43,7 +43,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     private static final Dimension BUTTON_SIZE = new Dimension(20, 18);
     private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20);
     private static final Dimension HIDE_SIZE = new Dimension(0, 0);
-    private final String[] fontSizeStyles = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_plain"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bolditalic")};
+    private final String[] fontSizeStyles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Plain"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bolditalic")};
     private JPanel buttonPane;
     private JPanel isSuperOrSubPane;
     private UIComboBox fontNameComboBox;
@@ -136,17 +136,17 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"))) {
             frFont = frFont.applyName((String) fontNameComboBox.getSelectedItem());
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"))) {
             frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex());
         }
         if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"))) {
             frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString()));
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground"))) {
             frFont = frFont.applyForeground(this.colorSelectPane.getColor());
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline"))) {
 
             int line = underline.isSelected() ? this.underlineCombo.getSelectedLineStyle() : Constants.LINE_NONE;
             frFont = frFont.applyUnderline(line);
@@ -157,10 +157,10 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
             frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle());
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough"))) {
             frFont = frFont.applyStrikethrough(isStrikethroughCheckBox.isSelected());
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow"))) {
             frFont = frFont.applyShadow(isShadowCheckBox.isSelected());
         }
 
@@ -178,7 +178,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     private FRFont updateSubSuperscript(FRFont frFont) {
         boolean isSuper = frFont.isSuperscript();
         boolean isSub = frFont.isSubscript();
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript"))) {
             //如果上标没有选中,点击则选中上标，并且下标一定是不选中状态
             //如果上标选中，点击则取消选中上标，字体回复正常
             if (superPane.isSelected() && !isSuper) {
@@ -189,7 +189,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
                 frFont = frFont.applySuperscript(false);
             }
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript"))) {
             if (subPane.isSelected() && !isSub) {
                 frFont = frFont.applySubscript(true);
                 frFont = frFont.applySuperscript(false);
@@ -264,29 +264,29 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     }
 
     private void initAllNames() {
-        fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"));
+        fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"));
         fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"));
         fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
-        colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"));
-        italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"));
-        bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"));
-        underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"));
+        colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground"));
+        italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"));
+        bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold"));
+        underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline"));
         underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
-        isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"));
-        isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"));
-        superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"));
-        subPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript"));
+        isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough"));
+        isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow"));
+        superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript"));
+        subPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript"));
     }
 
     private void setToolTips() {
-        colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"));
-        italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"));
-        bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"));
-        underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"));
-        isStrikethroughCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"));
-        isShadowCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"));
-        superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"));
-        subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript"));
+        colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground"));
+        italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"));
+        bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold"));
+        underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline"));
+        isStrikethroughCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough"));
+        isShadowCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow"));
+        superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript"));
+        subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript"));
     }
 
 

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -103,7 +103,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         public void actionPerformed(ActionEvent e) {
             String tpl = northPane.getReportletName();
             if (StringUtils.isBlank(tpl)) {
-                JOptionPane.showMessageDialog(ReportletHyperlinkPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Please_Select_Reportlet") + ".", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(ReportletHyperlinkPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Please_Select_Reportlet") + ".", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
                 northPane.requestButtonFocus();
                 return;
             }

designer-base/src/main/java/com/fr/design/javascript/EmailPane.java

@@ -39,9 +39,9 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
 		tipsPane1 = new UILabel();
 		tipsPane1.setHorizontalAlignment(SwingConstants.RIGHT);
 		tipsPane1.setForeground(Color.pink);
-		tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-tips"));
+		tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Tips"));
 		
-		UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-mailContent") + ":");
+		UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content") + ":");
 		mainTextLabel.setHorizontalAlignment(SwingConstants.RIGHT);
 		mainTextLabel.setVerticalAlignment(SwingConstants.TOP);
 		JScrollPane scrollPane = new JScrollPane(mainTextEditor = new JTextArea());
@@ -66,8 +66,8 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
                 {new UILabel(), tipsPane1},
                 createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
                 createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
-                createLinePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-BCC"), bccEditor = new UITextField()),
-                createLinePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-mailSubject"), titleEditor = new UITextField()),
+                createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"), bccEditor = new UITextField()),
+                createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"), titleEditor = new UITextField()),
                 {mainTextLabel, scrollPane},
                 {new UILabel(), showTplContent},
                 {new UILabel(), tipsPane2}},rowSize, columnSize, 8);
@@ -81,7 +81,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
 	}
 
 	protected void checkEmailConfig(boolean valid) {
-		tipsPane1.setText(valid ? StringUtils.BLANK : com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-warnings"));
+		tipsPane1.setText(valid ? StringUtils.BLANK : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Warnings"));
 		centerPane.setEnabled(valid);
 		mainTextEditor.setEnabled(valid);
 		mainTextEditor.setBackground(valid ? Color.WHITE : UIConstants.DEFAULT_BG_RULER);

designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java

@@ -35,9 +35,9 @@ public class JSContentPane extends BasicPane {
         funNameLabel = new UILabel();
         this.setFunctionTitle(args);
 
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Format_JavaScript"), IOUtils.readIcon("com/fr/design/images/edit/format.png"), SwingConstants.LEFT);
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Format_JavaScript"), IOUtils.readIcon("com/fr/design/images/edit/format.png"), SwingConstants.LEFT);
         label.setCursor(new Cursor(Cursor.HAND_CURSOR));
-        label.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Format_JavaScript"));
+        label.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Format_JavaScript"));
         label.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -74,14 +74,14 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
      * @return 返回按钮对象
      */
     public UIButton createCallButton() {
-        UIButton callButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"));
+        UIButton callButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function"));
         callButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 final JavaScriptActionPane callPane = new JavaScriptActionPane() {
                     @Override
                     protected String title4PopupWindow() {
-                        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function");
+                        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function");
                     }
 
                     @Override
@@ -152,7 +152,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
 
         @Override
         protected String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function");
         }
 
         @Override
@@ -180,7 +180,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
 
             @Override
             protected String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function");
             }
 
             @Override

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -229,7 +229,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public OpenFolderAction() {
 
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_in_Containing_Folder"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/view_folder.png"));
         }
 
@@ -281,7 +281,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public RenameAction() {
 
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Rename"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Rename"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/source/rename.png"));
         }
 
@@ -413,7 +413,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             jd = new JDialog();
             jd.setLayout(new GridLayout(2, 2));
             jd.setModal(true);
-            UILabel newNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Enter-New-FileName"));
+            UILabel newNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Enter_New_File_Name"));
             newNameLabel.setMinimumSize(new Dimension(150, 27));
             newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             jt = new UITextField(oldName);
@@ -487,7 +487,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             jd.add(btPanel);
 
             jd.setSize(380, 200);
-            jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Rename"));
+            jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Rename"));
             jd.setResizable(false);
             jd.setAlwaysOnTop(true);
             jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -98,7 +98,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         super();
         initPropertyItemList();
         defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available"));
-        defaultAuthorityPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Not_Support_Authority_Edit"));
+        defaultAuthorityPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Not_Support_Authority_Edit"));
         switchMode(PropertyMode.REPORT);
         setContainerWidth(CONTAINER_WIDTH);
     }
@@ -106,11 +106,11 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private void initPropertyItemList() {
         propertyItemMap = new LinkedHashMap<>();  // 有序map
         // 单元格元素
-        PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Element"),
+        PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Element"),
                 "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 单元格属性
-        PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Attributes"),
+        PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Attributes"),
                 "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 悬浮元素
@@ -122,7 +122,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
         // 条件属性
-        PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes"),
+        PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"),
                 "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 超级链接
@@ -130,7 +130,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 组件库
-        PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Library"),
+        PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),
                 "widgetlib", new PropertyMode[]{PropertyMode.FORM},
                 new PropertyMode[]{PropertyMode.FORM});
         // 权限编辑
@@ -138,7 +138,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
         // 已配置角色
-        PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Configured_Roles"),
+        PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Configured_Roles"),
                 "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
                 new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
 

designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java

@@ -134,7 +134,7 @@ public class JFormSliderPane extends JPanel {
         slider.setPreferredSize(new Dimension(220, 20));
         //去掉虚线框
         slider.setFocusable(false);
-        slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider"));
+        slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider"));
     }
 
     private void initShowValSpinner() {
@@ -156,7 +156,7 @@ public class JFormSliderPane extends JPanel {
         };
         downButton.setOpaque(false);
         downButton.setBorderPainted(false);
-        downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down"));
+        downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Down"));
         upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) {
             public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
@@ -164,7 +164,7 @@ public class JFormSliderPane extends JPanel {
         };
         upButton.setOpaque(false);
         upButton.setBorderPainted(false);
-        upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up"));
+        upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Up"));
         downButton.setActionCommand("less");
         upButton.setActionCommand("more");
         downButton.addActionListener(buttonActionListener);
@@ -177,7 +177,7 @@ public class JFormSliderPane extends JPanel {
         showValButton.setBorderPainted(false);
         showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
         showValButton.addActionListener(showValButtonActionListener);
-        showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade"));
+        showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Grade"));
     }
 
     private void initUIRadioButton() {
@@ -186,9 +186,9 @@ public class JFormSliderPane extends JPanel {
         sevenFiveButton = new UIRadioButton("75%");
         fiveTenButton = new UIRadioButton("50%");
         twoFiveButton = new UIRadioButton("25%");
-        selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton"));
+        selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Self_Adapt_Button"));
         selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
-        customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton"));
+        customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Custom_Button"));
         customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
         twoHundredButton.addItemListener(radioButtonItemListener);
         oneHundredButton.addItemListener(radioButtonItemListener);

designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java

@@ -140,7 +140,7 @@ public class JSliderPane extends JPanel {
         slider.setPreferredSize(new Dimension(220, 20));
         //去掉虚线框
         slider.setFocusable(false);
-        slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider"));
+        slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider"));
     }
 
     private void initShowValSpinner() {
@@ -163,7 +163,7 @@ public class JSliderPane extends JPanel {
         };
         downButton.setOpaque(false);
         downButton.setBorderPainted(false);
-        downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down"));
+        downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Down"));
         upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) {
             public Point getToolTipLocation(MouseEvent event) {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
@@ -171,7 +171,7 @@ public class JSliderPane extends JPanel {
         };
         upButton.setOpaque(false);
         upButton.setBorderPainted(false);
-        upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up"));
+        upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Up"));
         downButton.setActionCommand("less");
         upButton.setActionCommand("more");
         downButton.addActionListener(buttonActionListener);
@@ -184,7 +184,7 @@ public class JSliderPane extends JPanel {
         showValButton.setBorderPainted(false);
         showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
         showValButton.addActionListener(showValButtonActionListener);
-        showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade"));
+        showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Grade"));
     }
 
     private void initUIRadioButton() {
@@ -193,9 +193,9 @@ public class JSliderPane extends JPanel {
         sevenFiveButton = new UIRadioButton("75%");
         fiveTenButton = new UIRadioButton("50%");
         twoFiveButton = new UIRadioButton("25%");
-        selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton"));
+        selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Self_Adapt_Button"));
         selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
-        customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton"));
+        customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Custom_Button"));
         customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
         twoHundredButton.addItemListener(radioButtonItemListener);
         oneHundredButton.addItemListener(radioButtonItemListener);

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -536,7 +536,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (!access) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
         collectInfo();
@@ -586,7 +586,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
                 return false;
             }
             editingFILE = fileChooser.getSelectedFILE();
@@ -717,10 +717,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     @Override
     public MenuDef[] menus4Target() {
-        MenuDef tplMenu = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template"), 'T');
+        MenuDef tplMenu = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template"), 'T');
         tplMenu.setAnchor(MenuHandler.TEMPLATE);
         if (!DesignerMode.isAuthorityEditing()) {
-            tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WorkBook")));
+            tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_WorkBook")));
             tplMenu.addShortCut(new TableDataSourceAction(this));
             tplMenu.addShortCut(shortcut4TemplateMenu());
         }
@@ -866,8 +866,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public boolean isNewDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
-            String info = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_open-new-form-tip");
-            String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo");
+            String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip");
+            String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show();
             return true;
         }
@@ -883,7 +883,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
             String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
-            String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo");
+            String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show();
             return true;
         }

designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java

@@ -44,7 +44,7 @@ public class UndoStateEdit extends AbstractUndoableEdit {
         super.undo();
         if (cur.getAuthorityType() == BaseUndoState.AUTHORITY_STATE) {
             int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.NO_OPTION) {
                 return;
             }

designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java

@@ -52,7 +52,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 
         Component[][] components = new Component[][]{
                 new Component[]{gradientBar, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction")), directionPane}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction")), directionPane}
         };
         JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.setLayout(new BorderLayout());

designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImagePreviewPane.java

@@ -60,7 +60,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre
             public void paintComponent(Graphics g) {
                 super.paintComponent(g);
                 if (isLoading) {
-                    g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2);
+                    g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2);
                     return;
                 }
                 // draw image.

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -148,7 +148,7 @@ public class DesignerLogHandler {
             jTextArea.setBackground(Color.WHITE);
 
             popup = new JPopupMenu();
-            selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All"));
+            selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_All"));
             selectAll.addActionListener(popupListener);
             selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png"));
             popup.add(selectAll);
@@ -158,7 +158,7 @@ public class DesignerLogHandler {
             copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
             popup.add(copy);
 
-            clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All"));
+            clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_All"));
             clear.addActionListener(popupListener);
             clear.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/clear.png"));
             popup.add(clear);
@@ -265,9 +265,9 @@ public class DesignerLogHandler {
             if (style == ERROR_INT) {
                 str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert") + ":" + str + "\n";
             } else if (style == WARN_INT) {
-                str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Seriously") + ":" + str + "\n";
+                str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n";
             } else {
-                str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Normal") + ":" + str + "\n";
+                str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":" + str + "\n";
             }
             return str;
         }

designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java

@@ -3,8 +3,6 @@ package com.fr.design.mainframe.loghandler;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 
-import com.fr.stable.script.Atom;
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionListener;
@@ -39,12 +37,12 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 		clear.setMargin(null);
 		clear.setOpaque(false);
 		clear.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		clear.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All"));
+		clear.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_All"));
 		selectedall = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/selectedall.png"));
 		selectedall.setMargin(null);
 		selectedall.setOpaque(false);
 		selectedall.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		selectedall.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All"));
+		selectedall.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_All"));
 		set = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/setting.png"));
 		set.setMargin(null);
 		set.setOpaque(false);

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -408,7 +408,7 @@ public abstract class ToolBarMenuDock {
     }
 
     protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Server"), 'S');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic__M_Server"), 'S');
 
         if (!DesignerMode.isAuthorityEditing()) {
             menuDef.addShortCut(
@@ -548,7 +548,7 @@ public abstract class ToolBarMenuDock {
             return toolBar;
 
         } else {
-            return polyToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Polyblock_Edit"));
+            return polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Polyblock_Edit"));
         }
     }
 

designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java

@@ -63,7 +63,7 @@ public class BasicPropertyPane extends BasicPane {
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Name")), widgetName},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Name")), widgetName},
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));

designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java

@@ -18,12 +18,12 @@ public class TreeModelWrapper implements Encoder, Decoder {
             return StringUtils.EMPTY;
         }
         if (v instanceof TreeNodeAttr[]) {
-            return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""});
+            return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""});
         } else if (v instanceof TreeNodeWrapper) {
             TreeNodeAttr[] treeNodeAttrs = ((TreeNodeWrapper) v).getTreeNodeAttrs();
-            return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""});
+            return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""});
         } else if (v instanceof NameObject) {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DataTable_Build");
         } else {
             return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build");
         }

designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java

@@ -362,7 +362,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-SwitchWorkspace");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace");
         }
 
         @Override
@@ -379,7 +379,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Exit");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit");
         }
 
         @Override
@@ -397,7 +397,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template");
         }
 
         @Override
@@ -621,7 +621,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Repeat-Freeze");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Repeat_Freeze");
         }
 
         @Override
@@ -759,7 +759,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes");
         }
 
         @Override
@@ -844,7 +844,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Currency_Line");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java

@@ -116,7 +116,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane<DatabaseDictionary> i
      *
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource_From_Database");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_From_Database");
     }
 
     public void populateBean(DatabaseDictionary dbDict) {

designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@@ -107,7 +107,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
         firstLine.add(new PreviewLabel(this), BorderLayout.EAST);
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS_TableData") + "  ", UILabel.LEFT), firstLine},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data") + "  ", UILabel.LEFT), firstLine},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + "  ", UILabel.LEFT), keyColumnPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + "  ", UILabel.LEFT), valueDictPane},
         };
@@ -149,7 +149,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
      * @return 返回是窗口显示的标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dic_Data_Query");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dic_Data_Query");
     }
 
     private void tdChange(final ItemEvent e) {
@@ -252,14 +252,14 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
         TableDataSource dataSource = DesignTableDataManager.getEditingTableDataSource();
         if (dataSource != null) {
             for (int i = BEGIN; i < END; i++) {
-                TableData td = dataSource.getTableData(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i);
+                TableData td = dataSource.getTableData(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i);
                 if (td == null) {
-                    name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i;
-                    dataSource.putTableData(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i, db);
+                    name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i;
+                    dataSource.putTableData(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i, db);
                     break;
                 } else {
                     if (ComparatorUtils.equals(td, db)) {
-                        name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i;
+                        name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i;
                         break;
                     } else {
                         continue;

designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java

@@ -13,7 +13,7 @@ import java.util.Map;
 public class WriteEnhancePreview extends AbstractPreviewProvider {
     @Override
     public String nameForPopupItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write_Enhance_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Enhance_Preview");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -103,21 +103,21 @@ public class WatermarkPane extends BasicPane {
 
         colorPane = new NewColorSelectPane();
         JPanel colorLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text_Color")), BorderLayout.NORTH);
+        colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text_Color")), BorderLayout.NORTH);
 
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p,p,p};
         double[] columnSize = { p, MAX_WIDTH};
 
         JPanel rightContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Watermark_Text")), formulaPane},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font_Size")), fontSizeTypePane},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Watermark_Text")), formulaPane},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Size")), fontSizeTypePane},
                 {colorLabelPane, colorPane},
         }, rowSize, columnSize, 10);
         rightContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
 
         UIScrollPane configPane = new UIScrollPane(rightContentPane);
-        configPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Config"),null));
+        configPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Config"),null));
         return configPane;
     }
 

designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -162,7 +162,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
      */
     private void checkChanges() {
         //如若有变化，则弹出下面的对话框
-        int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role_changed_isRefresh") + "?",
+        int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
         if (returnVal == JOptionPane.OK_OPTION) {
             roleTree.refreshTreeNode();
@@ -185,7 +185,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
     private void initbuttonGroup() {
     
         Icon[] iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")};
-        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Name")};
+        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name")};
         buttonGroup = new UIHeadGroup(iconArray, textArray) {
             public void tabChanged(int index) {
                 roleTree.setEditable(false);

designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java

@@ -29,11 +29,11 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane {
 
     private static void registerCardSwitchBtnBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
         map.put(ColorBackground.class, BackgroundUIWrapper.create()
-                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color")));
+                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
         map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
                 .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
         map.put(GradientBackground.class, BackgroundUIWrapper.create()
-                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color")));
+                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")));
 
     }
 

designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java

@@ -94,13 +94,13 @@ public class BackgroundFactory {
         map.put(null, BackgroundUIWrapper.create()
                 .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null")));
         map.put(ColorBackground.class, BackgroundUIWrapper.create()
-                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color")));
+                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
         map.put(TextureBackground.class, BackgroundUIWrapper.create()
                 .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Texture")));
         map.put(PatternBackground.class, BackgroundUIWrapper.create()
                 .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Pattern")));
         map.put(GradientBackground.class, BackgroundUIWrapper.create()
-                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color")));
+                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")));
     }
 
     private static void registerImageBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
@@ -115,7 +115,7 @@ public class BackgroundFactory {
 
     private static void registerButtonBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map){
         map.put(ColorBackground.class, BackgroundUIWrapper.create()
-                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color")));
+                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
         map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
                 .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
 

designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java

@@ -29,9 +29,9 @@ public class BackgroundTabPane extends BackgroundPane {
         map.put(null, BackgroundUIWrapper.create()
                 .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null")));
         map.put(ColorBackground.class, BackgroundUIWrapper.create()
-                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color")));
+                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
         map.put(GradientBackground.class, BackgroundUIWrapper.create()
-                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color")));
+                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")));
 
     }
 

designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java

@@ -43,7 +43,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
 		JPanel blankJp = new JPanel();
 		gradientBar = new GradientBar(4, 254);
 		blankJp.add(gradientBar);
-		UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Drag_To_Select_Gradient"));
+		UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Drag_To_Select_Gradient"));
 		jl.setHorizontalAlignment(SwingConstants.CENTER);
 		gradientPanel.add(jl, BorderLayout.NORTH);
 		gradientPanel.add(blankJp, BorderLayout.SOUTH);
@@ -53,14 +53,14 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
 		JPanel innercenterPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		centerPane.add(new UILabel("           "));
 		centerPane.add(innercenterPane);
-		innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction") + ":"));
+		innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction") + ":"));
 
-		left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Horizontal"));
+		left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal"));
 		innercenterPane.add(left2right);
 		left2right.setSelected(true);
 		left2right.addActionListener(reviewListener);
 
-		top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Vertical"));
+		top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Vertical"));
 		innercenterPane.add(top2bottom);
 		top2bottom.addActionListener(reviewListener);
 

designer-base/src/main/java/com/fr/design/style/background/image/ExpandFileChooser.java

@@ -55,7 +55,7 @@ public class ExpandFileChooser extends JFileChooser {
         bottomControlPanel.setPreferredSize(new Dimension(DEFAULT_WIDTH, 40));
 
         approve = new UIButton(approveText);
-        cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Cancel"));
+        cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel"));
         if (StringUtils.isNotEmpty(checkBoxText)) {
             checkBox = new UICheckBox(checkBoxText);
             checkBox.setSelected(DesignerEnvManager.getEnvManager().isImageCompress());

designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java

@@ -23,7 +23,7 @@ import java.util.Hashtable;
 public class ImageFileChooser extends ExpandFileChooser {
 
     public ImageFileChooser() {
-        super(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"));
+        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"));
         ExampleFileFilter bothFilter = new ExampleFileFilter(
                 new String[]{"jpg", "gif", "png", "bmp"},
                 com.fr.design.i18n.Toolkit.i18nText("Image-Image_Files"));

designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java

@@ -108,7 +108,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre
     public void paintComponent(Graphics g) {
         super.paintComponent(g);
         if (isLoading) {
-            g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2);
+            g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2);
             return;
         }
         if (this.getImage() != null) { //draw image.

designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java

@@ -51,7 +51,7 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane {
     private void initButton() {
         chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select"));
         chooseButton.addActionListener(selectPictureActionListener);
-        clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Clear"));
+        clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Clear"));
         clearButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java

@@ -196,7 +196,7 @@ public class ColorChooserPreview extends JPanel {
 
     private String getSampleText() {
         if (this.sampleText == null) {
-            this.sampleText = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SampleText");
+            this.sampleText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sample_Text");
         }
         return this.sampleText;
     }

designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java

@@ -56,7 +56,7 @@ public class ColorSelectDetailPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Color");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Color");
     }
 
     protected void initComponents() {
@@ -78,7 +78,7 @@ public class ColorSelectDetailPane extends BasicPane {
         this.add(selectedPanel, BorderLayout.NORTH);
 
         // 最近使用面板
-        recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Used"));
+        recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Used"));
         RecentUseColorPane recent = new RecentUseColorPane(selectedPanel);
         recentUsePanel.add(recent);
 

designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java

@@ -92,7 +92,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
     	
     	this.add(buttonPane, BorderLayout.SOUTH);
     	
-    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_OK"));
+    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK"));
     	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_Cancel"));
     	
     	buttonPane.add(ok);

designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java

@@ -577,7 +577,7 @@ public class SwatchChooserPanel extends AbstractColorChooserPanel{
 	   */
 	  public String getDisplayName()
 	  {
-	    return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Swatch");
+	    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Swatch");
 	  }
 
 	  /**

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -85,7 +85,7 @@ public class CustomIconPane extends BasicPane {
 		noNamePane.add(jsPane);
 		
 		DescriptionTextArea des = new DescriptionTextArea(2);
-		des.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message1"));
+		des.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message1"));
 		centerPane.add(des, BorderLayout.SOUTH);		
 		
 		this.add(centerPane, BorderLayout.CENTER);
@@ -143,7 +143,7 @@ public class CustomIconPane extends BasicPane {
 
 						}else {
 							// add failed
-							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE);
+							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE);
 						}
 					}
                 }).setVisible(true);
@@ -173,7 +173,7 @@ public class CustomIconPane extends BasicPane {
 				} else {
 					// remove failed
 					JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-							com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"),
+							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"),
 		    				com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"),
 							JOptionPane.WARNING_MESSAGE);
 				}
@@ -221,7 +221,7 @@ public class CustomIconPane extends BasicPane {
 							// 失败了再弄回去
 							iconManager.addIcon(oldIcon, true);
 							// edit failed
-							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE);
+							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE);
 						}
 					}
                 }).setVisible(true);
@@ -245,7 +245,7 @@ public class CustomIconPane extends BasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon");
 	}
 
     /**
@@ -387,9 +387,9 @@ public class CustomIconPane extends BasicPane {
             double rowSize[] = {p, p};
             double columnSize[] = {p, p, p};
 
-            UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon"));
+            UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"));
             browseButton.setPreferredSize(new Dimension(80, 25));
-            browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Click_this_button"));
+            browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
             nameTextField = new UITextField(20);
 
             browseButton.addActionListener(new ActionListener() {
@@ -409,7 +409,7 @@ public class CustomIconPane extends BasicPane {
                     }
                     if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) {
                         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message3"),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message3"),
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"),
                                 JOptionPane.WARNING_MESSAGE);
                     }

designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java

@@ -53,7 +53,7 @@ public class WidgetBoundsPaneFactory {
         double p = TableLayout.PREFERRED;
 
         Component[][] northComponents = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Position")), createRightPane(x, y)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Position")), createRightPane(x, y)},
                 new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))},
         };
         Component[][] centerComponents = new Component[][]{

designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java

@@ -45,7 +45,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
         Component[][] n_components = {
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Type")), createButtonTypeComboBox()},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Icon")), iconPane},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()},
         };
         hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));

designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@@ -85,18 +85,18 @@ public abstract class CustomJobPane  extends BasicBeanPane {
             }
         });
 
-		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ClassName"), null));
+		reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null));
 		this.add(reportletNamePane, BorderLayout.NORTH);
 
 		objectProperiesPane = new ObjectProperiesPane();
-		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Property"), null));
+		objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null));
 		this.add(objectProperiesPane, BorderLayout.CENTER);
 
 		UITextArea area = new UITextArea(2, 1);
 		area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
 		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		dsPane.add(area);
-		dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null));
+		dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null));
 		this.add(dsPane, BorderLayout.SOUTH);
 		checkAddButtonEnable();
 	}

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -187,7 +187,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             helpButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f);
+                    FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Help"), 12f);
                     BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
                             new DialogActionAdapter(){});
                     dlg.setVisible(true);
@@ -238,7 +238,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 	}
 
 	private UIButton addEventButton() {
-		UIButton addSubmitEventButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Event"));
+		UIButton addSubmitEventButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Event"));
 		addSubmitEventButton.addActionListener(new ActionListener() {
 
 			public void actionPerformed(ActionEvent e) {
@@ -275,7 +275,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 		JScrollPane jp = new JScrollPane(conditionsTree);
 		addComponent(conditionPane,jp);
 
-		UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Condition"));
+		UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition"));
 		addSubmitConditionButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             }
             for (int j = 0; j < keyColumnNameValueList.size(); j++) {
                 if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) {
-                    Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") };
+                    Object[] options = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_None") };
                     returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
 							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
                             "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
@@ -815,7 +815,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Values_Editor");
 		}
 
 		public void populateBean(Object object) {

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -72,7 +72,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * 是否启用 https 勾选框
      */
-    private UICheckBox httpsCheckbox = new UICheckBox(Toolkit.i18nText("FR-Designer_RemoteEnv_Enable_Https"));
+    private UICheckBox httpsCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Enable_Https"));
     /**
      * 主机位置输入框
      */
@@ -124,11 +124,11 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * https 密钥标签
      */
-    private UILabel certSecretKeyLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Secret_Key"));
+    private UILabel certSecretKeyLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Secret_Key"));
     /**
      * https证书路径标签
      */
-    private UILabel certPathLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Cert_Path"));
+    private UILabel certPathLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Cert_Path"));
     /**
      * https 证书路径输入框
      */
@@ -207,7 +207,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         contentPanel.setBorder(
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
-                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("FR-Designer_RemoteEnv_Config")))
+                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Config")))
         );
 
 
@@ -218,7 +218,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                         new EmptyBorder(15, 0, 0, 0),
                         BorderFactory.createTitledBorder(
                                 new ModLineBorder(ModLineBorder.TOP),
-                                Toolkit.i18nText("FR-Designer_RemoteEnv_Server")
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server")
                         )
                 )
         );
@@ -237,7 +237,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 new EmptyBorder(15, 0, 0, 0),
                 BorderFactory.createTitledBorder(
                         new ModLineBorder(ModLineBorder.TOP),
-                        Toolkit.i18nText("FR-Designer_RemoteEnv_Platform_Account")
+                        Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Platform_Account")
                 )
         ));
 
@@ -248,7 +248,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         JPanel testPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         testPanel.setBorder(BorderFactory.createEmptyBorder());
         testPanel.setPreferredSize(new Dimension(437, 20));
-        UIButton testConnectionButton = new UIButton(Toolkit.i18nText("FR-Designer_RemoteEnv_Test_Connection"));
+        UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection"));
 
         testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection"));
         testConnectionButton.addActionListener(new ActionListener() {
@@ -323,19 +323,19 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
 
         // 主机名
-        UILabel hostNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Host_IP"));
+        UILabel hostNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Host_IP"));
         hostNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         // 端口
-        UILabel portLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Port"));
+        UILabel portLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Port"));
         portLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         // web应用
-        UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Web_Name"));
+        UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Web_Name"));
         webAppNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         // servlet
-        UILabel servletNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Servlet_Name"));
+        UILabel servletNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Servlet_Name"));
         servletNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         // 主机位置
-        UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_URL"));
+        UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_URL"));
         remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.RIGHT);
 
         enableSubDocListener();
@@ -359,7 +359,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         JTextPane urlTipsPane = new JTextPane();
         urlTipsPane.setEditable(false);
-        urlTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Server_Config_Tips"));
+        urlTipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server_Config_Tips"));
         urlTipsPane.setBackground(urlPanel.getBackground());
         urlTipsPane.setForeground(TIPS_FONT_COLOR);
 
@@ -373,7 +373,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         JTextPane httpsTipsPane = new JTextPane();
         httpsTipsPane.setEditable(false);
-        httpsTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Tips"));
+        httpsTipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Tips"));
         httpsTipsPane.setBackground(configPanel.getBackground());
         httpsTipsPane.setForeground(TIPS_FONT_COLOR);
 
@@ -453,10 +453,10 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     private void packAccountPanel(JPanel accountPanel) {
 
         // 用户名
-        UILabel userNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Username"));
+        UILabel userNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Username"));
         userNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
         // 密码
-        UILabel passwordLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Password"));
+        UILabel passwordLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Password"));
         passwordLabel.setHorizontalAlignment(SwingConstants.RIGHT);
 
         //输入密码的时候检测下大写锁定

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.chart.series.PlotSeries;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.MapHelper;
 import com.fr.base.MapXMLHelper;
 import com.fr.base.Utils;
@@ -22,7 +21,6 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
@@ -30,9 +28,18 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.SvgProvider;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import javax.swing.event.ListSelectionEvent;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Shape;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
@@ -321,7 +328,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 
 	private void showRenameWaring(String newName){
 		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed")
-				+ "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+				+ "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE);
 	}
 
 	private JMenuItem createRenameItem() {

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java

@@ -81,6 +81,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
     }
 
     private void initComponents() {
+
         isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
         auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval"));
         custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval"));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java

@@ -77,7 +77,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
-        axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed"));
+        axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed"));
         unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES);
         formatPane = new FormatPaneWithOutFont();
         axisLabelPane = new ChartAxisLabelPane();

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -116,7 +116,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
                 checkImagePane();
             }
         });
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), borderPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane);
     }
 
     private void checkAll() {

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -107,7 +107,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
     @Override
     protected String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Hyperlink");
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java

@@ -62,7 +62,7 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane
 
     @Override
     public String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Condition");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition");
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

@@ -226,7 +226,7 @@ public class VanChartPlotLegendPane extends BasicPane {
 
     protected JPanel createTitleStylePane(){
         textAttrPane = new ChartTextAttrPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 
     protected JPanel createDisplayStrategy(){

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@@ -164,7 +164,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
     private JPanel createTitleStylePane(){
         textAttrPane = new ChartTextAttrPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 
     private JPanel createDisplayStrategy(){

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -251,7 +251,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),position},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")),reversed},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")),reversed},
         } ;
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);

designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java

@@ -95,7 +95,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
         double[] rowSize = {p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"),formatPane),null},
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"),textAttrPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -164,7 +164,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         initStyleListener();
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot),row,col);
-        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected ChartTextAttrPane initTextFontPane () {

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -125,7 +125,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
 
         initStyleListener();
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel1);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel1);
     }
 
 

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -107,7 +107,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
             JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation_Direction"), rotate);
             panel.add(panel1, BorderLayout.NORTH);
         }
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     private Component[][] getDiffComponentsWithGaugeStyle() {

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java

@@ -63,7 +63,7 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
 
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected void populatePieAttr() {

designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java

@@ -67,7 +67,7 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
 
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     public void populateBean(Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java

@@ -23,7 +23,7 @@ public class VanChartTreeMapSeriesPane extends VanChartMultiPieSeriesPane {
         supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill"), supportDrill);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected void populatePieAttr() {

designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java

@@ -62,7 +62,7 @@ public class XDateEditor extends XDirectWriteEditor {
         return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt,
                 new CRPropertyDescriptor[]{
                         new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass(
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format")).setEditorClass(formatClass()).setRendererClass(
                                 DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName(
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,