Merge pull request #331 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0

主要修改chart部分的key，恢复了些因为report命名的key * commit '286f6363410939a711532599ccf9c9f2f6cbe55e': 相应调整重构调整 found and correct the bug occur a bug..
6 years ago · 633d0eaeae
98 changed files with 142 additions and 141 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
@ -40,7 +40,7 @@ public class AboutDialog extends JDialog implements ActionListener {
        JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
        this.setContentPane(defaultPane);

-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
        okButton.addActionListener(this);

        tabbedPane = new UITabbedPane();
--- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane {
    private static final String ALLOWED_INTEGER_TYPE = "0123456789";
    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("OK"));
+    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 int ifHasBeenWriten = 0;
    private UITextArea detailField;
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
        newCharSetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
        message = new UILabel();
        uiLabel = new UILabel();
-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
        cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
        this.setLayout(FRGUIPaneFactory.createBorderLayout());
        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
--- a/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java
@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{
 		private JPanel createControlButtonPane() {
 			controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

-			okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("OK") + "</font></html>") {
+			okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK") + "</font></html>") {
 				@Override
 				public Dimension getPreferredSize() {
 					// TODO Auto-generated method stub
--- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog {
    }

    private void addOkButton(JPanel buttonsPane) {
-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
        okButton.setName(OK_BUTTON);
        okButton.setMnemonic('O');
        buttonsPane.add(okButton);
--- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel {
        gap.setPreferredSize(new Dimension(26,1));
        sPane.add(gap);

-        UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) {
+        UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) {
            public Dimension getPreferredSize() {
                return new Dimension(32,18);
            }
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
        this.add(selectTreeDataPanel, BorderLayout.NORTH);

        valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
        formulaEditor.setEnabled(true);
        textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
        Component[][] coms = {
@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
            String[] columnNames = new String[namelist.size()];
            namelist.toArray(columnNames);
            valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
            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);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            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);
        }
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
@ -17,7 +17,7 @@ public class DictionaryConstants {
 		"^\\d{6}$" };
 	
 	public final static String[] regexpsDisplays = new String[] {
-		com.fr.design.i18n.Toolkit.i18nText("None"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
 		com.fr.design.i18n.Toolkit.i18nText("Required"),
 		com.fr.design.i18n.Toolkit.i18nText("Length"),
 		com.fr.design.i18n.Toolkit.i18nText("Float"),
@ -55,7 +55,7 @@ public class DictionaryConstants {
 	};
 	
 	public static final String[] symbolDisplays = new String[]{
-		com.fr.design.i18n.Toolkit.i18nText("None"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
 		com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"),
 		com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes")
 	};
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
@ -10,7 +10,6 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;

 import javax.swing.DefaultComboBoxModel;
@ -20,8 +19,6 @@ import javax.swing.JList;
 import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.base.ScreenResolution;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.general.FRFont;

 import com.fr.stable.Constants;
@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox {
            FontMetrics fm = GraphHelper.getFontMetrics(rfont);
            if (style == Constants.LINE_NONE) {
                //draw "none" string
-                GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
+                GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
            } else {
                GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style);
            }
--- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
@ -106,7 +106,7 @@ public class UISBChooser extends JDialog {
        JButton b = new JButton("Cancel");
        b.addActionListener(new CancelAction());
        p3.add(b);
-        b = new JButton("OK");
+        b = new JButton("Fine-Design_Report_OK");
        getRootPane().setDefaultButton(b);
        b.addActionListener(new OKAction());
        p3.add(b);
--- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java
+++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java
@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame
        UITextField textfieldState   = new UITextField(2);
        UITextField textfieldZip     = new UITextField(5);

-        UIButton buttonOk = new UIButton("OK");
+        UIButton buttonOk = new UIButton("Fine-Design_Report_OK");
        UIButton buttonCancel = new UIButton("Cancel");
        JPanel panelButton = new JPanel();
        panelButton.add(buttonOk);
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
 		case DataControl.TYPE_NUMBER:
 			return new DoubleEditor();
 		case DataControl.TYPE_FORMULA:
-			return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+			return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
 		case DataControl.TYPE_DATABINDING:
 			return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
 		case DataControl.TYPE_STRING:
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
        } else if (v instanceof GradientBackground) {
            return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
        } else {
-            return com.fr.design.i18n.Toolkit.i18nText("None");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
        }
    }

--- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
+++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
@ -879,7 +879,7 @@ public class KeySetUtils {

        @Override
        public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink");
        }

        @Override
@ -990,7 +990,7 @@ public class KeySetUtils {

        @Override
        public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float");
        }

        @Override
--- a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java
@ -50,7 +50,7 @@ public class AlphaPane extends JPanel {
 		alphaPane.setBorder(BorderFactory.createEmptyBorder());
 		this.add(alphaPane, BorderLayout.CENTER);
 		
-		alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":"));
+		alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha") + ":"));
 		
 		alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE));
 		alphaSlider.setPreferredSize(new Dimension(80, 20));
--- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java
@ -108,7 +108,7 @@ public class BorderPane extends BasicPane {
 		// current color and current style excepting inside borders
 		borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External")));

-		borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside")));
+		borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner")));

 		// Control
 		JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
--- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java
@ -35,10 +35,10 @@ public class FontSizeStylePane extends JPanel {
        fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"), null));
        
        String[] styles = {
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")};

        styleField = new UITextField();
        styleField.setEditable(false);
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
    	buttonPane.add(ok);
    	buttonPane.add(cancel);
    	
-    	ok.setActionCommand("OK");
+    	ok.setActionCommand("Fine-Design_Report_OK");
    	ok.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				seletePane.setColor(okListener.getColor());
--- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
@ -21,9 +21,9 @@ import java.awt.*;
 public class DateValuePane extends JPanel {
    private UIButtonGroup widgetValueHead;
    private Editor[] editor;
-    private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None");
+    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 FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula");
+    private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula");


    public DateValuePane() {
@ -45,7 +45,7 @@ public class DateValuePane extends JPanel {
            @Override
            public void stateChanged(ChangeEvent e) {
                int index = widgetValueHead.getSelectedIndex();
-                if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) {
+                if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) {
                    customPane.setVisible(false);
                } else {
                    customPane.setVisible(true);
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog {
 		this.setModal(true);
 		this.setLayout(new BorderLayout());
    	final ChartTypePane chartTypePane = new ChartTypePane();
-    	setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"));
+    	setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"));

        this.applyClosingAction();
        this.applyEscapeAction();
@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog {
    	
    	this.add(buttonPane, BorderLayout.SOUTH);
    	
-    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
    	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
    	
    	buttonPane.add(ok);
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane {

        JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane);
        spane.setDividerLocation(120);
-        spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")));
+        spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")));
        this.add(spane);

        iconViewList.setSelectedIndex(0);
--- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java
@ -131,8 +131,8 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
 		double[] columnSize = {0.1, 0.2, 0.5, 0.2};
 		Component[][] components= {
 				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"),  contentField = new UITextField(3)},
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font") + ":"),  fontNameBox},
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") + ":"),  fontSizeBox},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font") + ":"),  fontNameBox},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") + ":"),  fontSizeBox},
 				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
 				{null,    null, 			rightButton = new UIRadioButton(getRightName())},
 				
--- a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java
@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane {
 	}

 	protected String getValueAxisName() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Main_Axis");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis");
    }
    
    protected String getSecondValueAxisName() {
--- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java
+++ b/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("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("Color"));
    }
    
    public BorderAttriPane(String lineString, String colorSting) {
--- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction {

    public SetChartStyleAciton(ChartComponent chartComponent) {
        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"));
    }

    public void actionPerformed(ActionEvent e) {
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java
@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane<TopDefinitionProvider> {

 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("LayerData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data");
 	}
 	
 	/**
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit
 		TextEditor textEidtor = new TextEditor();
 		initListeners(textEidtor);
 		
-		FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+		FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
 		initListeners(formulaEditor);
 		
 		Editor[] editors = new Editor[]{textEidtor, formulaEditor};
--- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer {
 	private ValueEditorPane cellEditor;
 	
 	public MapReportRenderer() {
-		Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"))};
+		Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"))};
 		cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors);
 	}
 	
--- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
@ -122,7 +122,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {

 		UIScrollPane pane = new UIScrollPane(recordTable);
 		pane.setPreferredSize(new Dimension(150, 320));
-		pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"})));
+		pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name")));

 		this.add(pane, BorderLayout.EAST);
 	}
@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane<String> {
 			});
 			bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT);
 			bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY());
-			bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"}));
+			bg.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name_Edit"));
 			bg.setVisible(true);
 		}

--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
@ -53,12 +53,12 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 		
 		JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		pane.add(namePane);
-		namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null));
-		namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"})));
+		namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trendline_Name"), null));
+		namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Name")));
 		namePane.add(nameLabel = new UITextField("", 6));
 		
 		pane.add(linePane = new BorderAttriPane());
-		linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null));
+		linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Line_Style"), null));
 		
 		JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
 		pane.add(typePane);
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java
@ -25,7 +25,7 @@ public class DataLabelContentsPane extends BasicPane {

    @Override
    protected String title4PopupWindow() {
-        return "Label";
+        return "Fine-Design_Chart_Label";
    }

    /**
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane {
 		nameBox.setPreferredSize(new Dimension(80, 20));
 		
 		String[] styles = {
-				com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"),
-				com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"),
-				com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"),
-				com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")};
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"),
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")};
 		this.add(fontStyleBox = new UIComboBox(styles));
 		fontStyleBox.setPreferredSize(new Dimension(80, 20));
 		
@ -66,7 +66,7 @@ public class DataLabelStylePane extends BasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return "Label";
+		return "Fine-Design_Chart_Label";
 	}
 	
 	public void populate(AttrContents seriesAttrContents) {
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java
@ -29,7 +29,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer
        super(conditionAttributesPane, isRemove);


-        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style") + ":");
+        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":");
        if (isRemove) {
            this.add(nameLabel);
        }
@ -40,7 +40,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer

    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Line-Style");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
@ -37,7 +37,7 @@ public class Bar2DDataLabelPane extends DataLabelPane {
        outSideButton.setSelected(true);
        
        JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
+        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
        buttonPane.add(outSideButton);
        buttonPane.add(insideButton);
        buttonPane.add(centerButton);
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
@ -32,7 +32,7 @@ public class BubbleDataLabelPane extends DataLabelPane {
 		outSideButton.setSelected(true);
 		
 		JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-		buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
+		buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
 		buttonPane.add(outSideButton);
 		buttonPane.add(insideButton);
 		
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
@ -69,7 +69,7 @@ public class DataLabelPane extends TooltipContentsPane {

    protected Component[] createComponents4ShowSeriesName() {
        if (showSeriesNameCB == null) {
-            showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Series", "WF-Name"}));
+            showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
        }
        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB};
    }
@ -82,7 +82,7 @@ public class DataLabelPane extends TooltipContentsPane {
    }

    protected String getCategoryString(){
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"StyleFormat-Category", "WF-Name"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name");
    }
   

@ -105,7 +105,7 @@ public class DataLabelPane extends TooltipContentsPane {
        JPanel labelStylePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
        JPanel westPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
        labelStylePane.add(westPane, BorderLayout.WEST);
-        westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "FRFont"}) + ":"));
+        westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Font") + ":"));
        labelStylePane.add(stylePane = new DataLabelStylePane(), BorderLayout.CENTER);
        return labelStylePane;
    }
@ -127,7 +127,7 @@ public class DataLabelPane extends TooltipContentsPane {
        topButton.setSelected(true);
        
        JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
+        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
        buttonPane.add(bottomButton);
        buttonPane.add(leftButton);
        buttonPane.add(rigtButton);
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
@ -66,7 +66,7 @@ public class PieDataLabelPane extends DataLabelPane {
        insideButton.setSelected(true);
        
        JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
+        buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
        buttonPane.add(insideButton);
        buttonPane.add(outSideButton);

--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
@ -32,7 +32,7 @@ public class RangeDataLabelPane extends DataLabelPane {
 		topButton.setSelected(true);
 		
 		JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-		buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
+		buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
 		buttonPane.add(topButton);
 		buttonPane.add(bottomButton);
 		buttonPane.add(centerButton);
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@ -59,12 +59,12 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
        floatNameBox.setPreferredSize(new Dimension(90, 20));

        JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float") + ":"));
+        pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float") + ":"));
        pane.add(floatNameBox);

        Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
        Font font = null;
-        TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"}), 4, 2, font, new Color(1, 159, 222));
+        TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related"), 4, 2, font, new Color(1, 159, 222));
        // 圆角不行
        centerPane.setBorder(border);

@ -144,7 +144,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy

    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related");
    }

    public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {
--- a/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java
+++ b/designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java
@ -73,7 +73,7 @@ public class MarkerComboBox extends UIComboBox {
 					g2d.setFont(rfont);
 					FontMetrics fm = GraphHelper.getFontMetrics(rfont);

-					GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
+					GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
 				} else {
 					if (marker.getBackground() == null) {
 						marker.setBackground(ColorBackground.getInstance(Color.black));
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
@ -119,7 +119,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
    }

    private JPanel createTitleStylePane() {
-        final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
+        final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
        styleAttrPane = new ChartTextAttrPane() {
            protected JPanel getContentPane(JPanel buttonPane) {
                double p = TableLayout.PREFERRED;
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
@ -38,7 +38,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
 			com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"),
 			com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"),
 			com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"),
-			com.fr.design.i18n.Toolkit.i18nText("FRFont-Size")
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")
 		};
 	}
 	
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
@ -33,7 +33,11 @@ public class ChartAxisLineStylePane extends BasicPane{
 		axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
 		axisLineColor = new ColorSelectBox(100);
 		
+<<<<<<< HEAD
+		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")};
+=======
 		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
+>>>>>>> 4c1c2515a1aee68b5a9e8d9b51be5a4a9d3fb1d6
 		Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
        Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
                BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),
@ -55,7 +59,7 @@ public class ChartAxisLineStylePane extends BasicPane{
        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} ,
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null},
                new Component[]{null, mainTickPosition},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null},
                new Component[]{null,secondTickPosition}
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane<Integer>{

 	public ChartBeautyPane() {
 		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
                com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent")   //新加的两种风格，注意兼容处理
           };

--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
@ -34,7 +34,7 @@ public class ChartBorderPane extends BasicPane{
 		double[] columnSize = { p,f };
 		double[] rowSize = {p, p, p, p};
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane},
                new Component[]{null,isRoundBorder}
        } ;
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane {
    }

    protected Component[][] getComponents(JPanel buttonPane) {
-        UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
+        UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
        return new Component[][]{
                new Component[]{null, null},
                new Component[]{text, fontNameComboBox},
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
        minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
        Date tmp = null;
        DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
-        Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+        Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
        Editor[] editor = new Editor[]{dateEditor, formulaEditor};
        minValueField = new ValueEditorPane(editor);
        minValueField.setEnabled(false);
@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
        maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
        Date tmp = null;
        DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
-        Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+        Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
        Editor[] editor = new Editor[]{dateEditor, formulaEditor};
        maxValueField = new ValueEditorPane(editor);
        maxValueField.setEnabled(false);
@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
    
    private void initMain() {
    	// 主要刻度单位
-        mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit"));
+        mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Unit"));
        mainUnitField = new UITextField();
        mainUnitField.setPreferredSize(new Dimension(30, 20));
        mainUnitField.setEditable(false);
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Label");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label");
    }

    private class ContentPane extends JPanel {
        private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value"));
-        private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units"));
+        private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units"));

        public ContentPane() {
            this.initComponents();
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java
@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane<Chart>{
            Component[][] components = new Component[][]{
                    new Component[]{null,textAttrPane},
                    new Component[]{new JSeparator(),null},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} ,
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),location} ,
                    new Component[]{new JSeparator(),null},
                    new Component[]{borderPane,null},
                    new Component[]{backgroundPane,null}
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java
@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane {
 		JPanel pane = new JPanel();
 		pane.setLayout(new BorderLayout());
 		
-		pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST);
+		pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pitch_Percentage") + ":"), BorderLayout.WEST);
 		pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER);
 		gapPane.populateBean(100.0);
 		
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
@ -249,9 +249,9 @@ public class CustomDefaultSeriesPane extends BasicPane{
            double[] rowSize = { p,p,p,p};
            Component[][] components = new Component[][]{
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
            };

            this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH);
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
@ -458,9 +458,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane<CustomAttr>{
            Component[][] components = new Component[][]{
                    new Component[]{positionPane, null},
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
            };

            this.setLayout(new BorderLayout());
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
@ -58,9 +58,9 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{
 		double[] rowSize = { p,p,p,p,p,p,p};
        Component[][] components = new Component[][]{
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
-                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
+                    new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
            };

        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
@ -78,7 +78,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
        JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize);
        Component[][] components = new Component[][]{
                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
                new Component[]{new JSeparator(), null},
                new Component[]{orderPane, null},
                new Component[]{colorPickerPane, null},
@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
                return components;
            } else {
                components = new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit},
                        new Component[]{new JSeparator(), null},
                        new Component[]{orderPane, null},
                        new Component[]{colorPickerPane, null},
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane {
    protected void initCom() {
        stylePane = new ChartBeautyPane();
        isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot"));
-        String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
+        String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
        Integer[] valueArray = {0, 1};
        secondPlotType = new UIButtonGroup<Integer>(nameArray, valueArray);
        smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1));
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
@ -57,7 +57,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle },
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak}
        } ;
        return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
 	}
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java
@ -72,7 +72,7 @@ public class ChartPreStyleAction extends UpdateAction {

 		@Override
 		public String getMenuName() {
-			return com.fr.design.i18n.Toolkit.i18nText("FR-Menu-Server_Chart_PreStyle");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Server_PreStyle");
 		}

 		@Override
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
@ -112,7 +112,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane {

    private JPanel createHyperlinkPane() {
        hyperLinkPane = new ExtendedChartHyperLinkPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperLinkPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperLinkPane);
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java
@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane {

    protected JPanel createHyperlinkPane() {
        hyperlinkPane = new VanChartCustomPlotHyperlinkPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane);
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java
@ -68,6 +68,6 @@ public class VanChartCustomTooltipPane extends BasicScrollPane<Chart> {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
    }
 }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java
@ -38,7 +38,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
        };
        transparent = new UINumberDragPane(0, 100);

-        JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha"), transparent);
+        JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent);

        this.setLayout(new BorderLayout());
        this.add(fillColorPane, BorderLayout.NORTH);
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java
@ -28,7 +28,7 @@ public class VanChartBeautyPane extends BasicBeanPane<Integer> {
        double[] columnSize = {f, e};
        double[] rowSize = {p};
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Style")), styleBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")), styleBox},
        } ;
        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
        this.setLayout(new BorderLayout());
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
@ -192,7 +192,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
        }

        private void addOkButton(JPanel buttonsPane) {
-            okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+            okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
            buttonsPane.add(okButton);
            okButton.addActionListener(new ActionListener() {

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java
@ -101,7 +101,7 @@ public class VanChartBackgroundPane extends BasicPane {
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
                new Component[]{null, centerPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java
@ -49,7 +49,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro
        return new Component[][]{
                new Component[]{typeComboBox, null},
                new Component[]{centerPane, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
        };
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java
@ -25,7 +25,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
                new Component[]{null, centerPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius}
        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java
@ -45,7 +45,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane {

        Component[][] components = new Component[][]{
                new Component[]{gradientBar, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Direction")),directionPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Direction")),directionPane},
        };
        JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
        this.setLayout(new BorderLayout());
@ -99,7 +99,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane {
     * @return     名称
     */
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Color");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color");
    }

 }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java
@ -31,7 +31,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{
                new Component[]{null,null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}
        };
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {

    protected JPanel createHyperlinkPane() {
        superLink = new VanChartHyperLinkPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), superLink);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), superLink);
    }


--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java
@ -33,12 +33,12 @@ public class VanChartDataSheetContentPane extends AbstractNormalMultiLineConditi

    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
    }

    @Override
    protected String getItemLabelString() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
@ -68,7 +68,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart

        Component[][] styleComponents = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),color},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha")),transparent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")),transparent},
        };
        temp = TableLayoutHelper.createTableLayoutPane(styleComponents, rowSize, columnSize);
        JPanel stylePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), temp);
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java
@ -88,7 +88,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
    protected Component[][] getLabelStyleComponents(Plot plot) {
        initGaugeStyle(plot);
        if (gaugeStyle == GaugeStyle.RING || gaugeStyle == GaugeStyle.SLOT) {
-            UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
+            UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
            return new Component[][]{
                    new Component[]{text,style},
                    new Component[]{textFontPane,null},
@ -124,7 +124,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
                }

                protected Component[][] getComponents(JPanel buttonPane) {
-                    UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
+                    UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
                    return new Component[][]{
                            new Component[]{text, fontNameComboBox},
                            new Component[]{null, buttonPane}
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
@ -180,7 +180,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
    }

    protected Component[][] getLabelStyleComponents(Plot plot) {
-        UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
+        UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
        return new Component[][]{
                new Component[]{null,null},
                new Component[]{text,style},
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java
@ -252,7 +252,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
    //不透明度
    protected JPanel createAlphaPane() {
        transparent = new UINumberDragPane(0, 100);
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), transparent);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent);
    }

    //堆积和坐标轴设置(自定义柱形图等用到)
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java
@ -118,7 +118,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
            }
        };

