merge

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

@@ -44,7 +44,7 @@ public class BBSAction extends UpdateAction
 	        try {
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0)
      try {
          Desktop.getDesktop().browse(new URI(url));
      } catch (IOException exp) {
-         JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+         JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
          FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
      } catch (URISyntaxException exp) {
          FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -39,7 +39,7 @@ public class NeedAction extends UpdateAction
 	        try {
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0)
        try {
            Desktop.getDesktop().browse(new URI(url));
        } catch (IOException exp) {
-           JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+           JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
        } catch (URISyntaxException exp) {
            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -39,7 +39,7 @@ public class SignAction extends UpdateAction
 	        try {
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -39,7 +39,7 @@ public class UpAction extends UpdateAction
 	        try {
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
-	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+	            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
 	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -45,7 +45,7 @@ public class VideoAction extends UpdateAction
 		try {
 			Desktop.getDesktop().browse(new URI(url));
 		} catch (IOException exp) {
-			JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser"));
+			JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
 			FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 		} catch (URISyntaxException exp) {
 			FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

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

@@ -146,7 +146,7 @@ public class LocalePane extends BasicPane {
         keyVector.addAll(sortKeys);
 
 
-        predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key"), keyVector);
+        predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key"), keyVector);
         for (Map.Entry<Locale, Vector<String>> entry : data.entrySet()) {
             predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue());
         }
@@ -161,7 +161,7 @@ public class LocalePane extends BasicPane {
 
         List<Properties> list = new ArrayList<Properties>();
         Set<String> keys = new HashSet<String>();
-        customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key"));
+        customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key"));
         for (FileNode fileNode : fileNodes) {
             String fileName = fileNode.getName();
             if (fileName.endsWith(".properties")) {
@@ -220,4 +220,4 @@ public class LocalePane extends BasicPane {
     protected String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Locale");
     }
-}
+}

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

@@ -130,7 +130,7 @@ public class PreferencePane extends BasicPane {
         JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         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);
+        jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), advancePane);
         contentPane.add(jtabPane, BorderLayout.NORTH);
 
 
@@ -375,7 +375,7 @@ public class PreferencePane extends BasicPane {
                 dlg.setVisible(true);
             }
         });
-        UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));//sail:提示重启后生效
+        UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
         double p = TableLayout.PREFERRED;
         double rowSize[] = {p};
         double columnSize[] = {p, p, p};
@@ -422,10 +422,10 @@ public class PreferencePane extends BasicPane {
         // 长度单位选择
         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("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 = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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("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 = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate")});
         reportLengthComboBox.setPreferredSize(new Dimension(80, 20));
         reportLengthComboBox.setMinimumSize(new Dimension(80, 20));
         UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":");
@@ -447,7 +447,7 @@ public class PreferencePane extends BasicPane {
         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 notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
         UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port") + ":");
         Component[][] portComponents = {
                 {serverPortLabel, portEditor, notiJlabel},
@@ -483,7 +483,7 @@ public class PreferencePane extends BasicPane {
             }
         });
         panel.setPreferredSize(new Dimension(300, 20));
-        UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));
+        UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
         UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home") + ":");
         Component[][] portComponents = {
                 {serverPortLabel, panel, notiJlabel},
@@ -646,7 +646,7 @@ public class PreferencePane extends BasicPane {
         int rv = JOptionPane.showOptionDialog(
                 null,
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,

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

@@ -47,7 +47,7 @@ public class AboutDialog extends JDialog implements ActionListener {
         sysPane = new SystemInfoPane();
 
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel);
-        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane);
+        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_System"), sysPane);
 
         buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         buttonPanel.add(okButton);

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

@@ -48,7 +48,7 @@ public class ForumAction extends UpdateAction {
         try {
             Desktop.getDesktop().browse(new URI(url));
         } catch (IOException exp) {
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
@@ -74,4 +74,4 @@ public class ForumAction extends UpdateAction {
             return null;
         }
     };
-}
+}

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

@@ -37,7 +37,7 @@ public class SupportQQAction extends UpdateAction {
         try {
             Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ));
         } catch (IOException exp) {
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser"));
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser"));
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
             FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
@@ -52,7 +52,7 @@ public class SupportQQAction extends UpdateAction {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Support_QQ");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_QQ");
         }
 
         @Override
@@ -60,4 +60,4 @@ public class SupportQQAction extends UpdateAction {
             return null;
         }
     };
-}
+}

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

@@ -107,7 +107,7 @@ public class TutorialAction extends UpdateAction {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help");
         }
 
         @Override

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

@@ -88,11 +88,11 @@ public class AlphaFineConfigPane extends BasicPane {
         double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
 
         JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
-        isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend"));
-        isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"));
-        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"));
+        isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend"));
+        isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"));
+        isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon"));
+        isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
+        isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Templates"));
         isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
         JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
         northPane.add(searchConfigPane);
@@ -106,7 +106,7 @@ public class AlphaFineConfigPane extends BasicPane {
         shortcutsField.selectAll();
         shortcutsField.setPreferredSize(new Dimension(100, 20));
         initFieldListener();
-        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":"));
+        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":"));
         northPane.add(shortcutsField);
         UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts"));
         label.setForeground(Color.RED);
@@ -162,7 +162,7 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     private void createOpenPane(JPanel contentPane) {
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Enable"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable"));
         isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine"));
         northPane.add(isEnabledCheckbox);
         contentPane.add(northPane);

designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java

@@ -20,7 +20,7 @@ import java.awt.event.ActionEvent;
 
 public class ProcedureListAction extends UpdateAction {
     public ProcedureListAction() {
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure") + "(P)" + "...");
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + "(P)" + "...");
         this.setMnemonic('P');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
     }

designer-base/src/main/java/com/fr/design/border/UITitledBorder.java

@@ -17,6 +17,10 @@ public class UITitledBorder extends TitledBorder {
         return new UITitledBorder(title);
     }
 
+    public static UITitledBorder createBorderWithTitle(String title, int roundedCorner) {
+        return new UITitledBorder(title, roundedCorner);
+    }
+
     private UITitledBorder(String title) {
         super(
                 BorderFactory.createCompoundBorder(
@@ -37,4 +41,29 @@ public class UITitledBorder extends TitledBorder {
                 new Color(1, 159, 222)
         );
     }
+
+    /**
+     * @param title title
+     * @param roundedCorner corner width 圆弧宽度，即圆角直径
+     */
+    private UITitledBorder(String title, int roundedCorner) {
+        super(
+                BorderFactory.createCompoundBorder(
+                        BorderFactory.createEmptyBorder(
+                                0,
+                                0,
+                                5,
+                                0),
+                        new UIRoundedBorder(
+                                UIConstants.TITLED_BORDER_COLOR,
+                                1,
+                                roundedCorner)
+                ),
+                title,
+                TitledBorder.LEADING,
+                TitledBorder.TOP,
+                null,
+                new Color(1, 159, 222)
+        );
+    }
 }

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

@@ -223,7 +223,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             }
 
             int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
-                    com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
                     JOptionPane.OK_CANCEL_OPTION);
             if (returnVal == JOptionPane.OK_OPTION) {
                 DefaultTreeModel treeModel = (DefaultTreeModel) conditionsTree.getModel();
@@ -447,18 +447,18 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
 
     private void initButtonPane(JPanel buttonPane) {
-        removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+        removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
         buttonPane.add(removeButton);
         removeButton.setIcon(BaseUtils.readIcon("com/fr/base/images/cell/control/remove.png"));
         removeButton.setEnabled(false);
         removeButton.addActionListener(actionListener3);
 
-        moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up"));
+        moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));
         buttonPane.add(moveUpButton);
         moveUpButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/up.png"));
         moveUpButton.addActionListener(actionListener4);
 
