规范国际化文件及国际化定义。

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

@@ -646,7 +646,7 @@ public class PreferencePane extends BasicPane {
         int rv = JOptionPane.showOptionDialog(
                 null,
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,

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

@@ -69,7 +69,7 @@ public class FeedBackPane extends BasicPane {
     private SwingWorker worker;
     private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true);
     private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
-    private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+    private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
     private int ifHasBeenWriten = 0;
     private UITextArea detailField;
     private boolean isSendSuccessful = false;
@@ -206,7 +206,7 @@ public class FeedBackPane extends BasicPane {
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel("QQ:", SwingConstants.RIGHT), qq},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("email") + ":", SwingConstants.RIGHT), email},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email") + ":", SwingConstants.RIGHT), email},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Number") + ":", SwingConstants.RIGHT), phone}
         };
         double[] rowSize = {p, p, p};

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

@@ -66,7 +66,7 @@ public class ForumAction extends UpdateAction {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Forum");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Forum");
         }
 
         @Override

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

@@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
     private class EditAction extends UpdateAction {
         public EditAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
             this.setMnemonic('E');
             this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH));
         }

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

@@ -49,7 +49,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         message = new UILabel();
         uiLabel = new UILabel();
         okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
-        cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+        cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         this.add(northPane, BorderLayout.NORTH);

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

@@ -110,7 +110,7 @@ public class JDBCDefPane extends JPanel {
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Database") + ":")));
+		dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
 		JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		Component[][] dbtypeComComponents = {{dbtypeComboBox}};
 		double[] dbtypeRowSize = {p};
@@ -118,7 +118,7 @@ public class JDBCDefPane extends JPanel {
 		dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
 
 		JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-		driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Driver") + ":"));
+		driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
 
 		JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
 		urlPane.add(new UILabel("URL:"));

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

@@ -166,7 +166,7 @@ public class PreviewTableModel extends AbstractTableModel {
 
     private String checkType(int column) {
         if (dateIndexs.contain(column)) {
-            String s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            String s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
             return ("(" + s + ")");
         }
 
@@ -194,7 +194,7 @@ public class PreviewTableModel extends AbstractTableModel {
                     if (Number.class.isAssignableFrom(clzz)) {
                     s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
                     } else if (java.sql.Date.class.isAssignableFrom(clzz)) {
-                        s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+                        s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
                     }
                 }
             }
@@ -203,7 +203,7 @@ public class PreviewTableModel extends AbstractTableModel {
         } else if (o instanceof Double || o instanceof Float) {
             s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
         } else if (o instanceof java.sql.Date || o instanceof java.util.Date) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
         } else if (o instanceof Number) {
             s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
         } else {

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

@@ -117,22 +117,22 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
     private int getParameterType (Object value) {
         String type;
         if(value instanceof CursorEditor)
-            type= com.fr.design.i18n.Toolkit.i18nText("Cursor");
+            type= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor");
         else if(value instanceof String ){
             if(((String) value).length() > 0 && ((String) value).charAt(0) == '=')
-                type = com.fr.design.i18n.Toolkit.i18nText("Formula");
+                type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
             else
                 type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
         }else if(value instanceof Integer)
             type = com.fr.design.i18n.Toolkit.i18nText("Integer");
         else if(value instanceof Double)
-            type = com.fr.design.i18n.Toolkit.i18nText("Double");
+            type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
         else if(value instanceof Date)
-            type = com.fr.design.i18n.Toolkit.i18nText("Date");
+            type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
         else if(value instanceof Boolean)
             type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean");
         else if(value instanceof BaseFormula)
-            type = com.fr.design.i18n.Toolkit.i18nText("Formula");
+            type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
         else
             type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
         return StoreProcedureParameterPane.getInfo4Value(type);

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

@@ -91,7 +91,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
         Component[][] components = {
         		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},
         		{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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_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)))}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@@ -35,8 +35,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
     private static String[] TYPE = {
     	 com.fr.design.i18n.Toolkit.i18nText("String"),
     	 com.fr.design.i18n.Toolkit.i18nText("Integer"),
-    	 com.fr.design.i18n.Toolkit.i18nText("Double"),
-    	 com.fr.design.i18n.Toolkit.i18nText("Date")
+    	 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"),
+    	 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")
     };
 	
 	public EmbeddedTableDataDefinedPane() {
@@ -68,8 +68,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
         tableColumn.setMaxWidth(30);
         
         // 控制按钮
-        add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add"));
-        del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete"));
+        add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
+        del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
         JPanel buttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 //        buttonPane.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
         buttonPane.add(add);
@@ -213,7 +213,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
         private EmbeddedTableData embeddedTableData;
         private String[] COLUMN_NAME = {
               	 "", 
-              	 com.fr.design.i18n.Toolkit.i18nText("ColumnName"),
+              	 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"),
               	 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/StoreProcedureParameterPane.java

@@ -29,13 +29,13 @@ public class StoreProcedureParameterPane extends BasicPane {
 	};
 
 	private static NameObject[] nameAndValue = new NameObject[]{
-		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Cursor"), StoreProcedureConstants.CURSOR),
+		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"), StoreProcedureConstants.CURSOR),
 		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-String"), StoreProcedureConstants.VARCHAR),
 		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Integer"), StoreProcedureConstants.INTEGER),
-		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Double"), StoreProcedureConstants.DECIMAL),
-		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Date"), StoreProcedureConstants.DATE),
+		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), StoreProcedureConstants.DECIMAL),
+		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), StoreProcedureConstants.DATE),
 		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"), StoreProcedureConstants.BOOLEAN),
