继续提交国际化。

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

@@ -179,11 +179,11 @@ public class FeedBackPane extends BasicPane {
 
     private JPanel initDetailPane() {
         double p = TableLayout.PREFERRED;
-        UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("detail_description") + ":");
+        UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Detail_Description") + ":");
         info.setBorder(INNER_LEFT_BORDER);
         JPanel contactPane = getContactPane();
         contactPane.setBorder(INNER_LEFT_BORDER);
-        UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("contact_info") + ":");
+        UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Contact_Info") + ":");
         contact.setBorder(INNER_LEFT_BORDER);
         JPanel jPanel = new JPanel();
         jPanel.add(detailField);

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

@@ -21,7 +21,6 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.file.ProcedureConfig;
 import com.fr.file.TableDataConfig;
 
-import com.fr.locale.InterProviderFactory;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
@@ -53,7 +52,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData");
         }
 
         @Override

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

@@ -464,13 +464,13 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         moveDownButton.addActionListener(actionListener5);
 
         // peter:加括号
-        bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Add_bracket"));
+        bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Add_bracket"));
         buttonPane.add(bracketButton);
         bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png"));
         bracketButton.addActionListener(actionListener6);
 
         // peter:去掉括号
-        unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Remove_bracket"));
+        unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Remove_bracket"));
         buttonPane.add(unBracketButton);
         unBracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/unBracket.png"));
         unBracketButton.addActionListener(actionListener7);

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

@@ -36,7 +36,7 @@ public class ReportTableDataPane extends LoadingBasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData");
     }
 
     public void populate(TableDataSource tds) {

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

@@ -31,7 +31,7 @@ public class TableDataCreatorProducer {
     }
 
     public TableDataNameObjectCreator[] createReportTableDataCreator() {
-        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"),
+        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
                 "ds",
                 "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),

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

@@ -106,7 +106,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     private ExpandMutableTreeNode initServerDataNode(Map<String, TableDataWrapper> serverDataMap) {
-        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"), SERVER_TABLE_DATA), false);
+        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), SERVER_TABLE_DATA), false);
         templateNode.addChildTreeNodes(getNodeArrayFromMap(serverDataMap));
         return templateNode;
     }

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

@@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     protected void initbuttonGroup() {
 //        Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")};
         final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA};