-        moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down"));
+        moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"));
         buttonPane.add(moveDownButton);
         moveDownButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/down.png"));
         moveDownButton.addActionListener(actionListener5);
@@ -492,7 +492,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         this.add(conditonTypePane, BorderLayout.NORTH);
         conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM));
 
-        UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + ":");
+        UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + ":");
         conditonTypePane.add(conditionTypeLabel, BorderLayout.WEST);
         conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0));
 
@@ -564,7 +564,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
         addControlPane.add(Box.createHorizontalStrut(STRUT_ONE));
 
-        addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png"));
+        addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png"));
         addButton.setMnemonic('A');
         addControlPane.add(addButton);
         addButton.addActionListener(actionListener2);
@@ -583,7 +583,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Submit_Condition");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition");
     }
 
     // samuel:移出来，方便调用
@@ -971,4 +971,4 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             return newCondition;
         }
     }
-}
+}

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

@@ -138,7 +138,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     }
 
     private boolean isProcedureName(String oldName) {
-        return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"));
+        return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"));
     }
 
 
@@ -383,7 +383,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         private TableDataTree dataTree;
 
         public PreviewTableDataAction(TableDataTree dataTree) {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
             this.setMnemonic('p');
             this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.PREVIEW_ICON_PATH));
             this.dataTree = dataTree;

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

@@ -210,7 +210,7 @@ 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("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") + ":");
+        UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table") + ":");
 
         if (labelSize > 0) {
             Dimension pSize = new Dimension(labelSize, 25);

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

@@ -56,7 +56,7 @@ public class TableDataCreatorProducer {
                 return true;
             }
         };
-        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"),
+        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"),
                 "Proc",
                 "/com/fr/design/images/data/store_procedure.png",
                 StoreProcedure.class, ProcedureDataPane.class) {

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

@@ -113,7 +113,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
      * @return 提示
      */
     public String createTooltip() {
-        return b ? com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") : null;
+        return b ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") : null;
     }
 
     public String getPrefix() {

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

@@ -100,7 +100,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     private ExpandMutableTreeNode initTemplateDataNode(Map<String, TableDataWrapper> templateDataMap) {
-        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-TableData"), TEMPLATE_TABLE_DATA), true);
+        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData"), TEMPLATE_TABLE_DATA), true);
         templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap));
         return templateNode;
     }
@@ -112,7 +112,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     private ExpandMutableTreeNode initStoreProcedureNode(Map<String, TableDataWrapper> storeProcedureMap) {
-        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false);
+        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), STORE_PRECEDURE_DATA), false);
         templateNode.addChildTreeNodes(getNodeArrayFromMap(storeProcedureMap));
         return templateNode;
     }

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

@@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
     private class EditAction extends UpdateAction {
         public EditAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
             this.setMnemonic('E');
             this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH));
         }
@@ -250,7 +250,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     private class RemoveAction extends UpdateAction {
 
         public RemoveAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));
         }
@@ -263,8 +263,8 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 return;
             }
 
-            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.OK_OPTION) {
                 // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧
                 op.removeAction(selectedNO.getName());

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

@@ -127,7 +127,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
         buildTreePanel.add(xxx, BorderLayout.CENTER);
         centerPane.add(buildTreePanel, BorderLayout.NORTH);
         JPanel previewPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
         previewPanel.add(treeDataPreviewButton);
         treeDataPreviewButton.addActionListener(new ActionListener() {
             @Override

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

@@ -57,7 +57,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         // 按钮.
         JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
         northPane.add(testPane, BorderLayout.NORTH);
-        UIButton testButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"));
+        UIButton testButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
         testPane.add(testButton);
         testButton.addActionListener(testConnectionActionListener);
         testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4));
@@ -163,11 +163,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     private void initDialogPane() {
 
-        message.setText(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection") + "...");
+        message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection") + "...");
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
 
-        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"), true);
+        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
         dialog.setSize(new Dimension(268, 118));
         okButton.setEnabled(false);
         JPanel jp = new JPanel();

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

@@ -129,7 +129,7 @@ public class JDBCDefPane extends JPanel {
 		urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
 
 		JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username") + ":"));
+		userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
 		JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":"), passwordTextField}};
 		double[] userRowSize = {p};
@@ -336,7 +336,7 @@ public class JDBCDefPane extends JPanel {
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},

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

@@ -100,7 +100,7 @@ public class PreviewTableModel extends AbstractTableModel {
         } catch (TableDataException e) {
             FRContext.getLogger().error(e.getMessage(), e);
             DesignUtils.errorMessage(e.getMessage());
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error");
         }
     }
 
@@ -149,7 +149,7 @@ public class PreviewTableModel extends AbstractTableModel {
         }
 
         public String getColumnName(int column) {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error");
         }
 
         public int getColumnCount() {
@@ -166,7 +166,7 @@ public class PreviewTableModel extends AbstractTableModel {
 
     private String checkType(int column) {
         if (dateIndexs.contain(column)) {
-            String s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            String s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
             return ("(" + s + ")");
         }
 
@@ -192,23 +192,23 @@ public class PreviewTableModel extends AbstractTableModel {
                 Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column);
                 if (clzz != null) {
                     if (Number.class.isAssignableFrom(clzz)) {
-                    s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
+                    s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Number");//bigdecimal
                     } else if (java.sql.Date.class.isAssignableFrom(clzz)) {
-                        s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+                        s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
                     }
                 }
             }
         } else if (o instanceof 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");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
         } else if (o instanceof java.sql.Date || o instanceof java.util.Date) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
         } else if (o instanceof Number) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Number");//bigdecimal
         } else {
             s = "?";
         }
         return ("(" + s + ")");
     }
-}
+}

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