-		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Formula"), StoreProcedureConstants.FORMULA),
+		new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"), StoreProcedureConstants.FORMULA),
 		new NameObject("IN",StoreProcedureConstants.IN),
 		new NameObject("OUT",StoreProcedureConstants.OUT),
 		new NameObject("INOUT",StoreProcedureConstants.INOUT)
@@ -124,22 +124,22 @@ public class StoreProcedureParameterPane extends BasicPane {
 		Object value = valueEditPane.update();
 		String type = "";
 		if(value instanceof CursorEditor)
-			type=com.fr.design.i18n.Toolkit.i18nText("Cursor");
+			type=com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor");
 		else if(value instanceof String ){
 			if(((String) value).length() > 0 && ((String) value).charAt(0) == '=')
-				type = com.fr.design.i18n.Toolkit.i18nText("Formula");
+				type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
 			else
 				type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
 		}else if(value instanceof Integer)
 			type = com.fr.design.i18n.Toolkit.i18nText("Integer");
 		else if(value instanceof Double)
-			type = com.fr.design.i18n.Toolkit.i18nText("Double");
+			type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
 		else if(value instanceof Date)
-			type = com.fr.design.i18n.Toolkit.i18nText("Date");
+			type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
 		else if(value instanceof Boolean)
 			type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean");
 		else if(value instanceof BaseFormula)
-			type = com.fr.design.i18n.Toolkit.i18nText("Formula");
+			type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
 		else 
 			type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
 		int typeVl = getInfo4Value(type);

designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java

@@ -116,13 +116,13 @@ public class JWizardDialog extends BasicDialog {
 				next();
 			}
 		});
-		buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Finish"));
+		buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Finish"));
 		buttonFinish.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
 				finish();
 			}
 		});
-		buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+		buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
 		buttonCancel.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
 				cancel();

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -100,7 +100,7 @@ public abstract class UIDialog extends JDialog {
     }
 
     private void addCancelButton(JPanel buttonsPane) {
-        cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+        cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
         cancelButton.setName(CANCEL_BUTTON);
         cancelButton.setMnemonic('C');
         buttonsPane.add(cancelButton);

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

@@ -222,7 +222,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
         String name = currentEditor.getName();
         Object columnIndex = currentEditor.getValue();
         //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了?
-        if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) {
+        if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = ((FormulaEditor) currentEditor).getFormula();
         }
 

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

@@ -207,7 +207,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
         Object columnIndex = currentEditor.getValue();
         //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了?
         //MoMeak：我也想注释了，但是有bug啊。。。
