Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0

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/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/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/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("FR-Designer_Remove"),
                     JOptionPane.OK_CANCEL_OPTION);
             if (returnVal == JOptionPane.OK_OPTION) {
                 DefaultTreeModel treeModel = (DefaultTreeModel) conditionsTree.getModel();
@@ -453,12 +453,12 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         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);
@@ -971,4 +971,4 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             return newCondition;
         }
     }
-}
+}

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;
     }

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

@@ -263,7 +263,7 @@ 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() + "?",
+            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("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.OK_OPTION) {
                 // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧

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};

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

@@ -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") + ".");
 			}
 		}
 

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));
@@ -179,7 +179,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_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);// 测试连接按钮
 

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/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/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/JListControlPane.java

@@ -481,7 +481,7 @@ public abstract class JListControlPane extends JControlPane {
      */
     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"));
@@ -514,7 +514,7 @@ public abstract class JListControlPane extends JControlPane {
      */
     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/controlpane/UIListControlPane.java

@@ -569,7 +569,7 @@ public abstract class UIListControlPane extends UIControlPane {
      */
     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"));
@@ -602,7 +602,7 @@ public abstract class UIListControlPane extends UIControlPane {
      */
     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/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/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"),
+        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("Tue"),com.fr.design.i18n.Toolkit.i18nText("Wed"),com.fr.design.i18n.Toolkit.i18nText("Thu"),
+                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("Sat")
+                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 com.fr.design.beans.BasicBeanPane;
-import java.awt.Component;
+import com.fr.design.gui.ibutton.UIButton;
-import java.awt.event.ActionEvent;
+import com.fr.design.layout.FRGUIPaneFactory;
-import java.awt.event.ActionListener;
+import com.fr.design.utils.gui.GUICoreUtils;
-import java.awt.event.MouseAdapter;
+import com.fr.design.utils.gui.JListUtils;
-import java.awt.event.MouseEvent;
+import com.fr.stable.StringUtils;
-import java.util.ArrayList;
-import java.util.List;
 
 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 java.awt.BorderLayout;
-import com.fr.design.beans.BasicBeanPane;
+import java.awt.Component;
-import com.fr.design.gui.ibutton.UIButton;
+import java.awt.event.ActionEvent;
-import com.fr.design.layout.FRGUIPaneFactory;
+import java.awt.event.ActionListener;
-
+import java.awt.event.MouseAdapter;
-import com.fr.stable.StringUtils;
+import java.awt.event.MouseEvent;
-import com.fr.design.utils.gui.GUICoreUtils;
+import java.util.ArrayList;
-import com.fr.design.utils.gui.JListUtils;
+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"));
+		moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));
-		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"));
 
 		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/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();
@@ -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

@@ -231,7 +231,7 @@ public class JTreeControlPane extends ControlPane {
 
         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") + "?",
+            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("FR-Designer_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/UICorrelationComboBoxPane.java

@@ -383,7 +383,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
         UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_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/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

@@ -177,7 +177,7 @@ public class LayerDataControlPane extends ControlPane {
 
         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") + "?",
+            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("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (val != JOptionPane.OK_OPTION) {
                 return;

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("Fine-Design_Basic_Required"),
-		com.fr.design.i18n.Toolkit.i18nText("Length"),
+		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 java.awt.Component;
-import com.fr.data.util.SortOrder;
 
 
 /**
@@ -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/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/hyperlink/ReportletHyperlinkPane.java

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

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

@@ -45,13 +45,13 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
         parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_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("Find-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;
     }
-}
+}

designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

@@ -34,7 +34,7 @@ public class DesignI18nImpl implements DesignI18nProvider {
 
     @Override
     public String i18nText(String key, Object... args) {
-        String format = InterProviderFactory.getProvider().getLocText(key);
+        String format = this.i18nText(key);
         MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args);
         return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage());
     }

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

@@ -64,8 +64,8 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
 		showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content"));
     	centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
                 {new UILabel(), tipsPane1},
-                createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
+                createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()),
-                createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
+                createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()),
                 createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"), bccEditor = new UITextField()),
                 createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"), titleEditor = new UITextField()),
                 {mainTextLabel, scrollPane},
@@ -151,4 +151,4 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
 		return ob instanceof EmailJavaScript;
 	}
 
-}
+}

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

@@ -1,32 +1,29 @@
 package com.fr.design.javascript;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
 import com.fr.base.Parameter;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.gui.frpane.ReportletParameterViewPane;
+import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.js.FormSubmitJavaScript;
 import com.fr.stable.ParameterProvider;
 
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
 public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane<FormSubmitJavaScript> {
-	public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScrit-Asynch");
+	public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Asynch");
-	public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScript-Synch");
+	public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Synch");
 	private UITextField urlTextField;
 	private UIComboBox asynComboBox;
 	private ReportletParameterViewPane pViewPane;
@@ -58,7 +55,7 @@ public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane<FormSubmitJav
 		});
 		pViewPane = new ReportletParameterViewPane();
 		pViewPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Parameter")));
-		northPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Submit")));
+		northPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_Submit")));
 		
 		addCallbackButton = javaScriptActionPane.createCallButton();
 		
@@ -74,7 +71,7 @@ public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane<FormSubmitJav
 	 *
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("JavaScript-Form_Submit");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Form_Submit");
 	}
 
 	/**

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

@@ -35,7 +35,7 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("JavaScript-Dynamic_Parameters");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Dynamic_Parameters");
     }
 
     @Override
@@ -79,4 +79,4 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
             return false;
         }
     }
-}
+}

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

@@ -39,7 +39,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
     }
 
     private void constructPane(){
-        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")};
+        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")};
         Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM};
         directionPane = new UIButtonGroup<Integer>(textArray, valueArray);
         directionPane.setSelectedIndex(0);
@@ -116,7 +116,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 
 	@Override
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
 	}
 
 	@Override
@@ -134,4 +134,4 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane {
 		}
 	}
 
-}
+}

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

@@ -64,7 +64,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
         this.add(contentPane, BorderLayout.CENTER);
 
 
-        UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"));
+        UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture"));
         selectPictureButton.addActionListener(selectPictureActionListener);
 
         if (hasImageLayout) {

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

@@ -102,7 +102,7 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus
 
 		g.drawString(com.fr.design.i18n.Toolkit.i18nText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y);
 		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y);
-		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y);
+		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y);
 	}
 
     /**
@@ -155,4 +155,4 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus
      */
 	public void focusGained(FocusEvent e) {
 	}
-}
+}

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

@@ -31,9 +31,9 @@ public class BackgroundWrapper implements Encoder, Decoder {
         } else if (v instanceof PatternBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
         } else if (v instanceof ImageFileBackground) {
-            return com.fr.design.i18n.Toolkit.i18nText("Image");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
         } else if (v instanceof GradientBackground) {
-            return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
         } else {
             return com.fr.design.i18n.Toolkit.i18nText("None");
         }
@@ -47,4 +47,4 @@ public class BackgroundWrapper implements Encoder, Decoder {
     @Override
     public void validate(String txt) throws ValidationException {
     }
-}
+}

designer-base/src/main/java/com/fr/design/remote/button/IconButton.java

@@ -19,7 +19,7 @@ public final class IconButton extends JButton {
         super(StringUtils.EMPTY);
         setContentAreaFilled(false);
         setFocusPainted(false);
-        setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remove_x.png"));
+        setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_tab_close_normal.png"));
         setBorder(null);
     }
 

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java

@@ -38,7 +38,9 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
         IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form"});
         tree.setDigIn(true);
         tree.setFileNodeFilter(filter);
-        this.add(new UIScrollPane(tree), BorderLayout.CENTER);
+        UIScrollPane scrollPane = new UIScrollPane(tree);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        this.add(scrollPane, BorderLayout.CENTER);
         tree.refreshEnv();
 
     }

designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java

@@ -194,7 +194,7 @@ public class UserManagerPane extends BasicPane {
 
 
     public UserManagerPane() {
-        this.setBorder(BorderFactory.createEmptyBorder(0,4,0,4));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
         this.setLayout(new BorderLayout());
         this.add(
                 TableLayoutHelper.createCommonTableLayoutPane(
@@ -221,8 +221,8 @@ public class UserManagerPane extends BasicPane {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
                         UITitledBorder.createBorderWithTitle(
-                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member")
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member"),
-                        )
+                                4)
                 )
         );
 
@@ -279,7 +279,9 @@ public class UserManagerPane extends BasicPane {
         content.setBorder(
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
-                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member")
+                        UITitledBorder.createBorderWithTitle(
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member"),
+                                4
                         )
                 )
         );

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

@@ -331,7 +331,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
 //				return;
 //			}
 //
-//			int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?",
+//			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("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
 //			if (returnVal == JOptionPane.OK_OPTION) {
 //				op.removeAction(selectedNO.getName());

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

@@ -35,10 +35,10 @@ public class AlignmentPane extends BasicPane {
     private AlignmentComboBox verAlignmentComboBox;
     private UIComboBox textComboBox;
     private static final String[] TEXT = {
-            com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Wrap_Text"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Wrap_Text"),
-            com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line"),
-            com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line(Adjust_Font)"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"),
-            com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Multi_Line(Adjust_Font)")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")};
     private UIBasicSpinner rotationSpinner;
     private UICheckBox isVerticalTextCheckBox;
     private UIRadioButton leftToRightRB;
@@ -86,7 +86,7 @@ public class AlignmentPane extends BasicPane {
         //richer:文本控制和图片布局
         JPanel textDirectionPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
         contentPane.add(textDirectionPanel);
-        textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation"), null));
+        textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), null));
         JPanel isVerticalTextPanel = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
         textDirectionPanel.add(isVerticalTextPanel);
         initVerticalPane(isVerticalTextPanel);