@@ -171,7 +171,7 @@ public class PreviewTablePane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
     }
 
     private void addLoadedListener(LoadedEventListener l) {
@@ -265,7 +265,7 @@ public class PreviewTablePane extends BasicPane {
      */
     public static EmbeddedTableData previewTableData(TableData tableData, final int keyIndex, final int valueIndex) {
         PreviewTablePane previewTablePane = new PreviewTablePane();
-        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data")));
+        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
         try {
             previewTablePane.populate(tableData);
             previewTablePane.resetPreviewTableColumnColor();
@@ -301,7 +301,7 @@ public class PreviewTablePane extends BasicPane {
             return;
         }
         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
     }
 
     private void populate(TableData tableData) throws Exception {
@@ -420,7 +420,7 @@ public class PreviewTablePane extends BasicPane {
     public static void previewStoreData(final ProcedureDataModel storeProcedureDataModel, final int keyIndex, final int valueIndex) {
         final PreviewTablePane previewTablePane = new PreviewTablePane();
         previewTablePane.storeProcedureDataModel = storeProcedureDataModel;
-        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data")));
+        previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
 
         try {
             previewTablePane.populateStoreDataSQL();
@@ -451,7 +451,7 @@ public class PreviewTablePane extends BasicPane {
         for (int i = 0; i < tableSize; i++) {
             PreviewTablePane previewTablePane = new PreviewTablePane();
             previewTablePane.storeProcedureDataModel = storeProcedureDataModels[i];
-            previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data")));
+            previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
             try {
                 previewTablePane.populateStoreDataSQL();
             } catch (Exception e) {
@@ -464,7 +464,7 @@ public class PreviewTablePane extends BasicPane {
 
             @Override
             protected String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
             }
 
         };

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

@@ -120,7 +120,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
     public class AddParaAction extends UITableEditAction {
         public AddParaAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
             this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
@@ -136,7 +136,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
     }
     private class RemoveParaAction extends UITableEditAction {
         public RemoveParaAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/remove.png"));
         }
 

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

@@ -54,8 +54,8 @@ import java.util.List;
 
 public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	private static final int BOTTOM = 6;
-	private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
-    private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh");
+	private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
+    private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh");
 	private ConnectionTableProcedurePane connectionTableProcedurePane;
 	private UITableEditorPane<ParameterProvider> editorPane;
 
@@ -274,7 +274,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 				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") + ".");
+				// com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
 			}
 		}
 
@@ -383,4 +383,4 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 			return title;
 		}
 	}
-}
+}

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

@@ -27,7 +27,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTable
 		while (serverTableDataNameIterator.hasNext()) {
 			tableDataNameList.add((String)serverTableDataNameIterator.next());
 		}
-		availableTableDataNameList = new CheckBoxList(tableDataNameList.toArray(new String[0]), CheckBoxList.SelectedState.NONE,com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Field_Name"));
+		availableTableDataNameList = new CheckBoxList(tableDataNameList.toArray(new String[0]), CheckBoxList.SelectedState.NONE,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name"));
 		this.add(availableTableDataNameList, BorderLayout.WEST);
 		availableTableDataNameList.addCheckBoxListSelectionChangeListener(this);
 		

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

@@ -214,7 +214,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
         private String[] COLUMN_NAME = {
               	 "", 
               	 com.fr.design.i18n.Toolkit.i18nText("ColumnName"),
-              	 com.fr.design.i18n.Toolkit.i18nText("Type")
+              	 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")
               };
         private int sum = 0;
 

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

@@ -134,7 +134,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
         });
 
         // DataSourceEditor-Insert_Row
-        insertRowButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"));
+        insertRowButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"));
         insertRowButton.setMnemonic('I');
         northPane.add(insertRowButton);
         insertRowButton.addActionListener(new ActionListener() {
@@ -144,7 +144,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
         });
 
         // DataSourceEditor-Remove_Row
-        removeRowButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"));
+        removeRowButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"));
         removeRowButton.setMnemonic('R');
         northPane.add(removeRowButton);
         removeRowButton.addActionListener(new ActionListener() {

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

@@ -123,7 +123,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         this.setLayout(new BorderLayout(gap,0));
         JPanel northPanel = new JPanel(new BorderLayout());
         JPanel type = new JPanel();
-        type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":"));
+        type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"));
         String[] item = {"TXT", "Excel", "XML"};
         fileTypeComboBox = new UIComboBox(item);
         fileTypeComboBox.setPreferredSize(new Dimension(100, 20));
@@ -151,7 +151,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         JPanel setPanel = new JPanel();
         southPanel.add(setPanel, BorderLayout.CENTER);
         setPanel.setPreferredSize(new Dimension(setPanelWidth, 460));
-        setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")));
+        setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
         JPanel controlPane = textSetPanel(width,height);
         setPanel.add(controlPane, BorderLayout.NORTH);
         fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height));
@@ -176,10 +176,10 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         urlText = new UITextField();
         urlText.setPreferredSize(new Dimension(195, 20));
         urlText.setEditable(false);
-        chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection"));
+        chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Selection"));
         chooseFile.addActionListener(chooseFileListener);
 
-        testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"));
+        testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
         testConnection.setEnabled(false);
         testConnection.addActionListener(testConnectionListener);// 测试连接按钮
 
@@ -236,7 +236,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private void previewPanel(JPanel jPanel){
         JPanel previewPanel = new JPanel(new BorderLayout());
-        UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
         preview.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 preview();
@@ -355,8 +355,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         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"));
+        otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other") + ":", false);
+        otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"));
         otherDismenberTextField = new UITextField(8);
         otherDismenberTextField.setEditable(false);
         otherDismenberRadioButton.addChangeListener(new ChangeListener() {
@@ -487,7 +487,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private class RefreshAction extends UITableEditAction {
         public RefreshAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
@@ -800,7 +800,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
         private class RefreshParameterAction extends UpdateAction {
             public RefreshParameterAction() {
-                this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+                this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
                 this.setMnemonic('r');
                 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
             }

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

@@ -51,7 +51,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             "com.mysql.jdbc.Driver",
             "org.gjt.mm.mysql.Driver"
     }; // 需要隐藏面板的数据库的驱动
-    private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
+    private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
     private ConnectionTableProcedurePane connectionTableProcedurePane;
     private JPanel cardpane;
     private CardLayout cardLayout;
@@ -357,7 +357,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
 
     protected class RefreshAction extends UITableEditAction {
         public RefreshAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 

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

@@ -22,7 +22,7 @@ public class ProcedureManagerPane extends LoadingBasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure");
 	}
 
 	public void populate(ProcedureConfig procedureConfig) {

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

@@ -18,7 +18,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 public class StoreProcedureTableModel extends UITableModelAdapter<StoreProcedureParameter> {
 
 	public StoreProcedureTableModel() {
-		super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Type"), com.fr.design.i18n.Toolkit.i18nText("Model"), com.fr.design.i18n.Toolkit.i18nText("Value") });
+		super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"), com.fr.design.i18n.Toolkit.i18nText("Model"), com.fr.design.i18n.Toolkit.i18nText("Value") });
 		if (shouldResponseDoubleClickAction()) {
             table.addMouseListener(new MouseAdapter() {
 
@@ -136,4 +136,4 @@ public class StoreProcedureTableModel extends UITableModelAdapter<StoreProcedure
 		}
 
 	}
-}
+}

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

@@ -67,7 +67,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         JPanel content = (JPanel) jf.getContentPane();
         content.setLayout(new BorderLayout());
-        content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}), BorderLayout.NORTH);
+        content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))}), BorderLayout.NORTH);
         GUICoreUtils.centerWindow(jf);
         jf.setSize(290, 400);
         jf.setVisible(true);
@@ -238,7 +238,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
         Object columnIndex = currentEditor.getValue();
         Object columnName = StringUtils.EMPTY;
 
-        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) {
+        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
         }
 
@@ -254,7 +254,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
         Object columnIndex = currentEditor.getValue();
         Object columnName = StringUtils.EMPTY;
 
-        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) {
+        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
         }
 
@@ -426,4 +426,4 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
     public boolean shouldResponseChangeListener() {
         return true;
     }
-}
+}

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

@@ -219,7 +219,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
         Object columnIndex = currentEditor.getValue();
         Object columnName = StringUtils.EMPTY;
 
-        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) {
+        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
         }
 
@@ -235,7 +235,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
         Object columnIndex = currentEditor.getValue();
         Object columnName = StringUtils.EMPTY;
 
-        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) {
+        if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
         }
 

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

@@ -83,7 +83,7 @@ public class ValueEditorPaneFactory {
      * @return 返回公式编辑器面板
      */
     public static ValueEditorPane createFormulaValueEditorPane() {
-        return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))},
+        return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))},
                 StringUtils.EMPTY, StringUtils.EMPTY);
     }
 
@@ -227,12 +227,12 @@ public class ValueEditorPaneFactory {
      * @return 值编辑器
      */
     public static Editor<?>[] basicEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new TextEditor(),
                 new SpinnerIntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor
         };