-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), style);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), style);
        JPanel panel1 = new JPanel(new BorderLayout());
        panel1.add(panel, BorderLayout.CENTER);
        panel1.add(textFontPane, BorderLayout.SOUTH);
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java
@ -71,7 +71,7 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane<Chart> {

    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
    }

    protected VanChartPlotTooltipPane getTooltipPane(Plot plot) {
--- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java
@ -96,7 +96,7 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
        detailComps = new Component[depth + 1][3];
        rowSize[0] = p;
        detailComps[0] = new Component[]{
-                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")),
+                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Descriptor")),
                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")),
                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Map_Type"))
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java
@ -83,7 +83,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
        double[] rowSize = {p,p,p,p,p,p};
        Component[][] components = new Component[][]{
                new Component[]{null},
-                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), textAttrPane)},
+                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)},
                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane)},
                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)},
                new Component[]{catalogSuperLink}
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java
@ -37,7 +37,7 @@ public class GanttAxisStylePane extends BasicBeanPane<GanttAxisStyleAttr> {
        Component[][] components = new Component[][]{
                new Component[]{textAttrPane, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelectBox4button},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}
        };

        JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col);
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
@ -53,7 +53,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
    private JPanel createGanntStylePane(){
        seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_New_Line"),seriesNewLine);
-        JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"), panel);
+        JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"), panel);
        return ganntStylePane;
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java
@ -67,7 +67,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {

    private JPanel createGaugeLayoutPane() {
        gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")});
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"),gaugeLayout);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"),gaugeLayout);
        gaugeLayout.addChangeListener(new ChangeListener() {
            @Override
            public void stateChanged(ChangeEvent e) {
--- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java
@ -140,7 +140,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {

        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);

-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), panel);
    }


--- a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java
@ -244,7 +244,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
    //不透明度
    private JPanel createPointAlphaPane() {
        pointAlphaPane = new UINumberDragPane(0, 100);
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), pointAlphaPane);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), pointAlphaPane);
    }

    private JPanel createPointEffectPane() {
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java
@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo
    @Override
    protected JPanel createHyperlinkPane() {
        hyperlinkPane = new VanChartMapHyperLinkPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane);
    }
    @Override
    protected void populateHyperlink(Plot plot) {
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java
@ -123,7 +123,7 @@ public class VanChartMapTooltipPane extends AbstractVanChartScrollPane<Chart> {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
    }
 }

--- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java
@ -49,7 +49,7 @@ public class VanChartCurvePane extends BasicBeanPane<AttrCurve>{
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Width")), lineWidth},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bedding")),bending},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), lineAlphaPane}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), lineAlphaPane}
        };
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java
@ -59,7 +59,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
                new Component[]{jPanel, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), nodeOpacity}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity}

        };
        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize);
--- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java
@ -84,7 +84,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor},
                new Component[]{jPanel, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), linkOpacity}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), linkOpacity}
        };

        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
--- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
+++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
        this.add(selectTreeDataPanel, BorderLayout.NORTH);

        valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
        formulaEditor.setEnabled(true);
        textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor});
        Component[][] coms = {
@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
            String[] columnNames = new String[namelist.size()];
            namelist.toArray(columnNames);
            valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
            formulaEditor.setEnabled(true);
            textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
        } catch (Exception e) {
            valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            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);
        }
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java
@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor {
 						setText(StringUtils.join("、", res));
 					}
 				} else {
-					setText(com.fr.design.i18n.Toolkit.i18nText("None"));
+					setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"));
 				}
 				return this;
 			}
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel {
            case DataControl.TYPE_NUMBER:
                return new DoubleEditor();
            case DataControl.TYPE_FORMULA:
-                return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+                return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
            case DataControl.TYPE_DATABINDING:
                return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
            case DataControl.TYPE_STRING:
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java
@ -26,7 +26,7 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB
    public ReportFontBoldAction(ElementCasePane t) {
        super(t);

-        this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"));
        this.setSmallIcon(ICONS, true);
    }

--- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java
@ -27,7 +27,7 @@ public class ReportFontSizeAction extends AbstractStyleAction {
 	public ReportFontSizeAction(ElementCasePane t) {
 		super(t);
 		
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size"));
    }

 	/**
--- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java
+++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java
@ -117,9 +117,9 @@ public class ParentPane extends BasicPane {
 			}
 		});

-		noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("None"));
+		noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"));
 		noneParentText.setRectDirection(Constants.RIGHT);
-		parentCardPane.add("None", noneParentText);
+		parentCardPane.add("Fine-Design_Report_None", noneParentText);
 		defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Default"));
 		defaultParentText.setRectDirection(Constants.RIGHT);
 		parentCardPane.add("Default", defaultParentText);
@ -174,7 +174,7 @@ public class ParentPane extends BasicPane {
 	private UIPopupMenu createPopMenu() {
 		UIPopupMenu pop = new UIPopupMenu();
 		pop.setOnlyText(true);
-		UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("None"));
+		UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"));
 		if (cellAttrPaneListener != null) {
 			noneItem.addActionListener(cellAttrPaneListener);
 		}
@ -182,7 +182,7 @@ public class ParentPane extends BasicPane {

 			@Override
 			public void actionPerformed(ActionEvent e) {
-				cardLayout.show(parentCardPane, "None");
+				cardLayout.show(parentCardPane, "Fine-Design_Report_None");

 			}
 		});
@ -241,7 +241,7 @@ public class ParentPane extends BasicPane {
 			this.cardLayout.show(parentCardPane, "Custom");
 			this.customParentColumnRowPane.populate(columnRow);
 		} else {
-			this.cardLayout.show(parentCardPane, "None");
+			this.cardLayout.show(parentCardPane, "Fine-Design_Report_None");
 			this.customParentColumnRowPane.populate(ColumnRow.valueOf(0, 0));
 		}
 	}
--- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java
+++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java
@ -238,7 +238,7 @@ public class HFAttributesEditDialog extends BasicPane {
    }

    private void addReportFontPaneToTab() {
-        this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FRFont"), this.frFontPane);
+        this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font"), this.frFontPane);
    }

    private void addFormatPaneToTab() {
--- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
@ -433,7 +433,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
        } else if (selectionType == CellSelection.CHOOSE_COLUMN) {
            type.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Column"));
        } else {
-            type.setText(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float"));
+            type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float"));
        }
    }

--- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
@ -159,7 +159,7 @@ public class PageSetupPane extends BasicPane {
            this.add(defaultPane, BorderLayout.NORTH);
            JPanel twoPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
            twoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-            JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"));
+            JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"));
            JPanel innerorientationPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
            orientationPane.add(innerorientationPane);
            twoPane.add(orientationPane);
--- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
@ -305,7 +305,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
                ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText());
                // barry:检查输入是否正确
                if (!ColumnRow.validate(columnRowEdit)) {
-                    Object[] options = {com.fr.design.i18n.Toolkit.i18nText("OK")};
+                    Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")};
                    JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), com.fr.design.i18n.Toolkit.i18nText("Warning"),
                            JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
                    // 重新选中当前的selection,把columnRowTextField