-        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")};
+        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")};
         buttonGroup = new UIHeadGroup(textArray) {
             public void tabChanged(int index) {
                 if (op != null) {

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

@@ -70,11 +70,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             northPane.add(chartSetPane);
             chartSetPane.setBorder(BorderFactory.createTitledBorder(
                     new ModLineBorder(ModLineBorder.TOP),
-                    com.fr.design.i18n.Toolkit.i18nText("Datasource-Convert_Charset")
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Convert_Charset")
             ));
 
-            chartSetPane.add(GUICoreUtils.createNamedPane(originalCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Datasource-Original_Charset") + ":"));
-            chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Datasource-New_Charset") + ":"));
+            chartSetPane.add(GUICoreUtils.createNamedPane(originalCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Original_Charset") + ":"));
+            chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
         }
     }
 

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

@@ -104,7 +104,7 @@ public class JDBCDefPane extends JPanel {
 		userNameTextField.setName(USER_NAME);
 		passwordTextField = new UIPassWordField(15);
 		dbtypeButton = new UIButton(".");
-		dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Get_Default_URL"));
+		dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
 		dbtypeButton.addActionListener(dbtypeButtonActionListener);
 
 		double p = TableLayout.PREFERRED;
@@ -148,7 +148,7 @@ public class JDBCDefPane extends JPanel {
 		JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		innerthis.add(southPanel);
 		southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
-		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("ConnectionPool_Attr"));
+		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
 		southPanel.add(actionLabel, BorderLayout.EAST);
 		actionLabel.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
@@ -331,18 +331,18 @@ public class JDBCDefPane extends JPanel {
 			double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
 			double[] columnSize = {f, f};
 			Component[][] comps = {
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_INITIAL_SIZE") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
 							DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
 							DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
@@ -353,7 +353,7 @@ public class JDBCDefPane extends JPanel {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nText("ConnectionPool_Attr");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
 		}
 	}
 

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

@@ -73,12 +73,12 @@ public class JNDIDefPane extends JPanel {
 		// NorthPane
 		JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
 		innerthis.add(nContentPane);
-		nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-JNDI_Name") + ":"));
+		nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name") + ":"));
 		jndiNameTextField = new UITextField(20);
 		nContentPane.add(jndiNameTextField, BorderLayout.NORTH);
 
 		// CenterPane
-		JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Datasource-Context"));
+		JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Context"));
 		innerthis.add(outcenterPane);
 		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
 		outcenterPane.add(centerPane);
@@ -105,7 +105,7 @@ public class JNDIDefPane extends JPanel {
 		centerPane.add(actionPane);
 		actionPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 6));
 
-		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-Other_Attributes"));
+		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes"));
 		actionPane.add(actionLabel, BorderLayout.EAST);
 		actionLabel.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
@@ -115,7 +115,7 @@ public class JNDIDefPane extends JPanel {
 		});
 
 		// South Description
-		UILabel explainLabe11l = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-JNDI_DES"));
+		UILabel explainLabe11l = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_DES"));
 		innerthis.add(new JScrollPane(explainLabe11l));
 	}
 
@@ -235,7 +235,7 @@ public class JNDIDefPane extends JPanel {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nText("Datasource-Other_Attributes");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes");
 		}
 	}
 

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

@@ -88,7 +88,7 @@ public class PreviewTablePane extends BasicPane {
 
         JPanel maxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         previewNumberPanel.add(maxPanel);
-        maxPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-Maximum_Number_of_Preview_Rows") + ":"));
+        maxPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":"));
 
         maxPreviewNumberField = new UINumberField();
         maxPanel.add(maxPreviewNumberField);

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

@@ -89,7 +89,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
         });
 
         Component[][] components = {
-        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane},
+        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},
         		{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")},
         		{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
                 {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
@@ -154,7 +154,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
     @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("DS-Class_TableData");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_TableData");
     }
 
     @Override

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

@@ -68,7 +68,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTable
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData");
 	}
 	
     /**

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

@@ -157,7 +157,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Embedded_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Embedded_TableData");
 	}
 
 

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

@@ -224,7 +224,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             } else {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
                 try {
                     in.close();
                 } catch (IOException e) {

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

@@ -190,7 +190,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData");
     }
 
     @Override
@@ -307,7 +307,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
             formulaButton.setEnabled(false);
             formulaButton.setPreferredSize(new Dimension(25, 23));
             formulaButton.addActionListener(getFormulaActionListener());
-            rightPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Conditions_formula") + " ="));
+            rightPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula") + " ="));
             rightPanel.add(formulaContentTextField);
             rightPanel.add(formulaButton);
 

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

@@ -75,7 +75,7 @@ public class StoreProcedureParameterPane extends BasicPane {
 		nameField = new UITextField(10);
 		namePane.add(nameField, BorderLayout.CENTER);
 		namePane.add(new UILabel("     "), BorderLayout.EAST);
-		valuePane.add(new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_DEFAULT") + ":"), BorderLayout.WEST);
+		valuePane.add(new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Default") + ":"), BorderLayout.WEST);
 		valuePane.add(valueEditPane, BorderLayout.CENTER);
 		valuePane.add(new UILabel("     "), BorderLayout.EAST);
 		Component[][] components = {{null},

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

@@ -6,8 +6,6 @@ import com.fr.design.data.datapane.TableDataPaneController;
 import com.fr.design.data.datapane.TableDataPaneListPane;
 import com.fr.design.fun.TableDataPaneProcessor;
 import com.fr.design.gui.frpane.LoadingBasicPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.TableDataConfig;
 
@@ -62,7 +60,7 @@ public class TableDataManagerPane extends LoadingBasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData");
 	}
 
 	public void populate(TableDataConfig tableDataConfig) {

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

@@ -97,7 +97,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             @Override
             public void stateChanged(ChangeEvent e) {
                 if (globalNameListener != null) {
-                    globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                    globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                 }
                 Object oldValue = currentEditor.getValue();
                 setCurrentEditor(upButton.getSelectedIndex());
@@ -164,7 +164,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             item.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     if (globalNameListener != null) {
-                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                     }
                     Object oldValue = currentEditor.getValue();
                     setCurrentEditor(j);

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

@@ -153,7 +153,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
             item.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     if (globalNameListener != null) {
-                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                     }
                     Object oldValue = currentEditor.getValue();
                     setCurrentEditor(j);

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

@@ -26,7 +26,7 @@ public class ColumnIndexEditor extends Editor<Object> {
      * @param value
      */
     public ColumnIndexEditor(int value) {
-        this(value, com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index"));
+        this(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index"));
     }
 
     public ColumnIndexEditor(int value, String name) {

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

@@ -51,7 +51,7 @@ public class OldColumnIndexEditor extends Editor {
 	}
 
 	protected void initComponents() {
-		indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index"));
+		indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index"));
 		nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName"));
 		indexCheckBox.addActionListener(actionListener);
 		nameCheckBox.addActionListener(actionListener);

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

@@ -168,7 +168,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         if (reportPaths.length == 0) {
             return;
         }
-        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) {
+        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete-File")) != JOptionPane.OK_OPTION) {
             return;
         }
         for (String reportPath : reportPaths) {

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

@@ -142,7 +142,7 @@ public class FunctionManagerPane extends BasicPane {
             editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
             reportletNamePane.add(editorButton);
             editorButton.addActionListener(createEditorButtonActionListener());
-            northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"),
+            northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"),
                     reportletNamePane}, FlowLayout.LEFT));
             DescriptionTextArea descriptionArea = new DescriptionTextArea();
             descriptionArea.setWrapStyleWord(true);

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

@@ -185,7 +185,7 @@ public class JavaEditorPane extends BasicPane {
                         className = info.getIntactClassName();
                         String message = info.getCompileMessage();
                         if (StringUtils.isEmpty(message)) {
-                            message = com.fr.design.i18n.Toolkit.i18nText("Compile_Success") + "!";
+                            message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!";
                         }
                         JOptionPane.showMessageDialog(null, message);
                     } catch (InterruptedException e1) {

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

@@ -35,7 +35,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
 	protected void initComponents() {
 
 		formulaTextField = new UITextField();
-		formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand"));
+		formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand"));
 
 		// 添加一公式编辑器按钮
 		formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));

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

@@ -385,7 +385,7 @@ public abstract class JListControlPane extends JControlPane {
                     continue;
                 }
                 boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
-                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database"));
+                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                 if (isTrue) {
                     this.addShortCut(new LineSeparator());
                 }

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

@@ -468,7 +468,7 @@ public abstract class UIListControlPane extends UIControlPane {
                     continue;
                 }
                 boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
-                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database"));
+                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                 if (isTrue) {
                     this.addShortCut(new LineSeparator());
                 }

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

@@ -33,7 +33,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JPopupMenu;
@@ -474,7 +473,7 @@ private boolean fractionalFontMetricsEnabled;
 	 */
 	protected void appendFoldingMenu(JPopupMenu popup) {
 		popup.addSeparator();
-		foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("ContextMenu.Folding"));
+		foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Context_Menu_Folding"));
 		foldingMenu.add(createPopupMenuItem(toggleCurrentFoldAction));
 		foldingMenu.add(createPopupMenuItem(collapseAllCommentFoldsAction));
 		foldingMenu.add(createPopupMenuItem(collapseAllFoldsAction));

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

@@ -61,7 +61,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
     protected void initCenterPane(UILabel mainTextLabel, JScrollPane scrollPane, double fill, double preferred) {
     	double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred, preferred };
 		double[] columnSize = { preferred, fill};
-		showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content"));
+		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()),

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

@@ -33,7 +33,7 @@ public class DecodeDialog {
 		
 		jd = new JDialog();
 		jd.setLayout(null);
-		UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ECP_input_pwd"));
+		UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Input_Pwd"));
 		newNameLable.setBounds(20, 10, 130, 30);
 		jt = new UITextField(StringUtils.EMPTY);
 		jt.selectAll();
@@ -57,7 +57,7 @@ public class DecodeDialog {
 					DesignerEnvManager.getEnvManager().setEncryptionKey(CodeUtils.passwordEncode(key));
 				}else{
 					isPwdRight = false;
-					hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("ECP_re_input"));
+					hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Re_Input"));
 					hintsLabel.setVisible(true);
 				}
 			}
@@ -76,7 +76,7 @@ public class DecodeDialog {
 		jd.add(hintsLabel);
 		jd.setSize(340, 180);
 		jd.setModal(true);
-		jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("ECP_decode"));
+		jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Decode"));
 		jd.setResizable(false);
 		jd.setAlwaysOnTop(true);
 		jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));

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