-        if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) {
+        if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
             columnIndex = ((FormulaEditor) currentEditor).getFormula();
         }
 

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

@@ -232,7 +232,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new SpinnerIntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor
         };
@@ -249,7 +249,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget"))
@@ -267,11 +267,11 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"))
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"))
         };
     }
 
@@ -286,11 +286,11 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
@@ -302,7 +302,7 @@ public class ValueEditorPaneFactory {
      */
     public static Editor<?>[] cellGroupEditor() {
         return new Editor[]{
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
@@ -331,7 +331,7 @@ public class ValueEditorPaneFactory {
     public static Editor<?>[] dateEditors(String popupName, String textEditorValue) {
         return new Editor[]{
                 new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))
         };
     }
@@ -348,11 +348,11 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                 new ColumnSelectedEditor(),
                 //23328 allEditors中删除控件选项
 //                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Widget"))
@@ -369,7 +369,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
         };
     }
@@ -385,7 +385,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor,
                 new ParameterEditor(),
@@ -415,7 +415,7 @@ public class ValueEditorPaneFactory {
     public static Editor<?>[] dateEditors() {
         FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
         return new Editor[]{
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 formulaEditor,
                 new ParameterEditor(),
         };
@@ -434,7 +434,7 @@ public class ValueEditorPaneFactory {
                 new TextEditor(),
                 new IntegerEditor(),
                 new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                 new BooleanEditor(),
                 formulaEditor
         };
@@ -451,7 +451,7 @@ public class ValueEditorPaneFactory {
         list.add(new TextEditor());
         list.add(new IntegerEditor());
         list.add(new DoubleEditor());
-        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")));
+        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")));
         list.add(new BooleanEditor());
 
         FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));

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

@@ -23,7 +23,7 @@ public class ColumnNameEditor extends ColumnIndexEditor {
     }
 
     public ColumnNameEditor(String[] columnNames) {
-        this(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"));
+        this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"));
     }
 
     public ColumnNameEditor(final String[] columnNames, String name) {

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

@@ -12,10 +12,10 @@ public class CursorEditor extends Editor<CursorEditor> {
 	
 	public CursorEditor(){
 		this.setLayout(FRGUIPaneFactory.createCenterFlowLayout());
-		label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
+		label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
 		this.add(label);
 		this.setPreferredSize(new Dimension(10,20));
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
 		this.setEnabled(false);
 	}
 
@@ -36,7 +36,7 @@ public class CursorEditor extends Editor<CursorEditor> {
 
 	@Override
 	public void setValue(CursorEditor value) {
-		label.setText(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
+		label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
 	}
 
 }

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

@@ -52,7 +52,7 @@ public class OldColumnIndexEditor extends Editor {
 
 	protected void initComponents() {
 		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"));
+		nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"));
 		indexCheckBox.addActionListener(actionListener);
 		nameCheckBox.addActionListener(actionListener);
 		javax.swing.ButtonGroup buttonGroup = new javax.swing.ButtonGroup();

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

@@ -179,12 +179,12 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                         FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"));
                         JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                     } else {
-                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                     }
                 }
             });
         } catch (Exception e1) {
-            JOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(PluginFromStorePane.this, e1.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

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

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

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

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

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

@@ -201,7 +201,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
                     FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
                     JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                 } else {
-                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                 }
             }
         });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -176,7 +176,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             if (nodeFile.isLocked()) {
                 if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"),
-                        com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
                     refreshDockingView();
                 }
                 break;

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

@@ -138,7 +138,7 @@ public class FunctionManagerPane extends BasicPane {
 	                    }).setVisible(true);
                 }
             });
-            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
             editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
             reportletNamePane.add(editorButton);
             editorButton.addActionListener(createEditorButtonActionListener());

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