@@ -94,7 +94,7 @@ public class AlignmentPane extends BasicPane {
         JPanel rotationPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
         textDirectionPanel.add(rotationPane);
 
-        rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")));//james:加了一个空格，这样对齐了好看些
+        rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")));//james:加了一个空格，这样对齐了好看些
 
         rotationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM_90, NUM_90, 1));
         rotationSpinner.addChangeListener(changeListener);
@@ -136,24 +136,24 @@ public class AlignmentPane extends BasicPane {
         spacingBeforeSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1)));
         spacingBeforeSpinner.addChangeListener(changeListener);
         GUICoreUtils.setColumnForSpinner(spacingBeforeSpinner, 3);
-        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_Before"), spacingBeforeSpinner));
+        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before_Duplicate"), spacingBeforeSpinner));
 
         spacingAfterSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1)));
         spacingAfterSpinner.addChangeListener(changeListener);
         GUICoreUtils.setColumnForSpinner(spacingAfterSpinner, 3);
-        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_After"), spacingAfterSpinner));
+        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After_Duplicate"), spacingAfterSpinner));
 
         lineSpacingSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1)));
         lineSpacingSpinner.addChangeListener(changeListener);
         GUICoreUtils.setColumnForSpinner(lineSpacingSpinner, 3);
-        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Line_Spacing"), lineSpacingSpinner));
+        spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing_Duplicate"), lineSpacingSpinner));
     }
 
 
     private JPanel getIndentPane() {
         JPanel indentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 
-        indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Sytle-Indentation"), null));
+        indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_Indentation"), null));
         Comparable maximum = null;
         leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
         leftIndentSpinner.addChangeListener(changeListener);
@@ -168,7 +168,7 @@ public class AlignmentPane extends BasicPane {
     }
 
     private JPanel getTextImagePane() {
-        JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style"));
+        JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Style"));
 
         //textStyle.
         JPanel textStylePane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
@@ -176,7 +176,7 @@ public class AlignmentPane extends BasicPane {
 
         textComboBox = new UIComboBox(TEXT);
         textComboBox.addActionListener(actionListener);
-        textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style")));
+        textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Style")));
         textStylePane.add(textComboBox);
         textImagePane.add(textStylePane);//将文本放后面更好看点
         return textImagePane;
@@ -184,7 +184,7 @@ public class AlignmentPane extends BasicPane {
 
     private JPanel getAlignment() {
         //algnment.
-        JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"));
+        JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"));
         JPanel horAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
         //        aligmentPane.add(horAlignmentPane);
         horAlignmentComboBox = new AlignmentComboBox(CoreConstants.HORIZONTAL_ALIGNMENT_ARRAY);

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

@@ -277,7 +277,7 @@ public class FRFontPane extends BasicPane {
     
     @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Sytle-FRFont");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_FRFont");
     }
 
     /**
@@ -401,4 +401,4 @@ public class FRFontPane extends BasicPane {
             updatePreviewLabel();
         }
     }
-}
+}

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

@@ -69,7 +69,7 @@ public class FormatBox extends BasicPane {
 		formatBox.setEnabled(false);
 		pane.add(formatBox);
 		
-		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":"));
+		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample") + ":"));
 		pane.add(previewLabel = new UILabel(""));
 		
 		typeBox.addItemListener(typeListener);
@@ -205,4 +205,4 @@ public class FormatBox extends BasicPane {
 	private boolean isMoneyPattern(String pattern) {
 		return (pattern.length() > 0 && pattern.charAt(0) == '¤') || (pattern.length() > 0 && pattern.charAt(0) == '$');
 	}
-}
+}

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

@@ -82,7 +82,7 @@ public class FormatPane extends BasicPane {
         //sample pane
         JPanel samplePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.add(samplePane, BorderLayout.NORTH);
-        samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), null));
+        samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample"), null));
         samplePane.setLayout(FRGUIPaneFactory.createBorderLayout());
         sampleLabel = new UILabel(FormatField.getInstance().getFormatValue());
         samplePane.add(sampleLabel, BorderLayout.CENTER);
@@ -488,4 +488,4 @@ public class FormatPane extends BasicPane {
         }
     };
     
-}
+}

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

@@ -30,8 +30,8 @@ public class BackgroundUIComboBoxPane extends BasicPane {
 
     protected static final String none = com.fr.design.i18n.Toolkit.i18nText("DataFunction-None");
     protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors");
-    protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Image");
+    protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
-    protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
+    protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
 
     protected CardLayout cardLayout;
     protected JPanel layoutPane;

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

@@ -42,7 +42,7 @@ public class GradientFromToPixPane extends BasicPane {
 		
 		endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1));
 		secondFloorPane.add(endPixSpinner);
-		secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Indent-Pixel") + ")"));
+		secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Indent_Pixel") + ")"));
 		
 		JFormattedTextField endField = ((JSpinner.DefaultEditor)endPixSpinner.getEditor()).getTextField();
 		endField.setHorizontalAlignment(UITextField.LEFT);

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

@@ -63,7 +63,7 @@ public class GradientSelectBox extends BasicPane {
 	}
 
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
 	}
 	
 	public void populate(GradientBackground background) {
@@ -81,4 +81,4 @@ public class GradientSelectBox extends BasicPane {
 		background.setStartColor(startColor);
 		background.setEndColor(endColor);
 	}
-}
+}

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

@@ -33,7 +33,7 @@ import java.io.File;
 public class ImageSelectPane extends BackgroundPane4BoxChange {
     private static final long serialVersionUID = -3938766570998917557L;
     private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default");
-    private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Image-Titled");
+    private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled");
 
     private String suffix = PictureCollection.DEFAULT_SUFFIX;
 
@@ -66,7 +66,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange {
         pane.add(testPane1);
 
         // 选择图片按钮
-        UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"));
+        UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture"));
         selectFilePane.add(selectPictureButton);
 
         selectPictureButton.setPreferredSize(new Dimension(110, 20));
@@ -159,6 +159,6 @@ public class ImageSelectPane extends BackgroundPane4BoxChange {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture");
     }
-}
+}

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

@@ -684,7 +684,7 @@ public abstract class GUICoreUtils{
 			return false;
 		}
 
-		int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"),
+		int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, 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 (returnVal == JOptionPane.OK_OPTION) {
 			int minSelectedIndex = nodeList.getMinSelectionIndex();
@@ -891,4 +891,4 @@ public abstract class GUICoreUtils{
 		panel.add(dynamicPaneWrapper, BorderLayout.CENTER);
 		return panel;
 	}
-}
+}

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

@@ -30,8 +30,8 @@ public class ButtonConstants {
     public static final String[] TYPES4BUTTON = {
             com.fr.design.i18n.Toolkit.i18nText("Common"),
             com.fr.design.i18n.Toolkit.i18nText("Custom"),
-            com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"),
-            com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_TreeNode")
     };

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

@@ -41,7 +41,7 @@ public class CheckBoxDictPane extends JPanel {
 		};
 		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
 
-		returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Widget-Array"), com.fr.design.i18n.Toolkit.i18nText("String")});
+		returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("String")});
 		returnTypeComboBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -49,7 +49,7 @@ public class CheckBoxDictPane extends JPanel {
 			}
 		});
 		JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(
-				new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
+				new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
 		JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		jPanel.add(headPane, BorderLayout.NORTH);
 		jPanel.add(returnStringPane, BorderLayout.CENTER);
@@ -87,4 +87,4 @@ public class CheckBoxDictPane extends JPanel {
 		checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem());
 		checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem());
 	}
-}
+}

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

@@ -568,7 +568,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
 	protected class RemoveFieldAction extends UpdateAction {
 		public RemoveFieldAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Remove_Field"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Remove_Field"));
 		}
 
 		public void actionPerformed(ActionEvent evt) {

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

@@ -57,6 +57,6 @@ public class SubmitJobListPane extends ObjectJControlPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Event");
 	}
 }

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

@@ -250,7 +250,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         testPanel.setPreferredSize(new Dimension(437, 20));
         UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection"));
 
-        testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection"));
+        testConnectionButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
         testConnectionButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent ev) {
@@ -587,7 +587,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
 
-        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Datasource-Test_Connection"), true);
+        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
 
         dialog.setSize(new Dimension(268, 118));
         okButton.setEnabled(false);

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

@@ -22,7 +22,7 @@ public class RemoteSignInPane extends BasicPane {
 	public void initComponent(){
 		this.setLayout(FRGUIPaneFactory.create2ColumnGridLayout());
 		
-		userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username")+":");
+		userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName")+":");
 		userTextField = new UITextField();
 		passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password")+":");
 		passwordField = new UIPassWordField();
@@ -44,4 +44,4 @@ public class RemoteSignInPane extends BasicPane {
 //    	this.showWindow(null).setVisible(false);
 //    	this.showWindow(null).dispose();
     }
-}
+}

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -246,7 +246,7 @@ public class FILEChooserPane extends BasicPane {
                 new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_File_Name") + ":"), BorderLayout.WEST),
                         fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open"))
                 },
-                new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":"), BorderLayout.WEST),
+                new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"), BorderLayout.WEST),
                         postfixComboBox = new UIComboBox(), cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_Action_Cancel"))
                 }};
 

designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java

@@ -70,7 +70,7 @@ public class ServerManageFrame extends JFrame {
 		UIButton startButton = new UIButton();
 		startPane.add(startButton);
 		startButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/start.png"));
-		startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Start")));
+		startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Start")));
 		startButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				try {
@@ -87,7 +87,7 @@ public class ServerManageFrame extends JFrame {
 		UIButton stopButton = new UIButton();
 		stopPane.add(stopButton);
 		stopButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/stop.png"));
-		stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Stop")));
+		stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Stop")));
 		stopButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				try {
@@ -146,4 +146,4 @@ public class ServerManageFrame extends JFrame {
 		
 		this.validate();
 	}	
-}
+}

designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java

@@ -14,12 +14,12 @@ import javax.swing.*;
 import java.awt.*;
 
 /**
- * 
+ *
  * @author jim
  *
  */
 public class ChartEmailPane extends EmailPane{
-	
+
 	private UITextField itemNameTextField;
 
 	@Override
@@ -35,10 +35,10 @@ public class ChartEmailPane extends EmailPane{
 			showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content"));
 			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
 					{new UILabel(), tipsPane1},
-					createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
+					createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()),
-					createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
+					createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()),
-					createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()),
+					createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()),
-					createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()),
+					createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()),
 					{mainTextLabel, scrollPane},
 					{new UILabel(), showTplContent},
 					{new UILabel(), tipsPane2}},rSizes, columnSize, 6);