@@ -244,15 +244,15 @@ public class ValueEditorPaneFactory {
      * @return 值编辑器
      */
     public static Editor<?>[] formEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
-                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget"))
+                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget"))
         };
     }
 
@@ -262,16 +262,16 @@ public class ValueEditorPaneFactory {
      * @return 值编辑器
      */
     public static Editor<?>[] extendedEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"))
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"))
         };
     }
 
@@ -281,16 +281,16 @@ public class ValueEditorPaneFactory {
      * @return 值编辑器
      */
     public static Editor<?>[] extendedCellGroupEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
@@ -302,7 +302,7 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] cellGroupEditor() {
         return new Editor[]{
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
@@ -316,7 +316,7 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] URLEditors(String popupName, String textEditorValue) {
         return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName),
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None") : popupName),
                 new TextEditor()
         };
     }
@@ -330,9 +330,9 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] dateEditors(String popupName, String textEditorValue) {
         return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
-                new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None") : popupName),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
+                new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))
         };
     }
 
@@ -342,17 +342,17 @@ public class ValueEditorPaneFactory {
      * @return 值编辑器
      */
     public static Editor<?>[] allEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
 //        formulaEditor.setEnabled(true);
         return new Editor[]{
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnSelectedEditor(),
                 //23328 allEditors中删除控件选项
 //                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Widget"))
@@ -369,7 +369,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
         };
     }
@@ -380,12 +380,12 @@ public class ValueEditorPaneFactory {
      * @return 编辑器
      */
     public static Editor<?>[] noCRnoColumnEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
@@ -398,7 +398,7 @@ public class ValueEditorPaneFactory {
      * @return 编辑器
      */
     public static Editor<?>[] numberEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
                 new IntegerEditor(),
                 new DoubleEditor(),
@@ -413,9 +413,9 @@ public class ValueEditorPaneFactory {
      * @return 编辑器
      */
     public static Editor<?>[] dateEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         return new Editor[]{
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 formulaEditor,
                 new ParameterEditor(),
         };
@@ -427,14 +427,14 @@ public class ValueEditorPaneFactory {
      * @return 存储过程的编辑器
      */
     public static Editor<?>[] StoreProcedureEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         formulaEditor.setEnabled(true);
         return new Editor[]{
                 new CursorEditor(),
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor
         };
@@ -451,10 +451,10 @@ public class ValueEditorPaneFactory {
         list.add(new TextEditor());
         list.add(new IntegerEditor());
         list.add(new DoubleEditor());
-        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")));
+        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")));
         list.add(new BooleanEditor());
 
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
         formulaEditor.setEnabled(true);
         list.add(formulaEditor);
 
@@ -498,10 +498,10 @@ public class ValueEditorPaneFactory {
 
         JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane();
         pane.add(paneRight);
-        paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH);
+        paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), BorderLayout.NORTH);
 
         paneRight.add(valueDictPane, BorderLayout.CENTER);
 
         return pane;
     }
-}
+}

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

@@ -98,7 +98,7 @@ public abstract class PluginAbstractLoadingViewPane<V, T> extends PluginAbstract
 
             @Override
             public String textForInstallButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
             }
 
 

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

@@ -59,7 +59,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public String textForInstallButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
             }
 
 
@@ -107,7 +107,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public String textForInstallButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
             }
 
 
@@ -179,12 +179,12 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                         FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"));
                         JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                     } else {
-                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                     }
                 }
             });
         } catch (Exception e1) {
-            JOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -235,4 +235,4 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
     protected String title4PopupWindow() {
         return "All";
     }
-}
+}

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

@@ -69,7 +69,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                 if (result.isSuccess()) {
                                     JOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
@@ -80,7 +80,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                 if (result.isSuccess()) {
                                     JOptionPane.showMessageDialog(null, modifyMessage);
                                 } else {
-                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                 }
                             }
                         });