@@ -81,7 +81,7 @@ public class JavaEditorPane extends BasicPane {
         JPanel toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
         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"));
+        UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile"));
         compileButton.setAction(new CompilerAction());
         toolbarPane.add(saveButton);
         toolbarPane.add(compileButton);
@@ -168,7 +168,7 @@ public class JavaEditorPane extends BasicPane {
 
     private class CompilerAction extends AbstractAction {
         public CompilerAction() {
-            super(com.fr.design.i18n.Toolkit.i18nText("Compile"));
+            super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile"));
         }
         public void actionPerformed(ActionEvent e) {
             new SwingWorker<JavaCompileInfo, Void>() {

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

@@ -38,7 +38,7 @@ public abstract class SortFormulaPane extends JPanel {
         sortFormulaTextField = new UITextField(16);
         //Lance:添加一公式编辑器按钮
         sortFormulaTextFieldButton = new UIButton("...");
-        sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "...");
+        sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "...");
         sortFormulaTextFieldButton.setPreferredSize(new Dimension(25, sortFormulaTextFieldButton.getPreferredSize().height));
         sortFormulaTextFieldButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
@@ -48,7 +48,7 @@ public abstract class SortFormulaPane extends JPanel {
 
         this.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsetText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_sort_order") + ":"),
                 sortOrderComboBox, new UILabel(InsetText),
-                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Formula") + ":="), sortFormulaTextField, //selectButton,
+                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + ":="), sortFormulaTextField, //selectButton,
                 sortFormulaTextFieldButton}, FlowLayout.LEFT));
     }
     

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

@@ -25,7 +25,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
 		this.add(pane, BorderLayout.NORTH);
 		
 		JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column") + ":"));
+		colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":"));
 		pane.add(colPane);
 		
 		initColSpinner();

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

@@ -55,7 +55,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 
 		});
 
-		addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add"));
+		addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Basic_Utils_Move_Up"));

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

@@ -91,7 +91,7 @@ public class ImgChoosePane extends BasicPane {
 			}
 		});
 
-		clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Clear"));
+		clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear"));
 		clearButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				previewPane.setImage(null);

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

@@ -108,10 +108,10 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
             formulaEditor.setEnabled(true);
             textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
         } catch (Exception e) {
-            valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
+            valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1);
             FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
             formulaEditor.setEnabled(true);
-            textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
+            textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1);
         }
     }
 

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

@@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
 		
 		JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property"));
+		this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property"));
 		buttonPane.add(this.addButton, BorderLayout.WEST);
 		this.add(buttonPane, BorderLayout.NORTH);
 		

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

@@ -494,7 +494,7 @@ public class RegPane extends BasicPane {
             } else if (value instanceof LengthReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"));
             } else if (value instanceof MailReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"));
             } else if (value instanceof PhoneReg){
                 this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone"));
             } else if (value instanceof MobileReg) {

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

@@ -380,7 +380,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
         UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"),
                 new ReportletHyperlink(), ReportletHyperlinkPane.class);
 
-        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"),
+        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
                 new EmailJavaScript(), EmailPane.class);
 
         UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),

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

@@ -69,8 +69,8 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener {
         tableDataDictPane.tableDataNameComboBox.addItemListener(this);
 
         //初始化按钮对象
-        addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("add"));
-        delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete"));
+        addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
+        delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
         //初始化Table对象,并添加renderer和editor
         model = new LayerDepenceTableModel();
         dependenceTable = new JTable();

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