@@ -46,10 +46,10 @@ public class ChartEmailPane extends EmailPane{
 			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred};
 			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
                     {new UILabel(), tipsPane1},
-                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
+                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()),
-                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
+                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()),
-                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()),
+                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()),
-                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()),
+                    createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()),
                     {mainTextLabel, scrollPane},
                     {new UILabel(), tipsPane2}},rSizes, columnSize, 8);
 		}
@@ -65,26 +65,26 @@ public class ChartEmailPane extends EmailPane{
 	protected boolean needRenamePane() {
 		return true;
 	}
-	
+
 	protected void checkEmailConfig(boolean valid) {
 		super.checkEmailConfig(valid);
 		if(itemNameTextField != null){
             itemNameTextField.setEnabled(valid);
         }
 	}
-	
+
 	public void populateBean(EmailJavaScript ob) {
         if(itemNameTextField != null){
             itemNameTextField.setName(ob == null ? null : ob.getItemName());
         }
         super.populateBean(ob);
 	}
-	
+
 	public void updateBean(EmailJavaScript email) {
         if(itemNameTextField != null){
             email.setItemName(itemNameTextField.getText());
         }
         super.updateBean(email);
 	}
-	
+
 }

designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java

@@ -130,7 +130,7 @@ public class GisMapDataPane extends DataContentsPane{
 
 					@Override
 					protected String title4PopupWindow() {
-						return com.fr.design.i18n.Toolkit.i18nText("Data_Setting");
+						return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting");
 					}
 				}, BorderLayout.CENTER);
 

designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java

@@ -57,7 +57,7 @@ public class MapSinglePane extends FurtherBasicBeanPane<TopDefinitionProvider> {
 
 			@Override
 			protected String title4PopupWindow() {
-				return com.fr.design.i18n.Toolkit.i18nText("Data_Setting");
+				return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting");
 			}
 		}, BorderLayout.CENTER);
 	}

designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java

@@ -77,7 +77,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
      * @return  返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData");
 	}
 
 	@Override

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

@@ -112,10 +112,10 @@ public class DataLabelPane extends TooltipContentsPane {
 
     protected JPanel createJPanel4Position() {
         // 标签位置:上下左右中.
-        bottomButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"));
+        bottomButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"));
-        leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"));
+        leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"));
-        rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"));
+        rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"));
-        topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"));
+        topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
         centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
 
         ButtonGroup bg = new ButtonGroup();
@@ -239,4 +239,4 @@ public class DataLabelPane extends TooltipContentsPane {
     public void checkGuidBox() {
 
     }
-}
+}

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java

@@ -20,8 +20,8 @@ public class RangeDataLabelPane extends DataLabelPane {
 	private JRadioButton bottomButton;
 	  
     protected JPanel createJPanel4Position() {
-    	topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"));
+    	topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
-    	bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"));
+    	bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"));
     	centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
 		
 		ButtonGroup bg = new ButtonGroup();
@@ -62,4 +62,4 @@ public class RangeDataLabelPane extends DataLabelPane {
         	seriesAttrContents.setPosition(Constants.TOP);
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java

@@ -99,7 +99,7 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link");
     }
 
     @Override
@@ -136,4 +136,4 @@ public class FormHyperlinkNorthPane extends BasicBeanPane<FormHyperlinkProvider>
         }
         formHyperlink.setRelateEditorName((String) targetFrameComboBox.getSelectedItem());
     }
-}
+}

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java

