diff --git a/designer-base/src/main/java/com/fr/start/server/ServerTray.java b/designer-base/src/main/java/com/fr/start/server/ServerTray.java
index 48dff7dd1..ce2da0407 100644
--- a/designer-base/src/main/java/com/fr/start/server/ServerTray.java
+++ b/designer-base/src/main/java/com/fr/start/server/ServerTray.java
@@ -52,7 +52,7 @@ public class ServerTray {
         });
         startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start"));
         stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop"));
-        MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Exit"));
+        MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit"));
         //创建打开监听器
         ActionListener startListener = new ActionListener() {
         
diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java
index 6a09e07aa..c378ea300 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java
@@ -14,7 +14,7 @@ public class DSColumnAdvancedAction extends AbstractCellElementAction {
 	public DSColumnAdvancedAction(ElementCasePane t) {
 		super(t);
 		
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Advanced"));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"));
 		this.setMnemonic('A');
 		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
     }
diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
index 2f791dd3f..38de79701 100644
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
@@ -120,7 +120,7 @@ public class DSColumnAdvancedPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Advanced");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced");
     }
 
     public void populate(TemplateCellElement cellElement) {
diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
index 63d6c216b..cae7a5f51 100644
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
@@ -104,7 +104,7 @@ public class DSColumnPane extends BasicPane {
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane);
 
         advancedPane = new DSColumnAdvancedPane(setting);
-        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane);
+        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), advancedPane);
 
         this.setPreferredSize(new Dimension(610, 400));
     }
diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java
index 0a685c9c0..2097dfcfc 100644
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java
@@ -31,7 +31,7 @@ public abstract class ResultSetGroupPane extends JPanel {
 	protected UIComboBox groupComboBox;
 	
 	protected ResultSetGroupPane(){
-		groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Advanced")});
+		groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced")});
 	}
 
 	abstract void populate(TemplateCellElement cellElement);
diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java
index 84efb7d2d..577a0710b 100644
--- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java
+++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java
@@ -286,7 +286,7 @@ public class HFContainer extends JPanel implements Scrollable {
                 int returnVal = JOptionPane.showConfirmDialog(
                         SwingUtilities.getWindowAncestor(HFContainer.this),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Are_You_Sure_To_Delete_It") + "?",
-                        com.fr.design.i18n.Toolkit.i18nText("Delete"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.QUESTION_MESSAGE);
 
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
index 9bb72fa16..2bf49b6e3 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
@@ -1072,7 +1072,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 textFieldPane.add(formulaTextField, BorderLayout.CENTER);
                 textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
                 UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
-                formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "...");
+                formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula") + "...");
                 formulaButton.setPreferredSize(new Dimension(20, formulaTextField.getPreferredSize().height));
                 formulaButton.addActionListener(formulaButtonActionListener);