@@ -47,7 +47,7 @@ public class AlignmentComboBox extends UIComboBox {
 
 	public static String getAlignDescription(int alignment) {
 		if (alignment == Constants.CENTER) {//0
-			return com.fr.design.i18n.Toolkit.i18nText("Center");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center");
 		} else if (alignment == Constants.TOP) {//1
 			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top");
 		} else if (alignment == Constants.LEFT) {//2

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

@@ -20,13 +20,13 @@ public class DictionaryConstants {
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"),
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"),
-		com.fr.design.i18n.Toolkit.i18nText("Float"),
-		com.fr.design.i18n.Toolkit.i18nText("Email"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
 		com.fr.design.i18n.Toolkit.i18nText("Phone"),
 		com.fr.design.i18n.Toolkit.i18nText("MobilePhone"),
 		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")};
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
 	
 	public final static int REG_NONE = 0;
 	public final static int REG_REQUIRED = 1;

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

@@ -214,7 +214,7 @@ public class UIMenuTable extends JTable {
 		UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Reportlet"),
 				new ReportletHyperlink(), ReportletHyperlinkPane.class);
 
-		UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"),
+		UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
 				new EmailJavaScript(), EmailPane.class);
 
 		UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),

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

@@ -220,12 +220,12 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 
 		private Component component = null;
 		public DeleteAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
 		}
 		
 		public DeleteAction(Component component){
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
 			this.component = component;
 		}

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

@@ -63,7 +63,7 @@ public class UISearchTextField extends UITextField {
 	private void initTextField() {
 		iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 		iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Search"));
-		clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Clear"));
+		clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear"));
 		clearLabel.setOpaque(false);
 		iconSize = iconLabel.getPreferredSize();
 		infoSize = infoLabel.getPreferredSize();

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

@@ -198,7 +198,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         JPanel jp1 = new JPanel(new BorderLayout());
         basicPane = new JPanel();
         seniorPane = new JPanel();
-        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane());
+        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
         seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
 
         jp1.add(basicPane, BorderLayout.NORTH);

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

@@ -95,7 +95,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         this.add(borderPanel, BorderLayout.NORTH);
 
         backgroundPane = new BackgroundPane();
-        backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), 280, 24, backgroundPane);
+        backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundPane);
         this.add(backgroundPanel, BorderLayout.CENTER);
         initAllNames();
         outerToggleButton.addChangeListener(outerToggleButtonChangeListener);
@@ -148,7 +148,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
     }
 
     @Override

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

@@ -46,7 +46,7 @@ public class DecodeDialog {
 		hintsLabel.setForeground(Color.RED);
 		hintsLabel.setVisible(false);
 
-		confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Confirm"));
+		confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"));
 		confirmButton.setBounds(180, 90, 60, 25);
 		confirmButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -63,7 +63,7 @@ public class DecodeDialog {
 			}
 		});
 
-		UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+		UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
 		cancelButton.setBounds(250, 90, 60, 25);
 		cancelButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {

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

@@ -42,7 +42,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Desktop");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Desktop");
 	}
 
 	@Override

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

@@ -84,7 +84,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 	 * @return 同上
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
 	}
 
 	@Override

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

@@ -58,7 +58,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT), backgroundColorPane},
         };
         double[] rowSize = {p, p, p};
         double[] columnSize = {p, f};

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

@@ -334,7 +334,7 @@ public abstract class ToolBarMenuDock {
             insertMenu(menuDef, MenuHandler.FILE);
             return menuDef;
         }
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F');
 
         ShortCut[] scs = new ShortCut[0];
         if (!DesignerMode.isAuthorityEditing()) {

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

@@ -18,7 +18,7 @@ import com.fr.stable.ArrayUtils;
 public class VcsScene {
 
     public static MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F');
 
         ShortCut[] scs = new ShortCut[0];
         if (!ArrayUtils.isEmpty(scs)) {

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

@@ -56,7 +56,7 @@ public class BasicPropertyPane extends BasicPane {
                 }
             }
         };
-        widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"));
+        widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p};

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

@@ -47,7 +47,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
 		case DataControl.TYPE_BOOLEAN:
 			return  new BooleanEditor(false);
 		case DataControl.TYPE_DATE:
-			return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date"));
+			return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
 		case DataControl.TYPE_TABLEDATA:
 			return onlyServer ? new ServerDataTableEditor() : new DataTableEditor();
 		default:

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