@@ -44,7 +44,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link");
     }
 
     protected int getHyperlinkType() {
@@ -99,4 +99,4 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid
             return ParameterTableModel.CHART_NORMAL_USE;
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java

@@ -118,7 +118,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
 	 * 返回View的标题.
 	 */
 	public String getViewTitle() {
-		return com.fr.design.i18n.Toolkit.i18nText("CellElement-Property_Table");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell_Element_Property_Table");
 	}
 
 	/**

designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java

@@ -3,23 +3,23 @@ package com.fr.design.mainframe.chart;
 
 
 public class PaneTitleConstants {
-	public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Type");
+	public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type");
 	public final static String CHART_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Data");
 	public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Style");
-	public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Animation_Special");
+	public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special");
 	
-	public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Title");
+	public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title");
 	public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend");
 	public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Series");
 	public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis");
 	public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Background");
 	public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet");
-	public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Data-Label");
+	public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label");
 	public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("AnalysisLine");
 	
-	public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("D-ChartArea");
+	public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area");
 	public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot");
 	
 	public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch");
 
-}
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java

@@ -19,9 +19,9 @@ import com.fr.log.FineLoggerFactory;
  */
 public class CalculateComboBox extends UIComboBox{
 
-	public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Sum"),
+	public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"),
-			com.fr.design.i18n.Toolkit.i18nText("DataFunction-Average"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Max"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Average"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Max"),
-			com.fr.design.i18n.Toolkit.i18nText("DataFunction-Min"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Count")};
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Min"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Count")};
 	public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class, 
 			MaxFunction.class, MinFunction.class, CountFunction.class};
 	

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java

@@ -35,7 +35,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
 	@Override
 	protected String[] columnNames() {
 		return  new String[]{
-			com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Series_Name"),
 			com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"),
 			com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java

@@ -27,7 +27,7 @@ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPan
 	
 	private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualStart");
 	private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualEnd");
-	private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Percent");
+	private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleFormat_Percent");
 	private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Chart_Project");
 	
 	public GanttPlotReportDataContentPane(ChartDataPane parent) {
@@ -109,4 +109,4 @@ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPan
 		return new String[]{"", ""};
 	}
 
-}
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java

@@ -33,7 +33,7 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
         List<ChartUIMenuNameableCreator> list = new ArrayList<ChartUIMenuNameableCreator>();
         java.util.HashMap<String, BaseFormula> hyperLinkEditorMap = plot.getHyperLinkEditorMap();
 
-        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"),
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
                 new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null));