@@ -118,7 +118,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
         int rv = JOptionPane.showOptionDialog(
                 PluginInstalledPane.this,
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Will_Be_Delete"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.YES_NO_CANCEL_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
@@ -135,7 +135,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
         try {
             controlPane.deletePlugin(plugin);
         } catch (Exception e) {
-            JOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
 
         if (rv == JOptionPane.OK_OPTION) {

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

@@ -95,7 +95,7 @@ public class PluginOperateUtils {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Confirmed"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.INFORMATION_MESSAGE
                 );

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

@@ -136,7 +136,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
      */
     public void loadOnSuccess(List<PluginView> plugins) {
         controlPane.loadPlugins(plugins);
-        tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update") + "(" + plugins.size() + ")");
+        tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update") + "(" + plugins.size() + ")");
     }
 
     /**
@@ -201,7 +201,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
                     FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
                     JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                 } else {
-                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                 }
             }
         });
@@ -221,4 +221,4 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
     protected String title4PopupWindow() {
         return "Update";
     }
-}
+}

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

@@ -104,7 +104,7 @@ public class PluginUtils {
             writer.flush();
             writer.close();
         } else {
-            throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Connect_Server_Error"));
+            throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
         }
     }
 

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

@@ -380,7 +380,7 @@ public class PluginWebBridge {
         int rv = JOptionPane.showOptionDialog(
                 null,
                 message,
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,

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

@@ -65,7 +65,7 @@ public class WebViewDlgHelper {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.INFORMATION_MESSAGE
                 );
@@ -82,7 +82,7 @@ public class WebViewDlgHelper {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.INFORMATION_MESSAGE
                 );
@@ -202,7 +202,7 @@ public class WebViewDlgHelper {
         int rv = JOptionPane.showConfirmDialog(
                 null,
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.INFORMATION_MESSAGE
         );
@@ -249,7 +249,7 @@ public class WebViewDlgHelper {
         UITabbedPane tabbedPane = new UITabbedPane();
         PluginInstalledPane installedPane = new PluginInstalledPane();
         tabbedPane.addTab(installedPane.tabTitle(), installedPane);
-        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane));
+        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update"), new PluginUpdatePane(tabbedPane));
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane));
         return tabbedPane;
     }
@@ -266,7 +266,7 @@ public class WebViewDlgHelper {
                         }
                     });
                 } catch (PluginVerifyException e) {
-                    JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                     return false;
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -306,7 +306,7 @@ public class WebViewDlgHelper {
                         int rv = JOptionPane.showConfirmDialog(
                                 null,
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"),
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                                 JOptionPane.OK_CANCEL_OPTION,
                                 JOptionPane.INFORMATION_MESSAGE
                         );

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -43,7 +43,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
@@ -63,7 +63,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -41,7 +41,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
@@ -56,7 +56,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java

@@ -25,7 +25,7 @@ public class ModifyStatusCallback implements PluginTaskCallback{
             String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Been_Disabled") : com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Been_Actived");
             JOptionPane.showMessageDialog(null, modifyMessage);
         } else {
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@@ -31,7 +31,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
@@ -45,7 +45,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -43,7 +43,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
@@ -63,7 +63,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             int rv = JOptionPane.showOptionDialog(
                     null,
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.INFORMATION_MESSAGE,
                     null,
@@ -77,7 +77,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@@ -36,7 +36,7 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

@@ -50,7 +50,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
             PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
         } else {
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 }

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

@@ -167,7 +167,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
         this.addMouseMotionListener(this);
         this.setBorder(null);
         this.setForeground(new Color(58, 56, 58));
-        this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Song_TypeFace"), 0, 12));
+        this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"), 0, 12));
         openedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
         selectedIndex = openedTemplate.size() - 1;
         Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);
@@ -695,7 +695,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("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
-                            + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+                            + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                     this.repaint();
                     return;
                 }

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

@@ -123,7 +123,7 @@ public class FunctionManagerPane extends BasicPane {
             JPanel reportletNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
             classNameTextField = new UITextField(25);
             reportletNamePane.add(classNameTextField);
-            UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+            UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
             browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width,  classNameTextField.getPreferredSize().height));
             reportletNamePane.add(browserButton);
             browserButton.addActionListener(new ActionListener() {
@@ -138,7 +138,7 @@ public class FunctionManagerPane extends BasicPane {
 	                    }).setVisible(true);
                 }
             });
-            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
             editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
             reportletNamePane.add(editorButton);
             editorButton.addActionListener(createEditorButtonActionListener());
@@ -211,4 +211,4 @@ public class FunctionManagerPane extends BasicPane {
             return editing;
         }
     }
-}
+}

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

@@ -79,7 +79,7 @@ public class JavaEditorPane extends BasicPane {
 
         UIScrollPane jt = new UIScrollPane(javaText);
         JPanel toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Save"));
+        UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"));
         saveButton.setAction(new SaveAction());
         UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Compile"));
         compileButton.setAction(new CompilerAction());
@@ -141,7 +141,7 @@ public class JavaEditorPane extends BasicPane {
 
     private class SaveAction extends AbstractAction { //新建文件命令
         public SaveAction() {
-            super(com.fr.design.i18n.Toolkit.i18nText("Save"));
+            super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"));
         }
         public void actionPerformed(ActionEvent e) {
             saveTextToFile(javaText.getText());

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

@@ -39,7 +39,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
 
 		// 添加一公式编辑器按钮
 		formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
-		formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula") + "...");
+		formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "...");
 		formulaTextFieldButton.setPreferredSize(new Dimension(24, 20));
 		formulaTextFieldButton.setOpaque(false);
 		formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR));

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

@@ -53,7 +53,7 @@ public class HyperlinkFilterHelper {
     }
 
     private static boolean whetherAddFormLink(JTemplate jTemplate, String itemName) {
-        String formName = com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link");
+        String formName = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link");
         return !(jTemplate.isJWorkBook() && ComparatorUtils.equals(itemName, formName));
     }
 }

designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java

@@ -228,7 +228,7 @@ public class UISimpleListControlPane extends BasicPane {
      */
     private class MoveUpItemAction extends UpdateAction {
         public MoveUpItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));
             this.setMnemonic('U');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/control/up.png"));
@@ -261,7 +261,7 @@ public class UISimpleListControlPane extends BasicPane {
      */
     private class MoveDownItemAction extends UpdateAction {
         public MoveDownItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"));
             this.setMnemonic('D');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/control/down.png"));

designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java

@@ -55,7 +55,7 @@ public class WidgetConstants {
 	public static final int MULTI_FILE = 19;
 	
 	// 默认控件
-	public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config");
+	public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Config");
 	
 	// 报表控件，与默认控件不同，比如label，table,SEARCH等，这里是不需要的
 	public static final String REPORT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Default_Widget_Config");
@@ -63,11 +63,11 @@ public class WidgetConstants {
 	public static final String FORM_CHARTWIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Chart_Widget_Config");
 	
 	// 表单容器控件
-	public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container");
+	public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Container");
 	
 	public  static final String POLY_REPORT_WIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Poly_Report_Component");
 	// 服务器预定义控件
-	public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config");
+	public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config");
 	
 	// 服务器组合控件
 	public static final String COMB_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Comb_Widget_Config");
@@ -75,4 +75,4 @@ public class WidgetConstants {
 	// 服务器自定义控件
 	public static final String CUSTOM_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Custom_Widget_Config");
 	
-}
+}

designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@@ -130,10 +130,10 @@ public abstract class WidgetOption implements Serializable {
             BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
             DateEditor.class);
 
-    public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree"),
+    public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
             BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class);
 
-    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
+    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
             TreeComboBoxEditor.class);
 
     public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
@@ -192,7 +192,7 @@ public abstract class WidgetOption implements Serializable {
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
             BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
 
-    public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
+    public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
             IframeEditor.class);
 
 }

designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java

@@ -46,7 +46,7 @@ import java.util.Date;
 
 public class UICalendarPanel extends JPanel {
     private static final Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12);
-    private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Black_Font"),0,12);
+    private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Black_Font"),0,12);
     private static final int WEEKDAY_COUNT = 7;
     private static final int TOTAL_DAYS_COUNT = 42;
 
@@ -161,9 +161,9 @@ public class UICalendarPanel extends JPanel {
         pWeeks.setPreferredSize(new Dimension(216, 22));
         pWeeks.setBackground(new Color(0xFFFFFF));
         pWeeks.setOpaque(true);
-        String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"),
-                com.fr.design.i18n.Toolkit.i18nText("Tue"),com.fr.design.i18n.Toolkit.i18nText("Wed"),com.fr.design.i18n.Toolkit.i18nText("Thu"),
-                com.fr.design.i18n.Toolkit.i18nText("Fri"),com.fr.design.i18n.Toolkit.i18nText("Sat")
+        String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tue"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Wed"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Thu"),
+                com.fr.design.i18n.Toolkit.i18nText("Fri"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sat")
         };
         for (int i = 1; i <= WEEKDAY_COUNT; i++) {
             UILabel label = new UILabel();
@@ -202,7 +202,7 @@ public class UICalendarPanel extends JPanel {
         sPane.setPreferredSize(new Dimension(216, 30));
         sPane.setBackground(Color.WHITE);
         sPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 6));
-        UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Time") + ":");
+        UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Time") + ":");
         timeLabel.setBorder(BorderFactory.createEmptyBorder(0,9,0,5));
         timeLabel.setFont(FONT_SONG);
         sPane.add(timeLabel);
@@ -769,4 +769,4 @@ public class UICalendarPanel extends JPanel {
         frame.getContentPane().add(calendarPanel);
         frame.setVisible(true);
     }
-}
+}

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

@@ -1,13 +1,11 @@
 package com.fr.design.gui.frpane;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.utils.gui.JListUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
@@ -20,14 +18,14 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-
-import com.fr.stable.StringUtils;
-import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.design.utils.gui.JListUtils;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class EditingStringListPane extends BasicBeanPane<List<String>> {
 
@@ -60,8 +58,8 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 		addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add"));
 		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify"));
 		removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove"));
-		moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up"));
-		moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down"));
+		moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));
+		moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"));
 
 		JPanel eastPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
 		eastPane.add(editButton);
@@ -151,7 +149,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 			public void actionPerformed(ActionEvent e) {
 				Object selected = jlist.getSelectedValue();
 				if (selected != null) {
-					int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete") + selected.toString() + "?");
+					int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?");
 					if (re == JOptionPane.OK_OPTION) {
 						JListUtils.removeSelectedListItems(jlist);
 					}
@@ -205,4 +203,4 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 		}
 		return lists;
 	}
-}
+}

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