@@ -25,7 +25,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
     @Override
     public String encode(Object v) {
         if (v instanceof ColorBackground) {
-            return com.fr.design.i18n.Toolkit.i18nText("Color");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
         } else if (v instanceof TextureBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
         } else if (v instanceof PatternBackground) {

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

@@ -691,7 +691,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@@ -120,7 +120,7 @@ public class ParameterInputPane extends BasicPane {
 		} else if (pv instanceof Float) {
 			editors[0] = new FloatEditor();
 		} else if (pv instanceof Date) {
-			editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date"));
+			editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
 		} else if (pv instanceof Boolean) {
 			editors[0] = new BooleanEditor();
 		} else if (pv instanceof BaseFormula) {

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

@@ -24,7 +24,7 @@ public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> {
 
 	@Override
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary");
 	}
 
 	@Override

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

@@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
@@ -44,7 +43,7 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary");
     }
 
     @Override

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

@@ -45,7 +45,7 @@ public class AlignmentPane extends BasicPane {
     private UIRadioButton rightToLeftRB;
     //    private UIComboBox imageComboBox;
     private static final String[] IMAGE = {
-            com.fr.design.i18n.Toolkit.i18nText("Default"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Extend")
     };
     private UIBasicSpinner leftIndentSpinner;

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

@@ -157,7 +157,7 @@ public class BorderPane extends BasicPane {
 		rightTopPane.add(first, BorderLayout.NORTH);
 
 		JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color") + ":"));
+		second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + ":"));
 
 		second.add(this.currentLineColorPane);
 		rightTopPane.add(second, BorderLayout.CENTER);
@@ -216,7 +216,7 @@ public class BorderPane extends BasicPane {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Border");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border");
 	}
 
 	// p:populate Style

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

@@ -61,7 +61,7 @@ public class FormatBox extends BasicPane {
 		typeBox.addItem(FormatField.getInstance().getName(FormatContents.TIME));
 		typeBox.addItem(FormatField.getInstance().getName(FormatContents.TEXT));
 		
-		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Format") + ":"));
+		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format") + ":"));
 		formatBox = new UIComboBox();
 		// kunsnat: 大小: 这个有的格式的大小需要很宽!
 		formatBox.setPreferredSize(new Dimension(150, 20));

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

@@ -85,7 +85,7 @@ public class BackgroundPane extends BasicPane {
     
     @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Background");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background");
     }
 
 

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

@@ -29,7 +29,7 @@ public class BackgroundUIComboBoxPane extends BasicPane {
     private static final long serialVersionUID = -3751191424737067321L;
 
     protected static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None");
-    protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors");
+    protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors");
     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("Fine-Design_Basic_Gradient_Color");
 

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

@@ -32,7 +32,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 layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default");
     private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled");
 
     private String suffix = PictureCollection.DEFAULT_SUFFIX;

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

@@ -63,7 +63,7 @@ public class PatternBackgroundPane extends BPane {
 
     protected void setChildrenOfContentPane(JPanel contentPane) {
         // colors
-        JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Colors"));
+        JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"));
         contentPane.add(colorPane);
 
         foregroundColorPane = new ColorSelectBox(80);
@@ -72,12 +72,12 @@ public class PatternBackgroundPane extends BPane {
         backgroundColorPane.setSelectObject(Color.black);
 
         colorPane.add(Box.createHorizontalStrut(2));
-        colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Foreground")
+        colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground")
             + ":", foregroundColorPane));
 
         colorPane.add(Box.createHorizontalStrut(8));
 
-        colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Background")
+        colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")
             + ":", backgroundColorPane));
     }
 

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

@@ -31,9 +31,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange {
 		this.add(pane, BorderLayout.NORTH);
 		
 		pane.add(patternBox = new PatternSelectBox(80));
-		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":"));
+		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":"));
 		pane.add(foreColor = new ColorSelectBox(80));
-		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background") + ":"));
+		pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":"));
 		pane.add(backColor = new ColorSelectBox(80));
 	}
 	

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

@@ -53,7 +53,7 @@ public class ColorUIComboBoxPane extends BackgroundPane4BoxChange {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
 	}
 
 }

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

@@ -36,7 +36,7 @@ public class DetailColorSelectPane extends BasicPane {
         this.setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-        JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Color"));
+        JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"));
         JPanel defaultPane =FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
         this.add(titledefaultPane, BorderLayout.WEST);
         titledefaultPane.add(defaultPane);

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

@@ -41,7 +41,7 @@ public abstract class TransparentPane extends BasicPane {
 
 		initCenterPaneChildren(centerPane);
 
-		UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Custom")
+		UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")
 				+ "...");
 		this.add(customButton, BorderLayout.SOUTH);
 		customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));        

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