@@ -108,7 +108,7 @@ public class TemplatePane extends JPanel implements MouseListener {
         editButton.setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 10));
         editButton.setMargin(null);
         editButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
-        editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace"));
+        editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace"));
         this.add(new UILabel("   "), BorderLayout.WEST);
         this.add(editButton, BorderLayout.EAST);
         editButton.addActionListener(new ActionListener() {

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

@@ -415,7 +415,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData");
         }
 
         @Override

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

@@ -8,7 +8,6 @@ import javax.swing.event.ChangeEvent;
 
 import com.fr.data.impl.CustomDictionary;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.gui.frpane.UICorrelationPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 
@@ -72,7 +71,7 @@ public class CustomDictPane extends FurtherBasicBeanPane<CustomDictionary> {
 
 	@Override
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Datasource-User_Defined");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_User_Defined");
 	}
 
 	@Override

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

@@ -359,7 +359,7 @@ public class FormatPane extends BasicPane {
         		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(text);
         		String sample = simpleDateFormat.format(new Date());
         		if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) {
-        			sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning");
+        			sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning");
         			c = Color.red;
         		}
         		this.sampleLabel.setText(sample);

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

@@ -42,7 +42,7 @@ public abstract class BackgroundSelectPane extends BasicPane {
 		
 		this.add(backgroundPane, BorderLayout.CENTER);
 		
-		UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Choose_None"));
+		UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_None"));
 		this.add(button, BorderLayout.SOUTH);
 		button.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {

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

@@ -36,8 +36,8 @@ public class CheckBoxDictPane extends JPanel {
 		endComboBox.setEditable(true);
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")), delimiterComboBox},
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")),startComboBox},
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")),endComboBox}
+				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox},
+				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox}
 		};
 		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
 

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