@@ -52,4 +52,4 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
             autoRefreshTime.setEnabled(definition.isSupportAutoRefresh());
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java

@@ -43,13 +43,13 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
     private static final int COM_GAP =5;
     private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year");
     private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month");
-    private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun");
+    private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun");
     private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour");
     private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute");
     private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second");
 
     private static String[] TYPES = new String[]{
-    	com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
+    	com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"),
     	com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"),
     	com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")
     };
@@ -68,7 +68,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
     static {
     	INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year"));
     	INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"));
-    	INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun"));
+    	INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"));
     	INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"));
     	INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"));
     	INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"));

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

@@ -162,7 +162,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
 
         Component[][] components = new Component[][]{
                 new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null},
-                new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null},
+                new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null},
                 new Component[]{null, orientationSpinner, orientationBar, null},
                 new Component[]{null, textAttrPane, null, null},
         };
@@ -227,7 +227,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
         double[] rowSize = {p, p, p};
 
         Component[][] components = new Component[][]{
-                new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null},
+                new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null},
                 new Component[]{null, orientationSpinner, orientationBar, null},
                 new Component[]{null, textAttrPane, null, null},
         };
@@ -290,7 +290,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
 
         Component[][] components = new Component[][]{
                 new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime},
-                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null},
+                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null},
                 new Component[]{null,orientationSpinner, orientationBar, null},
                 new Component[]{null,textAttrPane, null, null},
         };

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

@@ -54,7 +54,7 @@ public class ChartAxisLineStylePane extends BasicPane{
 		double[] rowSize = { p,p,p,p,p,p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} ,
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")),axisLineStyle} ,
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null},
                 new Component[]{null, mainTickPosition},

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

@@ -57,7 +57,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane {
         Component[][] components = new Component[][]{
                 new Component[]{null,axisTitleContentPane},
                 new Component[]{null,axisTitleAttrPane},
-                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))},
+                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))},
                 new Component[]{null,titleAlignmentPane,},
         };
         titlePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@@ -56,7 +56,7 @@ public class ChartAxisTitlePane extends BasicPane{
         Component[][] components = new Component[][]{
                 new Component[]{null,axisTitleContentPane},
                 new Component[]{null,axisTitleAttrPane},
-                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))},
+                new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))},
                 new Component[]{null,titleAlignmentPane,},
         };
         titlePane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);