@@ -227,7 +227,7 @@ public class DesignUtils {
 
         //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整.
         Locale designerLocale = GeneralContext.getLocale();
-        String file = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File");
+        String file = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File");
         char displayChar = file.charAt(0);
         if (!guiFRFont.canDisplay(displayChar)) {
             //如果不能用默认的语言显示字体, 比如想在英文系统里用中文设计器

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

@@ -183,7 +183,7 @@ public class CustomIconPane extends BasicPane {
 	}
 
 	private void initEditButton(JPanel buttonPane) {
-		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
 		editButton.setPreferredSize(new Dimension(80, 25));
 		editButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {

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

@@ -29,7 +29,7 @@ public class IconDefinePane extends BasicPane {
         labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0));
         showIconImageLable = new UILabel();
         showIconImageLable.setPreferredSize(new Dimension(20, 20));
-        editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
         JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         labelPane.add(showIconImageLable);
         iconPane.add(labelPane, BorderLayout.WEST);

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

@@ -34,7 +34,7 @@ public class WidgetBoundsPaneFactory {
         final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
     }
     public static JPanel createRightPane(Component com1, Component com2){
         double f = TableLayout.FILL;
@@ -70,7 +70,7 @@ public class WidgetBoundsPaneFactory {
         centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
         boundsPane.add(northPanel, BorderLayout.NORTH);
         boundsPane.add(centerPanel, BorderLayout.CENTER);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane);
     }
 
 
@@ -87,6 +87,6 @@ public class WidgetBoundsPaneFactory {
         final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         boundsPane.add(panel);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
     }
 }

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

@@ -28,8 +28,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("Fine-Design_Report_Common"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_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"),

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

@@ -34,7 +34,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         UILabel headLabel = createUILable();
         initBackgroundEditor();
-        String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
+        String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
 
         double f = TableLayout.FILL;
         final double p = TableLayout.PREFERRED;
@@ -68,7 +68,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
     }
 
     protected UILabel createUILable(){
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"));
+        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"));
     }
 
     public void update(T e){

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

@@ -22,7 +22,7 @@ public class DateValuePane extends JPanel {
     private UIButtonGroup widgetValueHead;
     private Editor[] editor;
     private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
-    private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
+    private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
     private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula");
 
 

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

@@ -42,9 +42,9 @@ public abstract class CustomJobPane  extends BasicBeanPane {
 				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
 				classNameTextField.getPreferredSize().height));
 
-        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
         editButton.setPreferredSize(new Dimension(
-				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
+				GraphHelper.getLocTextWidth("Fine-Design_Basic_Edit") + 20,
                 classNameTextField.getPreferredSize().height));
 
 		reportletNamePane.add(browserButton);

designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java

@@ -56,7 +56,7 @@ public class ChartDialog extends MiddleChartDialog {
     	this.add(buttonPane, BorderLayout.SOUTH);
     	
     	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
-    	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
+    	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
     	
     	buttonPane.add(ok);
     	buttonPane.add(cancel);

designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java

@@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane  {
     private ColorSelectBox colorSelectBox;
 
     public BorderAttriPane() {
-    	this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
+    	this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"));
     }
     
     public BorderAttriPane(String lineString, String colorSting) {

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

@@ -84,7 +84,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
 
         this.add(northPane, BorderLayout.NORTH);
 
-        String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
+        String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
         seriesPane = new UICorrelationPane(columnNames) {
             public UITableEditor createUITableEditor() {
                 return new InnerTableEditor();
@@ -115,7 +115,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
      * @return  标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Cell");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
     }
 
     @Override

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

@@ -45,7 +45,7 @@ public class MapReportCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerRepo
      * @return  返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Cell");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
 	}
 
 	@Override

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

@@ -84,7 +84,7 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
 	 * 界面弹出标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Cell");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
 	}
 
 	@Override

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

@@ -78,7 +78,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 		typePane.add(maPane);
 		
 		maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average")));
-		maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle") + ":"));
+		maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle") + ":"));
 		maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1)));
 		maSpinner.setEnabled(false);
 		
@@ -101,10 +101,10 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 		
 		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":"));
 		extendsPane.add(forwardLabel = new UITextField("0", 5));
