相应调整

6 years ago · 286f636341
58 changed files with 78 additions and 78 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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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
@ -88,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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_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("Fine-Design_Chart_Inner")));
+		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_Style_Font_Size"), null));
        
        String[] styles = {
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")};
+            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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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
@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog {
    	
    	this.add(buttonPane, BorderLayout.SOUTH);
    	
-    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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/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/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("Fine-Design_Chart_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("Fine-Design_Chart_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/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("Fine-Design_Chart_Font_Plain"),
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"),
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"),
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")};
+				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));
 		
--- 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,7 +59,7 @@ 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("Fine-Design_Chart_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);
--- 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("Fine-Design_Chart_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/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("Fine-Design_Chart_Font_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
@ -34,7 +34,7 @@ public class ChartAxisLineStylePane extends BasicPane{
 		axisLineColor = new ColorSelectBox(100);
 		
 <<<<<<< HEAD
-		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")};
+		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
--- 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("Fine-Design_Chart_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("Fine-Design_Chart_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);
--- 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("Fine-Design_Chart_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("Fine-Design_Chart_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/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("Fine-Design_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/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("Fine-Design_Chart_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/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("Fine-Design_Chart_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/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("Fine-Design_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/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/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/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("Fine-Design_Chart_Page_Setup_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("Fine-Design_Chart_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/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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_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("Fine-Design_Chart_Font_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("Fine-Design_Chart_Font_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("Fine-Design_Chart_None"));
+		noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"));
 		noneParentText.setRectDirection(Constants.RIGHT);
-		parentCardPane.add("Fine-Design_Chart_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("Fine-Design_Chart_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, "Fine-Design_Chart_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, "Fine-Design_Chart_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("Fine-Design_Chart_Font"), 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("Fine-Design_Chart_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("Fine-Design_Chart_Page_Setup_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("Fine-Design_Chart_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