@@ -82,12 +82,12 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink");
     }
 
     @Override
     protected String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_Hyperlink");
     }
 
     public void populate(NameJavaScriptGroup hyperlinkArray) {

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

@@ -73,7 +73,7 @@ public class ImgChoosePane extends BasicPane {
 	}
 
 	private void initButton() {
-		chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"));
+		chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture"));
 		chooseButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 
@@ -115,6 +115,6 @@ public class ImgChoosePane extends BasicPane {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Image");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
 	}
 }

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

@@ -51,7 +51,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
      */
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
-        UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": ");
+        UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_A_Tree_DataSource_To_Build") + ": ");
         treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
         treeTableDataComboBox.setPreferredSize(new Dimension(180, 20));
         selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
@@ -78,9 +78,9 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
         formulaEditor.setEnabled(true);
         textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
         Component[][] coms = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"),
                         valuePane},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"),
                         textPane}};
 
         double p = TableLayout.PREFERRED;
@@ -230,4 +230,4 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
         valuePane.populate(1);
     }
 
-}
+}

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

@@ -59,7 +59,7 @@ public class JTreeControlPane extends ControlPane {
         JPanel northPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
         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()));
+        DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + 1, new TreeNodeAttr()));
         tree = new JTree(defaultTreeModel);
         tree.setRootVisible(false);
         ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer);
@@ -134,7 +134,7 @@ public class JTreeControlPane extends ControlPane {
         for (int i = 0; i < count; i++) {
 
             DefaultMutableTreeNode node4add = new DefaultMutableTreeNode(
-                    new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), treeNodeAttr[i]));
+                    new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + (i + 1), treeNodeAttr[i]));
             node4root.add(node4add);
             node4root = node4add;
         }
@@ -193,7 +193,7 @@ public class JTreeControlPane extends ControlPane {
 
         public AddTreeNodeAction(NameableCreator[] creators) {
             this.creator = creators[0];
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
             this.setMnemonic('A');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
         }
@@ -224,15 +224,15 @@ public class JTreeControlPane extends ControlPane {
 
     private class RemoveTreeNodeAction extends UpdateAction {
         public RemoveTreeNodeAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
         }
 
         public void actionPerformed(ActionEvent e) {
             // TODO remove tree node
-            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (val != JOptionPane.OK_OPTION) {
                 return;
             }
@@ -267,4 +267,4 @@ public class JTreeControlPane extends ControlPane {
             return this;
         }
     };
-}
+}

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

@@ -29,7 +29,7 @@ public abstract class ListenerUpdatePane extends BasicBeanPane<Listener> {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event");
 	}
 
     @Override

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

@@ -73,7 +73,7 @@ public class RegFieldPane extends RegPane {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
             initRegErrorMsgField();
-            UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip"));
+            UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
             tipLabel.setPreferredSize(new Dimension(60, 20));
             JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);

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

@@ -76,7 +76,7 @@ public class RegPane extends BasicPane {
         regComboBox.setRenderer(listCellRender);
 
         JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
         jPanel.add(contentPane, BorderLayout.NORTH);
@@ -119,7 +119,7 @@ public class RegPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule");
     }
 
     private int getRegTypeIndex(RegExp regex) {
@@ -330,7 +330,7 @@ public class RegPane extends BasicPane {
         private static final String REG_PATTERN = "0123456789-*# ";
 
         private UIComboBox dataTypeComboBox;
-        private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")};
+        private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
         DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType);
         public RegPhonePane() {
             this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
@@ -490,11 +490,11 @@ public class RegPane extends BasicPane {
                                                       int index, boolean isSelected, boolean cellHasFocus) {
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             if (value instanceof NoneReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None"));
             } else if (value instanceof LengthReg){
                 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"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"));
             } else if (value instanceof PhoneReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone"));
             } else if (value instanceof MobileReg) {
@@ -504,10 +504,10 @@ public class RegPane extends BasicPane {
             } else if (value instanceof PostCardReg){
                 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"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
             }
             return this;
         }
 
     };
-}
+}

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

@@ -99,7 +99,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Create_Tree");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Create_Tree");
 	}
 
 	@Override
@@ -108,7 +108,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	}
 
 	NameableCreator treeNode = new NameObjectCreator(
-		com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation"),
 		"/com/fr/design/images/data/source/jdbcTableData.png",
 		TreeNodeAttr.class);
 

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

@@ -380,10 +380,10 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
         UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"),
                 new ReportletHyperlink(), ReportletHyperlinkPane.class);
 
-        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"),
+        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
                 new EmailJavaScript(), EmailPane.class);
 
-        UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"),
+        UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
                 new WebHyperlink(), WebHyperlinkPane.class);
         data.add(reportlet);
         data.add(email);
@@ -411,4 +411,4 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
     public boolean shouldResponseChangeListener() {
         return true;
     }
-}
+}

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

@@ -386,7 +386,7 @@ public class UICorrelationPane extends JPanel implements UIObserver {
      */
     public static void main(String... args) {
         JFrame jf = new JFrame("test");
-        final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")};
+        final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")};
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         JPanel content = (JPanel) jf.getContentPane();
         content.setLayout(new BorderLayout());

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

@@ -36,7 +36,7 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 	public UINumberDragPane(double minValue, double maxValue, double dierta) {
 		dragBar = new NumberDragBar((int) minValue, (int) maxValue);
 		spinner = new UISpinner(minValue, maxValue, dierta, minValue);
-		spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation"));
+		spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
 		this.setLayout(new BorderLayout(4, 0));
 		this.add(spinner, BorderLayout.EAST);
 		this.add(dragBar, BorderLayout.CENTER);
@@ -137,4 +137,4 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 	public boolean shouldResponseNameListener() {
 		return true;
 	}
-}
+}

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

@@ -113,10 +113,10 @@ public class UITabbedPane extends JTabbedPane{
      * @param i tab索引
      */
     public void doRemoveTab(int i){
-        int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove")
+        int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove")
                 , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
         if (re == JOptionPane.OK_OPTION) {
             super.removeTabAt(i);
         }
     }
-}
+}

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

@@ -50,7 +50,7 @@ public class LayerDataControlPane extends ControlPane {
         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)));
+        DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + 1, new LayerConfig(1)));
         tree.setRootVisible(false);
         ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer);
         tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
@@ -143,7 +143,7 @@ public class LayerDataControlPane extends ControlPane {
 
         public AddTreeNodeAction() {
 
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
             this.setMnemonic('A');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
         }
@@ -157,7 +157,7 @@ public class LayerDataControlPane extends ControlPane {
             do {
                 nodeCount++;
             } while ((innerNode = innerNode.getNextNode()) != null);
-            NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + nodeCount, new LayerConfig(nodeCount));
+            NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + nodeCount, new LayerConfig(nodeCount));
 
             node.getLastLeaf().add(new DefaultMutableTreeNode(nameable));
             defaultTreeModel.reload();
@@ -170,15 +170,15 @@ public class LayerDataControlPane extends ControlPane {
 
         public RemoveTreeNodeAction() {
 
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
         }
 
         public void actionPerformed(ActionEvent e) {
             // TODO remove tree node
-            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?",
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (val != JOptionPane.OK_OPTION) {
                 return;
             }
@@ -208,7 +208,7 @@ public class LayerDataControlPane extends ControlPane {
             for (int i = 0; i < count; i++) {
 
                 DefaultMutableTreeNode node4add = new DefaultMutableTreeNode(
-                    new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), layerConfigs[i].clone()));
+                    new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + (i + 1), layerConfigs[i].clone()));
                 node4root.add(node4add);
                 node4root = node4add;
             }

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

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

designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java