-		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle")));
+		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
 		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":"));
 		extendsPane.add(backwardLabel = new UITextField("0", 5));
-		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle")));
+		extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
 		
 		return extendsPane;
 	}

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

@@ -19,7 +19,7 @@ public class DataSeriesAttrCustomPane extends DataSeriesAttrPane {
 	
 	public NameableCreator[] createNameableCreators() {
 		return new NameableCreator[] {
-				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class)
+				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class)
 		};
 	}
 }

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

@@ -37,7 +37,7 @@ public class DataSeriesAttrPane extends JListControlPane {
     @Override
     public NameableCreator[] createNameableCreators() {
         return new NameableCreator[]{
-                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot))
+                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot))
         };
     }
 

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

@@ -32,10 +32,10 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane<DataSe
 
     public LabelBackgroundPane(final ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane, true);
-        backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background"));
+        backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"));
         this.backgroundPreviewPane = new BackgroundPreviewLabel();
         this.backgroundPreviewPane.setPreferredSize(new Dimension(80, 20));
-        UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"));
+        UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
         MouseAdapter mouseListener = new MouseAdapter() {
             public void mousePressed(MouseEvent evt) {
                 final BackgroundPane backgroundPane = new BackgroundPane();

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

@@ -41,7 +41,7 @@ public class LabelColorPane extends ConditionAttrSingleConditionPane<DataSeriesC
      */
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Color");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
     }
 
     @Override

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

@@ -62,7 +62,7 @@ public class TooltipContentsPane extends BasicPane{
 
 		valuePane.add(showValueCB);
 
-		UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Format"));
+		UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format"));
 		valuePane.add(valueFormatButton);
 
 		valueFormatButton.addActionListener(listener);
@@ -84,7 +84,7 @@ public class TooltipContentsPane extends BasicPane{
 
 		percentValuePane.add(showPercent);
 
-		UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Format"));
+		UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format"));
 		percentValuePane.add(valueFormatButton);
 
 		valueFormatButton.addActionListener(percentListener);

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

@@ -116,7 +116,7 @@ public class DataLabelPane extends TooltipContentsPane {
         leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"));
         rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"));
         topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
-        centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
+        centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"));
 
         ButtonGroup bg = new ButtonGroup();
         bg.add(bottomButton);

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

@@ -22,7 +22,7 @@ public class RangeDataLabelPane extends DataLabelPane {
     protected JPanel createJPanel4Position() {
     	topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
     	bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"));
-    	centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
+    	centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"));
 		
 		ButtonGroup bg = new ButtonGroup();
 		bg.add(topButton);

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

@@ -4,7 +4,7 @@ package com.fr.design.mainframe.chart;
 
 public class PaneTitleConstants {
 	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_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Chart_Animation_Special");
 	
@@ -12,7 +12,7 @@ public class PaneTitleConstants {
 	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_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Chart_Data_Label");
 	public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line");

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

@@ -112,7 +112,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background")),colorSelectBox4carousel, null}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null}
         };
 
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
@@ -143,7 +143,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
 
     private JPanel createButtonBackgroundColorPane(){
         colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH);
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), colorSelectBox4button, EDIT_AREA_WIDTH);
     }
 
     private JPanel createButtonConfigPane() {

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

@@ -37,7 +37,7 @@ public class ChartDesignerOtherPane extends ChartOtherPane {
      * @return 返回标题.
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Advanced");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced");
     }
 
     private boolean isHaveCondition() {

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

@@ -24,7 +24,7 @@ public class PresentComboBox extends UIComboBox{
 	private Present present;
 	
 	private String[] ITEMS = {
-			com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"),
 			com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"),
 			com.fr.design.i18n.Toolkit.i18nText("Present-No_Present")
 	};