@@ -55,14 +55,14 @@ public class EnvListPane extends JListControlPane {
     public NameableCreator[] createNameableCreators() {
         NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png",
                 LocalDesignerWorkspaceInfo.class, LocalEnvPane.class);
-        NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png",
+        NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png",
                 RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class);
         return new NameableCreator[]{local, remote};
     }
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace");
     }
 
     /**

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

@@ -60,7 +60,7 @@ public class LocalEnvPane extends BasicBeanPane<LocalDesignerWorkspaceInfo> {
 
         UITextArea description = new UITextArea();
         centerPane.add(description, BorderLayout.SOUTH);
-        description.setText(com.fr.design.i18n.Toolkit.i18nText("Env-Des1"));
+        description.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Des1"));
         description.setEditable(false);
     }
 

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

@@ -464,7 +464,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             @Override
             public void mouseEntered(MouseEvent e) {
                 if (java.awt.Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) {
-                    passwordInput.setToolTipText(Toolkit.i18nText("CapsLock"));
+                    passwordInput.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_CapsLock"));
                 } else {
                     passwordInput.setToolTipText(null);
                 }

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

@@ -32,7 +32,7 @@ public class ChartEmailPane extends EmailPane{
 		JPanel contentPane;
 		if (supportExport) {
 			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
-			showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content"));
+			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()),

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

@@ -58,9 +58,9 @@ public class XCheckBoxGroup extends XFieldEditor {
 					new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
 							com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 					new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
-							com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 					new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
-							com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") });
+							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") });
 		}
 		if (!((CheckBoxGroup) this.toData()).isAdaptive()) {
 			crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data

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

@@ -41,10 +41,10 @@ public class XComboCheckBox extends XComboBox {
 						com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class)
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
-						com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol"))
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(
-						com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol"))
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") });
 	}
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@@ -174,7 +174,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
                 String sample = simpleDateFormat.format(new Date());
                 Color c = Color.black;
                 if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) {
-                    sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning");
+                    sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning");
                     c = Color.red;
                 }
                 currentSamplelabel.setText(sample);

designer-realize/src/main/java/com/fr/design/actions/cell/CellAttributeAction.java

@@ -17,7 +17,7 @@ public class CellAttributeAction extends CellAttributeTableAction {
 
 	@Override
 	protected String getID() {
-		return com.fr.design.i18n.Toolkit.i18nText("Datasource-Other_Attributes");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes");
 	}
 
 }

designer-realize/src/main/java/com/fr/design/expand/SortExpandAttrPane.java

@@ -32,7 +32,7 @@ public class SortExpandAttrPane extends JPanel {
 		String[] nameArray = { com.fr.design.i18n.Toolkit.i18nText("Sort-Original"), com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending"), com.fr.design.i18n.Toolkit.i18nText("Sort-Descending") };
         sort_type_pane = new UIButtonGroup(iconArray);
         sort_type_pane.setAllToolTips(nameArray);
-		sort_type_pane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand"));
+		sort_type_pane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand"));
 		this.add(sort_type_pane, BorderLayout.NORTH);
 
 		cardLayout = new CardLayout();

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java

@@ -12,7 +12,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 
 import com.fr.report.cell.DefaultTemplateCellElement;
@@ -204,7 +203,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
             }
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand"))) {
+        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand"))) {
             sortAfterExpand.update(cellExpandAttr);
         }
 

designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@@ -200,7 +200,7 @@ public class WebJsPane extends BasicPane {
 			if (in == null) {
 				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
 			} else {
-				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
+				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
 				try {
 					in.close();
 				} catch (IOException e) {

designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java

@@ -166,7 +166,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 				String sample = simpleDateFormat.format(new Date());
 				Color c = Color.black;
 				if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) {
-					sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning");
+					sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning");
 					c = Color.red;
 				}
 				currentSamplelabel.setText(sample);

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -662,7 +662,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Sort-Original"), com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending"), com.fr.design.i18n.Toolkit.i18nText("Sort-Descending")};
                 sortTypePane = new UIButtonGroup(iconArray);
                 sortTypePane.setAllToolTips(nameArray);
-                sortTypePane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand"));
+                sortTypePane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand"));
 
                 cardLayout = new CardLayout();
                 centerPane = new JPanel(cardLayout);