@@ -49,13 +49,13 @@ public class AlignmentComboBox extends UIComboBox {
 		if (alignment == Constants.CENTER) {//0
 			return com.fr.design.i18n.Toolkit.i18nText("Center");
 		} else if (alignment == Constants.TOP) {//1
-			return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top");
 		} else if (alignment == Constants.LEFT) {//2
-			return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left");
 		} else if (alignment == Constants.BOTTOM) {//3
-			return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom");
 		} else if (alignment == Constants.RIGHT) { //4
-			return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right");
 		} else if (alignment == Constants.DISTRIBUTED) { //added by Kevin Wang 6
 			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Distibuted");
 		} else {
@@ -77,4 +77,4 @@ public class AlignmentComboBox extends UIComboBox {
 			return this;
 		}
 	}
-}
+}

designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java

@@ -18,13 +18,13 @@ public class DictionaryConstants {
 	
 	public final static String[] regexpsDisplays = new String[] {
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
-		com.fr.design.i18n.Toolkit.i18nText("Required"),
-		com.fr.design.i18n.Toolkit.i18nText("Length"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"),
 		com.fr.design.i18n.Toolkit.i18nText("Float"),
 		com.fr.design.i18n.Toolkit.i18nText("Email"),
 		com.fr.design.i18n.Toolkit.i18nText("Phone"),
 		com.fr.design.i18n.Toolkit.i18nText("MobilePhone"),
-		com.fr.design.i18n.Toolkit.i18nText("IDCard"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_IDCard"),
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_PostCode"),
 		com.fr.design.i18n.Toolkit.i18nText("Custom")};
 	
@@ -83,4 +83,4 @@ public class DictionaryConstants {
 		"jpg,png,gif",
 		"doc,xls,ppt"		
 	};
-}
+}

designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java

@@ -3,12 +3,11 @@
  */
 package com.fr.design.gui.icombobox;
 
-import java.awt.Component;
+import com.fr.data.util.SortOrder;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JList;
-
-import com.fr.data.util.SortOrder;
+import java.awt.Component;
 
 
 /**
@@ -53,11 +52,11 @@ public class SortOrderComboBox extends UIComboBox {
                 SortOrder sortOrder = (SortOrder) value;
 
                 if (sortOrder.getOrder() == SortOrder.ASC) {
-                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending"));
+                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Ascending"));
                 } else if (sortOrder.getOrder() == SortOrder.DESC) {
-                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Descending"));
+                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Descending"));
                 } else if (sortOrder.getOrder() == SortOrder.ORIGINAL) {
-                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Original"));
+                    this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Original"));
                 }
             }
 
@@ -70,4 +69,4 @@ public class SortOrderComboBox extends UIComboBox {
             new SortOrder(SortOrder.DESC),
             new SortOrder(SortOrder.ORIGINAL)
     };
-}
+}

designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java

@@ -45,13 +45,13 @@ public class UIMenuTable extends JTable {
 	public void editingEvent(int rowIndex, int mouseY) {
 		selectedRowIndex = rowIndex;
 		repaint();
-		
+
 		final UIMenuNameableCreator nameObject = UIMenuTable.this.getLine(rowIndex);
-		
+
 		final BasicBeanPane<Object> baseShowPane = nameObject.getPane();
-		
+
 		final Object showValue = nameObject.getObj();
-		
+
 		baseShowPane.populateBean(showValue);
 
         UIDialog dialog = baseShowPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionAdapter() {
@@ -60,13 +60,13 @@ public class UIMenuTable extends JTable {
 				fireTargetChanged();
 			}
 		});
-		
+
 		dialog.setSize(500, 600);
 		GUICoreUtils.centerWindow(dialog);
-		
+
 		dialog.setVisible(true);
 	}
-	
+
 	protected Color getRenderBackground(int row) {
 		if(selectedRowIndex == row ) {
 			return UIConstants.SKY_BLUE;
@@ -76,7 +76,7 @@ public class UIMenuTable extends JTable {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param value 该行列的值(字符串)
 	 * @param row
 	 * @param column
@@ -113,7 +113,7 @@ public class UIMenuTable extends JTable {
 	public void removeLine(int rowIndex) {
 		((UIMenuTableDataModel)dataModel).removeLine(rowIndex);
 	}
-	
+
 	/**
 	 * 清除所有的内容
 	 */
@@ -217,7 +217,7 @@ public class UIMenuTable extends JTable {
 		UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"),
 				new EmailJavaScript(), EmailPane.class);
 
-		UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"),
+		UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
 				new WebHyperlink(), WebHyperlinkPane.class );
 		data.add(reportlet);
 		data.add(email);
@@ -229,4 +229,4 @@ public class UIMenuTable extends JTable {
 		jf.setSize(400, 400);
 		jf.setVisible(true);
 	}
-}
+}

designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java

@@ -74,7 +74,7 @@ public class UIMenuTableUI extends UITableUI{
 			@Override
 			public void mousePressed(MouseEvent e) {
 				if (e.getX() >= table.getWidth() - 20) {
-					int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?",
+					int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
 							com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 					if (val == JOptionPane.OK_OPTION) {
 						uiTable.removeLine(table.rowAtPoint(e.getPoint()));
@@ -121,4 +121,4 @@ public class UIMenuTableUI extends UITableUI{
 			}
 		};
 	}
-}
+}

designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java

@@ -15,7 +15,6 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
 
 import com.fr.general.ComparatorUtils;
 
@@ -255,9 +254,9 @@ public abstract class AbstractPropertyTable extends JTable {
         @Override
         public String getColumnName(int column) {
             if (column == 0) {
-                return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Property");
             } else {
-                return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Value");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Property_Value");
             }
         }
 

designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java

@@ -132,7 +132,7 @@ public class UITableUI extends BasicTableUI {
                     return;
                 }
                 if (!table.isEditing()) {
-                    int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?",
+                    int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
                             com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
                     if (val == JOptionPane.OK_OPTION) {
                         ((UITable) table).removeLine(table.rowAtPoint(e.getPoint()));
@@ -222,4 +222,4 @@ public class UITableUI extends BasicTableUI {
         installKeyboardActions();
     }
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java

@@ -106,7 +106,7 @@ public class UITableEditorPane<T> extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("TableData_Dynamic_Parameter_Setting");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData_Dynamic_Parameter_Setting");
     }
 
     public void populate(T[] objs) {
@@ -153,4 +153,4 @@ public class UITableEditorPane<T> extends BasicPane {
         tableModel.stopCellEditing();
     }
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -182,7 +182,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 
 	protected abstract class AddTableRowAction extends UITableEditAction {
 		public AddTableRowAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Insert"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
 		}
 
@@ -252,7 +252,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 				component = DesignerContext.getDesignerFrame();
 			}
 			int val = JOptionPane.showConfirmDialog(component,
-					com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"),
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"),
 					JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 			if (val != JOptionPane.OK_OPTION) {
 				return;
@@ -281,7 +281,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 
 	protected class MoveUpAction extends UITableEditAction {
 		public MoveUpAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png"));
 		}
 
@@ -305,7 +305,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 	protected class MoveDownAction extends UITableEditAction {
 
 		public MoveDownAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png"));
 		}
 

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@@ -1,17 +1,14 @@
 package com.fr.design.gui.itree.refreshabletree;
 
-import java.awt.Color;
+import com.fr.data.impl.TreeAttr;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.layout.FRGUIPaneFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
-import com.fr.design.gui.ilable.UILabel;
 import javax.swing.JPanel;
 
-import com.fr.data.impl.TreeAttr;
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
-
 
 public class TreeRootPane extends BasicPane {
 	
@@ -31,7 +28,7 @@ public class TreeRootPane extends BasicPane {
 
 		JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not"));
+		checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not"));
 		checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
 		checkTypePane.add(checkTypeCheckBox);
@@ -39,7 +36,7 @@ public class TreeRootPane extends BasicPane {
 
 		JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async"));
+		loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async"));
 		loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
 		loadTypePane.add(loadTypeCheckBox);
@@ -47,14 +44,14 @@ public class TreeRootPane extends BasicPane {
 
 		JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only")));
+		leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")));
 		layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
 		this.add(leafSelectPane);
 
         JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
 		checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path")));
+		returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")));
 		returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
 		this.add(returnFullPathPane);
@@ -82,4 +79,4 @@ public class TreeRootPane extends BasicPane {
 
 		return treeAttr;
 	}
-}
+}

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

@@ -55,7 +55,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     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("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)")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
@@ -181,12 +181,12 @@ 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"));
+        hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"));
+        vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"));
         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"));
+        textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
+        rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
         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"));
@@ -198,8 +198,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         JPanel jp1 = new JPanel(new BorderLayout());
         basicPane = new JPanel();
         seniorPane = new JPanel();
-        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane());
-        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 290, 24, seniorPane());
+        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
+        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
 
         jp1.add(basicPane, BorderLayout.NORTH);
         jp1.add(seniorPane, BorderLayout.CENTER);
@@ -212,9 +212,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-StyleAlignment_Pane_Horizontal") + "   ", SwingConstants.LEFT), hPaneContainer},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + "   ", SwingConstants.LEFT), hPaneContainer},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical") + "   ", SwingConstants.RIGHT), vPaneContainer},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + "   ", SwingConstants.RIGHT), vPaneContainer},
                 new Component[]{null, null}
         };
         double[] rowSize = {p, p, p, p, p, p};
@@ -233,7 +233,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 new Component[]{null, null},
                 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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + "   ", SwingConstants.LEFT), textRotationComboBox},
                 new Component[]{null, rotationBarCC},
                 new Component[]{null, null},
         };
@@ -269,7 +269,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         Component[][] components = new Component[][]{
                 new Component[]{null, null, null},
                 new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)},
-                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right")), SwingConstants.CENTER)},
+                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)},
                 new Component[]{null, null, null},
                 new Component[]{null, null, null},
                 new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
@@ -358,11 +358,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
             return style;
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) {
             Integer h = this.hAlignmentPane.getSelectedItem();
             style = style.deriveHorizontalAlignment(h == null ? -1 : h);
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"))) {
             Integer vAlign = this.vAlignmentPane.getSelectedItem();
             if (vAlign != null) {
                 style = style.deriveVerticalAlignment(vAlign);
@@ -405,7 +405,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
 
     private Style updateTextRotation(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))) {
             if (this.textRotationComboBox.getSelectedIndex() != 0) {
                 style = style.deriveVerticalText(Style.VERTICALTEXT);
                 style = style.deriveRotation(0);
@@ -462,4 +462,4 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
      */
     public void setGlobalName(String name) {
     }
-}
+}

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

@@ -76,7 +76,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style") + "    ", SwingConstants.LEFT), currentLineCombo},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style") + "    ", SwingConstants.LEFT), currentLineCombo},
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + "    ", SwingConstants.LEFT), currentLineColorPane},
                 new Component[]{null, null},
@@ -91,11 +91,11 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
-        borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border"), 280, 24, panel);
+        borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel);
         this.add(borderPanel, BorderLayout.NORTH);
 
         backgroundPane = new BackgroundPane();
-        backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), 280, 24, backgroundPane);
+        backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundPane);
         this.add(backgroundPanel, BorderLayout.CENTER);
         initAllNames();
         outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
@@ -148,7 +148,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
     }
 
     @Override
@@ -250,4 +250,4 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     public void setGlobalName(String name) {
 
     }
-}
+}

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

@@ -83,7 +83,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_FRFont");
     }
 
     /**
@@ -133,7 +133,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
      */
     public FRFont update(FRFont frFont) {
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))) {
             frFont = frFont.applyName((String) fontNameComboBox.getSelectedItem());
         }
         if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"))) {
@@ -265,7 +265,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
 
     private void initAllNames() {
         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"));
+        fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"));
         fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
         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"));

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

@@ -108,7 +108,7 @@ public class FormatPane extends AbstractBasicStylePane  implements GlobalNameObs
 
 
         frFontPane = new FRFontPane();
-        UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont"), SwingConstants.LEFT);
+        UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT);
         JPanel fontPane = new JPanel(new BorderLayout());
         fontPane.add(font, BorderLayout.NORTH);
 
@@ -197,7 +197,7 @@ public class FormatPane extends AbstractBasicStylePane  implements GlobalNameObs
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
     }
 
     /**

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/TipWindow.java

@@ -253,7 +253,7 @@ class TipWindow extends JWindow implements ActionListener {
 		}
 		else {
 			panel.setOpaque(false);
-			JLabel label = new JLabel(FocusableTip.getString("FocusHotkey"));
+			JLabel label = new JLabel(FocusableTip.getString("Fine-Design_Basic_Focus_Hotkey"));
 			Color fg = UIManager.getColor("Label.disabledForeground");
 			Font font = textArea.getFont();
 			font = font.deriveFont(font.getSize2D() - 1.0f);

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

@@ -52,12 +52,12 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
         targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
 
         final JPanel newWindowConfPane = new JPanel();
-        newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ": "));
+        newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ": "));
         heightTextFiled = new UINumberField();
         heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
         heightTextFiled.setPreferredSize(new Dimension(40, 20));
         newWindowConfPane.add(heightTextFiled);
-        newWindowConfPane.add(new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ": "));
+        newWindowConfPane.add(new UILabel("  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ": "));
         widthTextFiled = new UINumberField();
         widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
         widthTextFiled.setPreferredSize(new Dimension(40, 20));
@@ -142,4 +142,4 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
         link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue());
     }
 
-}
+}

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

@@ -65,7 +65,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
         reportPathTextField = new UITextField(20);
         reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
 
-        browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+        browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
         browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
         reportletNamePane.add(browserButton, BorderLayout.EAST);
         browserButton.addActionListener(new ActionListener() {

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

@@ -45,9 +45,9 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
 
         this.add(parameterViewPane, BorderLayout.CENTER);
 
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
 
-        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters"));
+        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
         this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEFT), BorderLayout.SOUTH);
     }
 

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

@@ -3,7 +3,6 @@ package com.fr.design.hyperlink;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.constants.LayoutConstants;
 
-import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -56,7 +55,7 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
         if (this.needRenamePane) {
             headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL));
             itemNameTextField = new UITextField();
-            headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), BorderLayout.NORTH);
+            headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH);
             headerPane.add(urlWithHelp, BorderLayout.CENTER);
         } else {
             headerPane.add(urlWithHelp, BorderLayout.NORTH);
@@ -106,4 +105,4 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
         return new JPanel();
     }
 
-}
+}

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

@@ -42,16 +42,16 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
 
         parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         this.add(parameterViewPane, BorderLayout.CENTER);
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
 
         useCJKCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Use_CJK_To_Encode_Parameter"));
-        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters"));
+        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
         this.add(GUICoreUtils.createFlowPane(new Component[]{useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH);
     }
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link");
     }
 
     @Override
@@ -125,4 +125,4 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
     public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) {
         this.extendParametersCheckBox = extendParametersCheckBox;
     }
-}
+}