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

针对CHART-2724和CHART-2659的解决和完善 * commit 'fac5e41f0f1c141aaef2940ac520625bcf2aa116': 改key对应的使用
6 years ago · f4a8c5f91c
107 changed files with 299 additions and 298 deletions
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
@ -147,7 +147,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
     * @return 标题
     */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hyperlink");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink");
 	}

 }
--- 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
@ -70,7 +70,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
        double[] columnSize = {p, f};
        double[] rowSize = {p,p};
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Style")),configStyleButton},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Style")),configStyleButton},
                new Component[]{configPane, null},
        };
        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java
@ -222,12 +222,12 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
        }

        protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OnlyUseBeforeRecords"));
+            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
            JPanel panel1 = new JPanel(new BorderLayout());
            JPanel panel2 = new JPanel(new BorderLayout());
            panel1.add(onlyPreData, BorderLayout.NORTH);
            preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RecordsNum"));
+            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
            combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
            combineOther.setSelected(true);
            double p = TableLayout.PREFERRED;
@ -397,12 +397,12 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {


        protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OnlyUseBeforeRecords"));
+            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Only_Use_Before_Records"));
            JPanel panel1 = new JPanel(new BorderLayout());
            JPanel panel2 = new JPanel(new BorderLayout());
            panel1.add(onlyPreData, BorderLayout.NORTH);
            preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RecordsNum"));
+            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num"));
            combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
            combineOther.setSelected(true);
            double p = TableLayout.PREFERRED;
--- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
@ -72,7 +72,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
    }

    private JPanel creatNorthPane() {
-        emptyData = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        emptyData = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        emptyData.setSelectedIndex(0);
        emptyData.setPreferredSize(new Dimension(WIDTH, HEIGHT));
        emptyData.addActionListener(new ActionListener() {
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
@ -82,7 +82,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane {

    private JPanel createRefreshPane() {

-        refreshEnabled = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        refreshEnabled = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        refreshEnabled.addChangeListener(new ChangeListener() {
            @Override
            public void stateChanged(ChangeEvent e) {
--- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java
@ -69,7 +69,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {

            @Override
            public String getPaneTitle(){
-                return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Axis");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis");
            }
        };
        stackAndAxisEditExpandablePane =  TableLayout4VanChartHelper.createExpandablePaneWithTitle(stackAndAxisEditPane.getPaneTitle(), stackAndAxisEditPane);
--- a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java
@ -27,9 +27,9 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
        minDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
        maxDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
        shadow = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        displayNegative = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});



@ -49,10 +49,10 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
    protected Component[][] getComponent () {
        return new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MinDiameter")), minDiameter},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxDiameter")), maxDiameter},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min_Diameter")), minDiameter},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Diameter")), maxDiameter},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayNegative")), displayNegative},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Negative")), displayNegative},

        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
@ -80,7 +80,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
        imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));

        JPanel panel1 = new JPanel(new BorderLayout());
-        JPanel isFixedWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed_Column_Width"),isFixedWidth);
+        JPanel isFixedWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed_Column_Width"),isFixedWidth);
        isFixedWidthPane.setBorder(BorderFactory.createEmptyBorder(0,0,6,0));
        panel1.add(isFixedWidthPane, BorderLayout.NORTH);
        panel1.add(columnWidth, BorderLayout.CENTER);
@ -92,7 +92,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
        JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col);

        Component[][] components3 = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Filled_With_Image")),isFillWithImage},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image")),isFillWithImage},
        };
        JPanel panel3 = TableLayout4VanChartHelper.createGapTableLayoutPane(components3, row, col);

--- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java
@ -50,7 +50,7 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
        JPanel deployPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
        this.add(deployPane);

-        deployPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Deploy") + ":", null));
+        deployPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Deploy") + ":", null));
        deployPane.add(createDeployPane());

        //条件界面
@ -77,7 +77,7 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")), XAxis},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")), YAxis},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked")), isStacked},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PercentStacked")), isPercentStacked},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Percent_Stacked")), isPercentStacked},
        };

        isStacked.addActionListener(new ActionListener() {
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/CustomPlotLocationPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/CustomPlotLocationPane.java
@ -46,7 +46,7 @@ public class CustomPlotLocationPane extends BasicBeanPane<Plot>{

        this.setLayout(new BorderLayout(0,0));

-        this.add(TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location"), panel), BorderLayout.CENTER);
+        this.add(TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Location"), panel), BorderLayout.CENTER);
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java
@ -28,7 +28,7 @@ public class VanChartCustomAxisConditionPane extends VanChartCustomStackAndAxisC

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


--- 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
@ -31,7 +31,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
            protected Component[][] getPaneComponents() {
                return  new Component[][]{
                        new Component[]{null, null},
-                        new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor")), typeComboBox},
+                        new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), typeComboBox},
                        new Component[]{null, centerPane},
                };
            }
@ -46,7 +46,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
    }

    protected String title4PopupWindow(){
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color");
    }

    public void populate(AttrAreaSeriesFillColorBackground fillColorBackground) {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java
@ -55,7 +55,7 @@ public class VanChartHtmlLabelPane extends JPanel{
    }

    public VanChartHtmlLabelPane() {
-        useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html"));
+        useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
        JPanel widthAndHeightPane = createWidthAndHeightPane();
        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
@ -125,9 +125,9 @@ public class VanChartHtmlLabelPane extends JPanel{
    }

    protected JPanel createWidthAndHeightPane() {
-        isCustomWidth = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Width"));
+        isCustomWidth = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Width"));
        customWidth = new UITextField(6);
-        isCustomHeight = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Height"));
+        isCustomHeight = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Height"));
        customHeight = new UITextField(6);

        isCustomWidth.addActionListener(new ActionListener() {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java
@ -31,7 +31,7 @@ public class VanChartLineTypePane extends BasicPane {

        createLineStyle();

-        nullValueBreak = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        nullValueBreak = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});

        this.setLayout(new BorderLayout());
        double p = TableLayout.PREFERRED;
@ -40,8 +40,8 @@ public class VanChartLineTypePane extends BasicPane {
    }

    protected void createLineStyle() {
-        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NormalLine"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StepLine"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")};
+        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Normal_Line"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StepLine"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_CurveLine")};
        lineStyle = new UIButtonGroup<LineStyle>(textArray, LineStyle.values());
    }

@ -52,7 +52,7 @@ public class VanChartLineTypePane extends BasicPane {

        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),lineWidth},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineWidth},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")),lineStyle},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")),nullValueBreak},
        };
@ -69,7 +69,7 @@ public class VanChartLineTypePane extends BasicPane {
    }

    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line");
    }

    public void populate(VanChartAttrLine line) {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java
@ -21,7 +21,7 @@ public class VanChartLineWidthPane extends VanChartLineTypePane {

        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineWidth},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")), nullValueBreak},
        };

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java
@ -32,7 +32,7 @@ public class VanChartMarkerPane extends BasicPane {
    public VanChartMarkerPane() {
        this.setLayout(new BorderLayout(0, 4));

-        String[] array = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rule"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")};
+        String[] array = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rule"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")};
        commonORCustom = new UIButtonGroup<String>(array, array);

        commonORCustom.addChangeListener(new ChangeListener() {
@ -58,7 +58,7 @@ public class VanChartMarkerPane extends BasicPane {
            }
        };
        centerPane.add(commonMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rule"));
-        centerPane.add(imageMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+        centerPane.add(imageMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));

        layoutComponents();
    }
@ -99,7 +99,7 @@ public class VanChartMarkerPane extends BasicPane {
    }

    protected String title4PopupWindow(){
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }

    public void populate(VanChartAttrMarker marker) {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@ -56,8 +56,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
    }

    private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+        content = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});

        initFormatPane(parent, showOnPane);

@ -82,8 +82,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                }
            }
        };
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
-        centerPane.add(commonPanel,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
+        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        centerPane.add(commonPanel,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));

        double[] column = {f, e};
        double[] row = {p,p,p};
@ -102,7 +102,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
    }

    protected JPanel getLabelContentPane(JPanel contentPane) {
-        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"), contentPane);
+        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
    }

    protected VanChartHtmlLabelPane createHtmlLabelPane() {
@ -146,13 +146,13 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
    private void checkCardPane() {
        CardLayout cardLayout = (CardLayout) centerPane.getLayout();
        if (content.getSelectedIndex() == 1) {
-            cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+            cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
            if(isDirty()){
                setCustomFormatterText();
                setDirty(false);
            }
        } else {
-            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
+            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
        }
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java
@ -54,7 +54,7 @@ public class VanChartTrendLinePane extends BasicPane{
        double[] r = {p, p};
        double[] c = {f, p, f, p};
        Component[][] periodComps = new Component[][]{
-                new Component[]{prePeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Cycle")), afterPeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Cycle"))},
+                new Component[]{prePeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")), afterPeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward")), null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_After_Period")), null},
        };
        JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c);
@ -65,7 +65,7 @@ public class VanChartTrendLinePane extends BasicPane{
        Component[][] components = new Component[][]{
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name")), trendLineName},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), trendLineStyle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), trendLineStyle},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), trendLineColor},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), trendLineType},
                new Component[]{label, periodPane}
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java
@ -42,7 +42,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane {
        paneList.add(new NullBackgroundQuickPane(){
            @Override
            public String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SeriesColor");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Color");
            }

        });
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java
@ -43,7 +43,7 @@ public class VanChartBorderPane extends BasicPane {
    protected Component[][] getUseComponent() {
        return new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),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("FR-Chart-Color_Color")),currentLineColorPane},
        };
    }
--- 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
@ -29,7 +29,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{
    protected Component[][] getUseComponent() {
        return new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),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("FR-Chart-Color_Color")),currentLineColorPane},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java
@ -28,7 +28,7 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
    protected Component[][] getUseComponent() {
        return new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),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("FR-Chart-Color_Color")),currentLineColorPane},
                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/format/ChangedValueFormatPaneWithCheckBox.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithCheckBox.java
@ -16,6 +16,6 @@ public class ChangedValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCh

    @Override
    protected String getCheckBoxText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Value");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Value");
    }
 }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java
@ -42,7 +42,7 @@ public class FormatPaneWithNormalType extends FormatPaneWithOutFont {
    protected Component[][] getTypeComboBoxComponent (UIComboBox typeComboBox) {
        return new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DataType"), SwingConstants.LEFT), typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DataType"), SwingConstants.LEFT), typeComboBox},

        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java
@ -16,7 +16,7 @@ public class GaugeLabelContentPane extends VanChartLabelContentPane {
    }

    protected String getLabelContentTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content");
    }

    protected JPanel getLabelContentPane(JPanel contentPane) {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java
@ -131,7 +131,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
    protected Component[][] getUseComponent() {
        return  new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor")), markerFillColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), markerFillColor},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius},
        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java
@ -40,7 +40,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {

        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Width")), width},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Height")), height},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height")), height},
        };

        JPanel sizePanel = TableLayoutHelper.createTableLayoutPane(components, row, col);
@ -69,7 +69,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {
     */
    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Image_Map_Data");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Image_Map_Data");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java
@ -58,7 +58,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {

    protected JPanel createContentPane() {
        JPanel content = new JPanel(new BorderLayout(0, 6));
-        moreLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        moreLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        moreLabel.addChangeListener(new ChangeListener() {
            @Override
            public void stateChanged(ChangeEvent e) {
@ -82,7 +82,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
        jPanel.add(autoTooltip, BorderLayout.CENTER);
        jPanel.add(tooltipSet, BorderLayout.EAST);

-        JPanel moreLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_More_Label"), moreLabel);
+        JPanel moreLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_More_Label"), moreLabel);

        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
--- 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
@ -114,19 +114,19 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
        if (!plot.isSupportZoomDirection()) {
            return null;
        }
-        zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")});
+        zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
+        zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")});
        from = new TinyFormulaPane();
        to = new TinyFormulaPane();
        zoomType = new UIButtonGroup(getNameArray(), getValueArray());
-        zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        zoomGesture = 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 zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget);
        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture);

        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_From")), from},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_From")), from},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_To")), to},
        };

@ -166,7 +166,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
            return null;
        }
        axisRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        axisRotation.addChangeListener(new ChangeListener() {
            @Override
            public void stateChanged(ChangeEvent e) {
@ -206,9 +206,9 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {

    protected JPanel createToolBarPane(double[] row, double[] col){
        isSort = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sort"));
-        exportImages = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ExportImage"));
-        fullScreenDisplay = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FullScreenDisplay"));
-        collapse = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Collapse"));
+        exportImages = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Export_Image"));
+        fullScreenDisplay = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_FullScreen_Display"));
+        collapse = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Collapse"));

        Component[][] components = createToolBarComponents();

@ -223,24 +223,24 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {

    protected Component[][] createToolBarComponents() {
        return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),isSort},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),isSort},
                new Component[]{null, exportImages},
                new Component[]{null, fullScreenDisplay},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_layout")),collapse},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),collapse},
        };
    }

    protected Component[][] createToolBarComponentsWithOutSort() {
        return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")), exportImages},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")), exportImages},
                new Component[]{null, fullScreenDisplay},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_layout")),collapse}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),collapse}
        };
    }


    protected JPanel createAnimationPane(){
-        isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        isChartAnimation = 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("Plugin-ChartF_Animation_Effects"), isChartAnimation);
        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), panel);
    }
@ -249,7 +249,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {

        autoRefreshPane = getMoreLabelPane(plot);

-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Moniter_refresh"), autoRefreshPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Moniter_refresh"), autoRefreshPane);
    }

    protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java
@ -20,7 +20,7 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine

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

    @Override
@ -43,7 +43,7 @@ public class VanChartAreaFillColorConditionPane  extends AbstractNormalMultiLine
     * @return item的名称
     */
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java
@ -49,7 +49,7 @@ public class VanChartCurveConditionPane extends AbstractNormalMultiLineCondition
    }
    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Curve");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve");
    }

 }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java
@ -44,7 +44,7 @@ public class VanChartEffectConditionPane extends AbstractNormalMultiLineConditio

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

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java
@ -23,7 +23,7 @@ public class VanChartFloatColorConditionPane extends ConditionAttrSingleConditio

    public VanChartFloatColorConditionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
        super(conditionAttributesPane, isRemove);
-        UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_FloatColor"));
+        UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Color"));
        colorSelectionPane = new ColorSelectBox(80);

        if (isRemove) {
@ -38,7 +38,7 @@ public class VanChartFloatColorConditionPane extends ConditionAttrSingleConditio
     */
    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_FloatColor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Color");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java
@ -24,7 +24,7 @@ public class VanChartLineEffectConditionPane extends VanChartEffectConditionPane

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

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java
@ -17,7 +17,7 @@ public class VanChartLineTypeConditionPane extends AbstractNormalMultiLineCondit

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

    @Override
@ -39,7 +39,7 @@ public class VanChartLineTypeConditionPane extends AbstractNormalMultiLineCondit
     * @return item的名称
     */
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java
@ -17,7 +17,7 @@ public class VanChartMarkerConditionPane extends AbstractNormalMultiLineConditio

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

    @Override
@ -39,7 +39,7 @@ public class VanChartMarkerConditionPane extends AbstractNormalMultiLineConditio
     * @return item的名称
     */
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java
@ -25,7 +25,7 @@ public class VanChartSeriesColorConditionPane extends ConditionAttrSingleConditi

    public VanChartSeriesColorConditionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
        super(conditionAttributesPane, isRemove);
-        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_MatchColor"));
+        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Match_Color"));
        colorSelectionPane = new ColorSelectBox(80);

        if (isRemove) {
@ -40,7 +40,7 @@ public class VanChartSeriesColorConditionPane extends ConditionAttrSingleConditi
     * @return item的名称
     */
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_MatchColor");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Match_Color");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java
@ -21,7 +21,7 @@ public class VanChartSeriesImageBackgroundConditionPane extends AbstractNormalMu

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

    @Override
@ -39,7 +39,7 @@ public class VanChartSeriesImageBackgroundConditionPane extends AbstractNormalMu
     * @return item的名称
     */
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FilledWithImage");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java
@ -34,8 +34,8 @@ public class HeatMapRangeLegendPane extends VanChartRangeLegendPane {
    @Override
    protected UIButtonGroup<LegendType> createLegendTypeButton(){
        return new UIButtonGroup<LegendType>(new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Gradual"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Section")
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Gradual"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Section")
        }, new LegendType[]{LegendType.GRADUAL, LegendType.SECTION});
    }

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
@ -120,7 +120,7 @@ public class VanChartPlotLegendPane extends BasicPane {
                new Component[]{createTitleStylePane(),null} ,
                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null},
                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null},
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), createDisplayStrategy()),null}
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), createDisplayStrategy()),null}
        };
        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
    }
@ -145,7 +145,7 @@ public class VanChartPlotLegendPane extends BasicPane {
                new Component[]{createTitleStylePane(),null} ,
                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null},
                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null},
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel),null},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel),null},
        };
        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
    }
@ -164,7 +164,7 @@ public class VanChartPlotLegendPane extends BasicPane {
        location = new UIButtonGroup<Integer>(iconArray, valueArray);
        location.setAllToolTips(textArray);

-        customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomFloatPosition"));
+        customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Float_Position"));
        customFloatPositionButton.setEventBannded(true);

        Component[][] components = new Component[][]{
@ -231,12 +231,12 @@ public class VanChartPlotLegendPane extends BasicPane {

    protected JPanel createDisplayStrategy(){
        maxProportion = new UISpinner(0,100,1,30);
-        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
-        limitSizeTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"));
+        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});
+        limitSizeTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"));


        JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize);
-        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
        maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
        JPanel panel = new JPanel(new BorderLayout());
        panel.add(limitSizePane, BorderLayout.NORTH);
@ -261,7 +261,7 @@ public class VanChartPlotLegendPane extends BasicPane {
        double[] rowSize = {p,p};
        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Highlight")),highlightButton}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Highlight")),highlightButton}
        };
        return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java
@ -88,9 +88,9 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane {

    protected UIButtonGroup<LegendType> createLegendTypeButton(){
        return new UIButtonGroup<LegendType>(new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Ordinary"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Gradual"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Section")
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Ordinary"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Gradual"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Section")
        }, new LegendType[]{LegendType.ORDINARY, LegendType.GRADUAL, LegendType.SECTION});
    }

@ -104,7 +104,7 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane {

        initLegendTypeButtonListener();

-        JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Form"),legendTypeButton);
+        JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Form"),legendTypeButton);
        legendTypeButtonWithTilePane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));

        rangeLegendPane = createRangeLegendPane();
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
@ -128,14 +128,14 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {

    private JPanel createTitleContentPane(double[] row, double[] col){
        titleContent = new TinyFormulaPane();
-        useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html"));
+        useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
        Component[][] components = new Component[][]{
                new Component[]{null ,null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"), SwingConstants.LEFT), titleContent},
                new Component[]{null ,useHtml},
        };
        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"), panel);
    }

    private JPanel createTitlePositionPane(double[] row, double[] col){
@ -145,7 +145,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
        Integer[] alignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};

        alignmentPane = new UIButtonGroup<Integer>(alignmentIconArray, alignment);
-        customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomFloatPosition"));
+        customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Float_Position"));
        customFloatPositionButton.setEventBannded(true);

        Component[][] components = new Component[][]{
@ -169,10 +169,10 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {

    private JPanel createDisplayStrategy(){
        maxProportion = new UISpinner(0,100,1,30);
-        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
+        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});

        JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize);
-        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
        maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
        JPanel panel = new JPanel(new BorderLayout());
        panel.add(limitSizePane, BorderLayout.NORTH);
@ -185,7 +185,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
            }
        });

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

    private void initPositionListener(){
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java
@ -122,7 +122,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
        titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane();
        titleAlignPane.setSelectedItem(Constants.CENTER);
        titleContent = new TinyFormulaPane();
-        titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html"));
+        titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
        titleTextAttrPane = new ChartTextAttrPane();
        titleTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX);
        if(isXAxis){
@ -132,7 +132,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
        }
        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),titleContent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),titleContent},
                new Component[]{null,titleUseHtml},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position")),titleAlignPane},
                new Component[]{titleTextAttrPane,null},
@ -161,11 +161,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
    }

    protected JPanel createLabelPane(double[] row, double[] col){
-        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hidden")});
+        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")});
        labelTextAttrPane = getChartTextAttrPane();

        labelTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX);
-        labelGapStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed")});
+        labelGapStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")});
        labelGapValue = new UITextField();
        Component[][] gapComponents = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), labelTextRotation},
@ -222,7 +222,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
    protected JPanel createLineStylePane(double[] row, double[] col){
        axisLineStyle = createLineComboBox();
        axisLineColor = new ColorSelectBox(100);
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
+        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
        AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
        mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
        secondTick = new UIButtonGroup<AxisTickLineType>(strings, values);
@ -240,8 +240,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                new Component[]{null,null} ,
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} ,
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")),mainTick},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondGraduationLine")),secondTick},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),mainTick},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),secondTick},
        };
    }

@ -276,10 +276,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {

    protected JPanel createDisplayStrategy(double[] row, double[] col){
        maxProportion = new UISpinner(0,100,1,30);
-        axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
+        axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Limit")});

        JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),axisLimitSize);
-        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Proportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
        maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
        JPanel panel = new JPanel(new BorderLayout());
        panel.add(limitSizePane, BorderLayout.NORTH);
@ -292,12 +292,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
            }
        });

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

    protected JPanel createValueStylePane(){
-        valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+        valueFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});

        valueFormat = createFormatPane();
        checkFormatType();
@ -305,8 +305,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
        htmlLabelPane = new VanChartHtmlLabelPane();

        centerPane = new JPanel(new CardLayout());
-        centerPane.add(valueFormat,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+        centerPane.add(valueFormat,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));

        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
@ -356,9 +356,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
        if(centerPane != null && valueFormatStyle != null){
            CardLayout cardLayout = (CardLayout) centerPane.getLayout();
            if (valueFormatStyle.getSelectedIndex() == 1) {
-                cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+                cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
            } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
            }
        }
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
@ -167,7 +167,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {

            minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
            maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-            mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
            secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);

            minPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
@ -202,7 +202,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
            minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"}));
            Date tmp = null;
            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1);
-            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Formula"));
+            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
            Editor[] editor = new Editor[]{dateEditor, formulaEditor};
            minValueField = new ValueEditorPane(editor);
            minCheckBox.addActionListener(new ActionListener() {
@ -217,7 +217,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
            maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"}));
            Date tmp = null;
            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1);
-            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Formula"));
+            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
            Editor[] editor = new Editor[]{dateEditor, formulaEditor};
            maxValueField = new ValueEditorPane(editor);
            maxCheckBox.addActionListener(new ActionListener() {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java
@ -68,7 +68,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
    protected JPanel createCommenValuePane(double[] row, double[] col){
        initMinMaxValuePane();

-        logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_LogBaseValue"}));
+        logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_LogBase_Value"));
        logBaseField = new UITextField();
        logBox.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
@ -82,7 +82,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane {
 //        logPane.add(logBaseField);


-        logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LogBaseValue"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Log_Base_Value"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);

        logPane.setBorder(BorderFactory.createEmptyBorder(0, TableLayout4VanChartHelper.COMPONENT_INTERVAL, 0, 0));

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java
@ -62,7 +62,7 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane {

        minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
        maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-        mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
        secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);

        minPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0));
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java
@ -77,7 +77,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
    }

    protected JPanel createLabelPane(double[] row, double[] col){
-        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hidden")});
+        showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")});
        labelTextAttrPane = getChartTextAttrPane();
        labelPanel = new JPanel(new BorderLayout());
        labelPanel.add(labelTextAttrPane);
@ -115,8 +115,8 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
        mainTickColor = new ColorSelectBox(100);
        secTickColor = new ColorSelectBox(100);
        Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")), mainTickColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondGraduationLine")), secTickColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")), mainTickColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")), secTickColor},
        };
        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
        JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TickColor"), panel);
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java
@ -60,15 +60,15 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
        double[] columnSize = {f, e};

-        valueStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified")});
+        valueStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")});

        JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize);
        tableDataPane = new RadarTableDataPane();

        centerPane = new JPanel(new CardLayout());
-        centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"));
-        centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified"));
+        centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing"));
+        centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));

        JPanel contentPane = new JPanel(new BorderLayout());
        contentPane.add(valueStyle, BorderLayout.NORTH);
@ -101,9 +101,9 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
        if (centerPane != null && valueStyle != null) {
            CardLayout cardLayout = (CardLayout) centerPane.getLayout();
            if (valueStyle.getSelectedIndex() == 0) {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing"));
            } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified"));
            }
        }
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java
@ -27,12 +27,12 @@ public class BackgroundListControlPane extends VanChartUIListControlPane {
    @Override
    public NameableCreator[] createNameableCreators() {
        return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")},
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"), VanChartAlertValue.class, VanChartAlertValuePane.class)};
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"), VanChartAlertValue.class, VanChartAlertValuePane.class)};
    }

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

    @Override
@ -55,7 +55,7 @@ public class BackgroundListControlPane extends VanChartUIListControlPane {
        List<VanChartAxis> yAxisList = rectanglePlot.getYAxisList();
        String[] axisNames = DefaultAxisHelper.getAllAxisNames(rectanglePlot);

-        BackgroundNameObjectCreator[] creators = {new BackgroundNameObjectCreator(getCustomIntervalBackgroundAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"), VanChartCustomIntervalBackground.class, getIntervalPaneClass())};
+        BackgroundNameObjectCreator[] creators = {new BackgroundNameObjectCreator(getCustomIntervalBackgroundAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"), VanChartCustomIntervalBackground.class, getIntervalPaneClass())};

        refreshNameableCreator(creators);

--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java
@ -105,7 +105,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
        return new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertAxis},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),alertLineStyle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
        };
    }
@ -117,7 +117,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
        double[] rowSize = {p,p,p,p,p};
        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),alertText},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")),fontSize},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor},
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java
@ -89,7 +89,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
    }

    protected JPanel createIntervalPane(double[] row, double[] col) {
-        isDefaultIntervalBackground = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground")});
+        isDefaultIntervalBackground = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Interval"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background")});
        horizontalColorBackground = new ColorSelectBox(100);
        verticalColorBackground = new ColorSelectBox(100);
        Component[][] components = getIntervalPaneComponents();
@ -99,8 +99,8 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {

        cardLayout = new CardLayout();
        centerPane = new JPanel(cardLayout);
-        centerPane.add(defaultPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval"));
-        centerPane.add(customIntervalBackground, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"));
+        centerPane.add(defaultPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Interval"));
+        centerPane.add(customIntervalBackground, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"));
        isDefaultIntervalBackground.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
@ -111,7 +111,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {
        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back"), isDefaultIntervalBackground);
        intervalPane.add(panel1, BorderLayout.NORTH);
        intervalPane.add(centerPane, BorderLayout.CENTER);
-        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_IntervalBackground"), intervalPane);
+        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background"), intervalPane);
        intervalPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
        return panel;
    }
@ -130,9 +130,9 @@ public class VanChartAxisAreaPane extends BasicBeanPane<Plot> {

    private void checkCardPane() {
        if (isDefaultIntervalBackground.getSelectedIndex() == 0) {
-            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval"));
+            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Interval"));
        } else {
-            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"));
+            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"));
        }
    }

--- 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
@ -42,7 +42,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
        JPanel top = FRGUIPaneFactory.createBorderLayout_L_Pane();
        this.removeAll();
        this.add(top);
-        top.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground") + ":", null));
+        top.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background") + ":", null));
        top.add(createContentPane());
    }

@ -87,7 +87,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
    }

    protected String title4PopupWindow(){
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background");
    }

    public void populateBean(VanChartCustomIntervalBackground customIntervalBackground){
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java
@ -15,7 +15,7 @@ public class VanChartRadarAlertValuePane extends VanChartAlertValuePane {
    protected Component[][] getTopPaneComponents() {
        return new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),alertLineStyle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java
@ -22,7 +22,7 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {

    protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) {
        style = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
        textFontPane = initTextFontPane();

        initStyleListener();
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java
@ -28,7 +28,7 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
        labelDetailPane = new VanChartGaugeCateOrPercentLabelDetailPane(this.plot, this.parent);
        gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(this.plot, this.parent);
        GaugeStyle gaugeStyle = ((VanChartGaugePlot)this.plot).getGaugeStyle();
-        String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ValueLabel");
+        String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Label");
        switch (gaugeStyle){
            case POINTER:
                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel");
@ -37,7 +37,7 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel");
                break;
            default:
-                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PercentLabel");
+                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Percent_Label");
                break;
        }
        JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, labelDetailPane);
--- 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
@ -158,7 +158,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {

    protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) {
        style = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
        textFontPane =initTextFontPane();

        initStyleListener();
--- 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
@ -114,7 +114,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
        JPanel panel = new JPanel(new BorderLayout());
        stylePane = createStylePane();
        setColorPaneContent(panel);
-        JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Color"), panel);
+        JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color"), panel);
        panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
        return panel.getComponentCount() == 0 ? null : colorPane;
    }
@ -135,7 +135,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
    //线
    protected JPanel createLineTypePane() {
        lineTypePane = getLineTypePane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line"), lineTypePane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line"), lineTypePane);
    }

    protected VanChartLineTypePane getLineTypePane() {
@ -145,7 +145,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
    //标记点类型
    protected JPanel createMarkerPane() {
        markerPane = new VanChartMarkerPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"), markerPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker"), markerPane);
    }

    //填充颜色
@ -176,7 +176,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
                checkLarge();
            }
        });
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Model"), largeDataModelGroup);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Model"), largeDataModelGroup);
        return createLargeDataModelPane(panel);
    }

@ -230,12 +230,12 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
    }

    protected JPanel createLargeDataModelPane(JPanel jPanel) {
-        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Data"), jPanel);
+        JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data"), jPanel);
        return panel;
    }

    protected UIButtonGroup<DataProcessor> createLargeDataModelGroup() {
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
+        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")};
        DataProcessor[] values = new DataProcessor[]{new LargeDataModel(), new NormalDataModel()};
        return new UIButtonGroup<DataProcessor>(strings, values);
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java
@ -28,7 +28,7 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {
    }

    public VanChartEffectPane(boolean hasEnabledChoose){
-        enabledButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        enabledButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});

        enabledButton.addChangeListener(new ChangeListener() {
            @Override
@ -40,7 +40,7 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {
        period = new UISpinner(0, Double.MAX_VALUE, 0.1, 0);
        content = createContentPane();

-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Animation"),enabledButton);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flash_Animation"),enabledButton);
        this.setLayout(new BorderLayout(0, 5));
        if(hasEnabledChoose) {
            this.add(panel, BorderLayout.NORTH);
@ -61,7 +61,7 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {
    protected JPanel createPeriodPane(){
        JPanel periodPane = new JPanel();
        periodPane.setLayout(new BorderLayout(5, 0));
-        UILabel label1= new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Period"));
+        UILabel label1= new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flash_Period"));
        label1.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20));
        periodPane.add(label1, BorderLayout.WEST);
        periodPane.add(period, BorderLayout.CENTER);
@ -90,6 +90,6 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Animation");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flash_Animation");
    }
 }
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java
@ -96,7 +96,7 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa

        Component[][] components = new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Duration_Time")), duration},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Duration_Time")), duration},
        };

        JPanel temp = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
--- 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
@ -107,7 +107,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
    }

    protected JPanel createLabelStylePane() {
-        style = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+        style = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
        textFontPane = new ChartTextAttrPane() {
            protected Component[][] getComponents(JPanel buttonPane) {
                return new Component[][]{
@ -140,8 +140,8 @@ public class VanChartPlotTooltipPane extends BasicPane {

    protected JPanel createDisplayStrategy(Plot plot) {
        showAllSeries = new UICheckBox(getShowAllSeriesLabelText());
-        followMouse = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FollowMouse"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotFollowMouse")});
+        followMouse = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Follow_Mouse"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Follow_Mouse")});
        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
@ -155,11 +155,11 @@ public class VanChartPlotTooltipPane extends BasicPane {
            components[2] = new Component[]{showAllSeries,null};
        }
        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Strategy"), panel);
    }

    protected String getShowAllSeriesLabelText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ShowAllSeries");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_All_Series");
    };

    protected boolean hasTooltipSeriesType() {
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
@ -47,8 +47,8 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
    }

    protected Component[][] getComponentsWithLargeData(JPanel typePane){
-        largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OpenLargeDataModel"));
-        MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LargeDataModelPrompt"));
+        largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open_Large_Data_Model"));
+        MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data_Model_Prompt"));
        prompt.setForeground(Color.red);
        JPanel largeDataPane = new JPanel(new BorderLayout());
        largeDataPane.add(largeModelCheckBox, BorderLayout.CENTER);
--- 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
@ -71,8 +71,8 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
        double[] columnSize = {f};
        double[] rowSize = {p, p};
        Component[][] components = new Component[][]{
-                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Tree"), mapDataTreePanel)},
-                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Detail"), createLayerDetailPane())}
+                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Tree"), mapDataTreePanel)},
+                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Detail"), createLayerDetailPane())}
        };

        JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
@ -98,12 +98,12 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
        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_Zoom_Layer")),
-                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Map_Type"))
+                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Map_Type"))
        };
        for (int i = 0; i < depth; i++) {
            rowSize[i + 1] = p;
            int d = i + 1;
-            UILabel label = new UILabel(String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index1"), d, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index3")));
+            UILabel label = new UILabel(String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Article"), d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Layer")));
            UIComboBox level = new UIComboBox(VanChartMapSourceChoosePane.ZOOM_LEVELS);
            level.setEnabled(i != 0);
            UIComboBox type = new UIComboBox(TEMP.get(oldMapType));
--- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java
@ -57,7 +57,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane<ChartCollection> {
        List<BasicPane> paneList = new ArrayList<BasicPane>();

        for(int i = 1; i < depth + 1; i++){
-            String tile = String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index1"), i, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index3"));
+            String tile = String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Article"), i, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Index_Layer"));

            SingleLayerDataDefinitionPane pane = new SingleLayerDataDefinitionPane(tile, this.listener, this.parent);
            pane.setSupportCellData(parent.isSupportCellData());
@ -141,7 +141,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane<ChartCollection> {
     */
    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Each_Layer_Data_Special");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Each_Layer_Data_Special");
    }

    /**
--- 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
@ -51,8 +51,8 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
    }

    private JPanel createDrillToolsPane() {
-        openOrClose = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        JPanel openOrClosePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Dir"), openOrClose);
+        openOrClose = 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 openOrClosePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Dir"), openOrClose);
        textAttrPane = new ChartTextAttrPane(){

            @Override
@ -101,7 +101,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
            }
        });

-        JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill"), panel);
+        JPanel panel1 = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill"), panel);
        panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0));
        return panel1;
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java
@ -50,7 +50,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
    }

    private JPanel createFunnelStylePane() {
-        useSameSlantAngle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_UseSameSlantAngle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UseDiffSlantAngle")});
+        useSameSlantAngle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Same_Slant_Angle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Diff_Slant_Angle")});
        sort = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AutoSort"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Origin")});

        double p = TableLayout.PREFERRED;
@ -60,7 +60,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
        double[] rowSize = {p,p,p};
        Component[][] components = new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Continuity")), useSameSlantAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Continuity")), useSameSlantAngle},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sort")), sort},
        };

--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java
@ -46,7 +46,7 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{

        endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time"));

-        markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker_Time"));
+        markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time"));

        progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process"));

--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java
@ -71,7 +71,7 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesComboBox},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")), startTimeComboBox},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")), endTimeComboBox},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker_Time")), markerTimeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")), markerTimeComboBox},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")), processComboBox},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")), taskIDComboBox}
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java
@ -35,9 +35,9 @@ public class GanttLinkReportDataContentPane extends AbstractReportDataContentPan
    private void initAllComponent() {
        startTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID"));

-        endTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID"));
+        endTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Task_ID"));

-        linkType = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Type"));
+        linkType = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Type"));
    }

    private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) {
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java
@ -54,8 +54,8 @@ public class GanttLinkTableDataContentPane extends AbstractTableDataContentPane

        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID")), startTaskIDComboBox},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID")), endTaskIDComboBox},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Type")), linkTypeComboBox}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Task_ID")), endTaskIDComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Type")), linkTypeComboBox}
        };

        return TableLayoutHelper.createGapTableLayoutPane(components, row, col,24,6);
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java
@ -56,13 +56,13 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane<VanChart> {
    private Component createBodyPane() {
        bodyPane = new GanttAxisStylePane();

-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"), bodyPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"), bodyPane);
    }

    private Component createHorizontalHeaderPane() {
        horizontalHeaderPane = new GanttAxisStylePane();

-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Table"), horizontalHeaderPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Table"), horizontalHeaderPane);
    }

    private Component createVerticalHeaderPane() {
@ -72,7 +72,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane<VanChart> {
    }

    private Component createHorizontalProportionPane() {
-        typeButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+        typeButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
        horizontalProportion = new UISpinner(0, 100, 1, 30);

        JPanel proportionPane = new JPanel(new BorderLayout(5, 0));
@ -91,7 +91,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane<VanChart> {
            }
        });

-        JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Proportion"), panel);
+        JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Proportion"), panel);

        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-DataFunction_Percent"), jPanel);
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java
@ -57,7 +57,7 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
    private Component createDownHeadPane() {
        downHeadPane = new GanttAxisStylePane();

-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Down_Head_Table"),downHeadPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Head_Table"),downHeadPane);
    }

    private Component createUpHeadPane() {
@ -67,9 +67,9 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
    }

    private Component createConditionConfigPane() {
-        timeZoom = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        timeZoom = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        initialLevel = new UIComboBox(ZOOM_LEVELS);
-        weekendTooltip = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        weekendTooltip = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});

        double p = TableLayout.PREFERRED;
        double f = TableLayout.FILL;
@ -80,13 +80,13 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
        Component[][] components = new Component[][]{
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Zoom")), timeZoom},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Initial_Level")), initialLevel},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Initial_Level")), initialLevel},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Weekend_Tooltip")), weekendTooltip}
        };

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

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

    @Override
--- 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
@ -51,7 +51,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("Plugin-ChartF_Close")});
+        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);
        return ganntStylePane;
@ -69,12 +69,12 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {

        Component[][] components = new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineWidth},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect}
        };

        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        JPanel linkLinePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Line"), panel);
+        JPanel linkLinePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Line"), panel);
        return linkLinePane;
    }

@ -91,7 +91,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
                return new VanChartImageMarkerWithoutWidthAndHeightPane();
            }
        };
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gannt_Marker"), markerPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gannt_Marker"), markerPane);
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
@ -146,7 +146,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane

        private VanChartFormatComBoxWithCheckBox() {
            this.setLayout(new BorderLayout());
-            isSelectedBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Duration_Time"));
+            isSelectedBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Duration_Time"));
            formatComBox = new UIComboBox(IntervalTimeFormat.getFormats());
            isSelectedBox.addMouseListener(new MouseListener() {
                @Override
--- 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
@ -149,12 +149,12 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {

    private Component[] getHingeColor() {
        hingeColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hinge")),hingeColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hinge")),hingeColor};
    }

    private Component[] getHingeBackgroundColor() {
        hingeBackgroundColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HingeBackground")),hingeBackgroundColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hinge_Background")),hingeBackgroundColor};
    }

    private Component[] getNeedleColor() {
@ -164,21 +164,21 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {

    private Component[] getPaneBackgroundColor() {
        paneBackgroundColor = new ColorSelectBox(120);
-        return  new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PaneBackground")),paneBackgroundColor};
+        return  new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pane_Background")),paneBackgroundColor};
    }

    private Component[] getSlotBackgroundColor() {
        slotBackgroundColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SlotBackground")),slotBackgroundColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Slot_Background")),slotBackgroundColor};
    }

    private void initRotate() {
-        rotate = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AntiClockWise"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ClockWise")});
+        rotate = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AntiClockWise"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ClockWise")});
    }

    private Component[] getInnerPaneBackgroundColor() {
        innerPaneBackgroundColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerPaneBackground")),innerPaneBackgroundColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner_Pane_Background")),innerPaneBackgroundColor};
    }

    private JPanel createGaugeBandsPane() {
--- 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
@ -56,7 +56,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {
     */
    @Override
    protected JPanel getContentInPlotType() {
-        final UIButtonGroup group = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HeatPoint"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background_Area")});
+        final UIButtonGroup group = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Point"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background_Area")});
        group.setSelectedIndex(0);

        JPanel backgroundAreaPane = createAreaPane();
@ -111,8 +111,8 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {

        Component[][] components = new Component[][]{
                new Component[]{null, null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Heat_Map_Radius")), radius, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Heat_Map_Blur")), blur, new UILabel("%")}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Map_Radius")), radius, null},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Heat_Map_Blur")), blur, new UILabel("%")}
        };

        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@ -134,8 +134,8 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane {

        Component[][] components = new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Min")), minOpacity},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Max")), maxOpacity}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min")), minOpacity},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max")), maxOpacity}
        };

        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
--- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java
@ -10,6 +10,6 @@ import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
 public class VanChartHeatMapSourceChoosePane extends VanChartMapSourceChoosePane {
    @Override
    protected UILabel createSourceTitleLabel() {
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area_And_Point"));
+        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
    }
 }
--- 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
@ -53,7 +53,7 @@ import java.awt.event.ItemListener;
 public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
    private static final String AREA_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Area");
    private static final String POINT_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point");
-    private static final String LINE_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flow");
+    private static final String LINE_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flow");

    private static final String[] MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(),
            MapMarkerType.COMMON.toLocalString(), MapMarkerType.BUBBLE.toLocalString(), MapMarkerType.IMAGE.toLocalString()};
@ -193,7 +193,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
        double[] col = {f};

        Component[][] components = new Component[][]{
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Color")), createPointAlphaPane())},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), createPointAlphaPane())},
                new Component[]{createMarkerComPane()},
                new Component[]{createLargeDataModelPane()},
                new Component[]{createPointEffectPane()},
@ -227,13 +227,13 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
                checkLineMapLarge();
            }
        });
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Model"), lineMapLargeDataModelGroup);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Model"), lineMapLargeDataModelGroup);
        return createLargeDataModelPane(panel);
    }

    private Component createCurvePane() {
        curvePane = new VanChartCurvePane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Curve"), curvePane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve"), curvePane);
    }

    private Component createAnimationPane() {
@ -296,7 +296,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
        JPanel markerPane = new JPanel(new BorderLayout(0, 6));
        markerPane.add(northPane, BorderLayout.NORTH);
        markerPane.add(cardPane, BorderLayout.CENTER);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"), markerPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker"), markerPane);
    }

    private JPanel createCustomPane(Plot plot) {
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java
@ -30,7 +30,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
        endAreaPane = new AreaPane(){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaName}
                };
            }
        };
@ -40,7 +40,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
        areaPane =new AreaPane(){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name")), areaName}
                };
            }
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java
@ -15,9 +15,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
        endAreaPane = new LongLatAreaPane(){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaName}
                };
            }
        };
@ -27,9 +27,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
        areaPane = new LongLatAreaPane(){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Longitude"})), longitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Latitude"})), latitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Longitude")), longitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Latitude")), latitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name")), areaName}
                };
            }
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java
@ -11,6 +11,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.util.List;

+
 /**
 * Created by hufan on 2016/12/21.
 */
@ -35,7 +36,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
        areaPane = new AreaPane(parentPane){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name")), areaNameCom}
                };
            }
        };
@ -45,7 +46,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
        endAreaPane = new AreaPane(parentPane){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaNameCom}
                };
            }
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java
@ -20,9 +20,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
        endAreaPane = new LongLatAreaPane(parentPane){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Area_Name")), areaNameCom}
                };
            }
        };
@ -32,9 +32,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
        areaPane = new LongLatAreaPane(parentPane){
            protected Component[][] getComponent () {
                return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Longitude"})), longitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Latitude"})), latitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Longitude")), longitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Latitude")), latitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Area_Name")), areaNameCom}
                };
            }
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java
@ -78,8 +78,8 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa
                }
            };

-            locationType = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_AreaName"),
-                    com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_LongAndLat")});
+            locationType = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Location_With_Area_Name"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Location_With_LongAndLat")});
            locationType.addChangeListener(new ChangeListener() {
                @Override
                public void stateChanged(ChangeEvent e) {
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java
@ -103,8 +103,8 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData
                }
            };

-            locationType = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_AreaName"),
-                    com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_LongAndLat")});
+            locationType = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Location_With_Area_Name"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Location_With_LongAndLat")});

            locationType.addChangeListener(new ChangeListener() {
                @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java
@ -13,11 +13,11 @@ public class VanChartBubbleMarkerConditionPane extends VanChartBubbleSetConditio
    }

    protected String getItemLabelString() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }

    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }


--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java
@ -21,7 +21,7 @@ public class VanChartCommonMarkerConditionPane extends AbstractNormalMultiLineCo

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

    @Override
@ -37,7 +37,7 @@ public class VanChartCommonMarkerConditionPane extends AbstractNormalMultiLineCo
     */
    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java
@ -21,7 +21,7 @@ public class VanChartImageMarkerConditionPane extends AbstractNormalMultiLineCon

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

    @Override
@ -37,7 +37,7 @@ public class VanChartImageMarkerConditionPane extends AbstractNormalMultiLineCon
     */
    @Override
    public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker");
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java
@ -91,7 +91,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
    private static final ZoomLevel[] BLUE_ZOOM_LEVELS =(ZoomLevel[]) ArrayUtils.subarray(ZOOM_LEVELS, 0, 34);
    private static final ZoomLevel[] GAODE_ZOOM_LEVELS =ArrayUtils.addAll(new ZoomLevel[]{ZoomLevel.AUTO}, (ZoomLevel[])ArrayUtils.subarray(ZOOM_LEVELS, 7, 38));
    private static final String AUTO_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic");
-    private static final String CUSTOM_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom");
+    private static final String CUSTOM_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom");

    private UILabel sourceTitleLabel;
    private FRTreeComboBox sourceComboBox;
@ -172,7 +172,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
    }

    protected UILabel createSourceTitleLabel() {
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area"));
+        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
    }

    private JPanel createMapSourcesPane() {
@ -306,7 +306,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
            layerCardPane.add(pane, itemName);
        }

-        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gis_Layer"), gisLayer);
+        JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gis_Layer"), gisLayer);

        panel.add(panel1, BorderLayout.CENTER);
        panel.add(layerCardPane, BorderLayout.SOUTH);
@ -355,7 +355,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {


        wmsUrl = new UITextArea();
-        connectButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connect_WMP"));
+        connectButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));

        Component[][] comps = new Component[][]{
                new Component[]{new UILabel("url"), wmsUrl, connectButton}
@ -398,7 +398,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {

                @Override
                protected void done() {
-                    connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connect_WMP"));
+                    connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connect_WMP"));
                    if(list != null && list.size() > 0) {
                        resetWMSLayerPane(list);
                    } else {
@ -418,7 +418,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {

            @Override
            public void mousePressed(MouseEvent e) {
-                connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connecting_WMP"));
+                connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Connecting_WMP"));
            }

            @Override
@ -512,7 +512,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
                longAndLatPane.setVisible(!isAutoViewCenter());
            }
        });
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Init_Status"), contentPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Init_Status"), contentPane);
    }

    private boolean isAutoViewCenter() {
@ -579,16 +579,16 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
        }
        switch (mapType){
            case CUSTOM:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area_And_Point"));
+                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area_And_Point"));
                break;
            case POINT:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Point"));
+                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
                break;
            case LINE:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Point"));
+                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Point"));
                break;
            default:
-                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area"));
+                sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Area"));
        }

    }
--- 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
@ -47,7 +47,7 @@ public class VanChartCurvePane extends BasicBeanPane<AttrCurve>{
    private Component[][] getUseComponent() {
        return new Component[][]{
                new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Width")), lineWidth},
+                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("Plugin-ChartF_Bedding")),bending},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), lineAlphaPane}
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java
@ -32,7 +32,7 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane {

    public VanChartLineMapEffectPane() {
        super(true);
-        this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Map_Animation"), enabledButton), BorderLayout.NORTH);
+        this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Map_Animation"), enabledButton), BorderLayout.NORTH);
    }

    protected JPanel createContentPane() {
@ -125,6 +125,6 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Map_Animation");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Map_Animation");
    }
 }
--- a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java
@ -18,7 +18,7 @@ public class ChartMapEditorAction extends UpdateAction {

    public ChartMapEditorAction(){
        this.setSmallIcon(IOUtils.readIcon("/com/fr/van/chart/map/images/mapData.png"));
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Data"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data"));
    }

    public void actionPerformed(ActionEvent evt) {
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java
@ -131,7 +131,7 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent
        Component[][] components_center = new Component[levelNum + 2][];

        for (int i = 0; i < levelNum; i++){
-            components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)};
+            components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level") + String.valueOf(i+1)), levelNameList.get(i)};
        }

        value = new TinyFormulaPane();
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java
@ -102,7 +102,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa
        Component[][] components_center = new Component[levelNum + 3][];

        for (int i = 0; i < levelNum; i++){
-            components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)};
+            components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level") + String.valueOf(i+1)), levelNameList.get(i)};
        }

        value = new UIComboBox();
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java
@ -17,6 +17,6 @@ public class VanChartMultiPiePlotTooltipPane extends VanChartPlotTooltipPane {

    @Override
    protected String getShowAllSeriesLabelText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ShowAllLevel");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_All_Level");
    }
 }
--- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java
@ -42,23 +42,23 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
    }

    protected JPanel createSeriesStylePane(double[] row, double[] col) {
-        gradualLevel = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Light"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Deep")});
+        gradualLevel = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradual_Light"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradual_Deep")});
        startAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
        endAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
        innerRadius = new UISpinner(0, 100, 1, 0);
        supportRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
        supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});

        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Level") ),gradualLevel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StartAngle") ),startAngle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill")),supportDrill},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradual_Level") ),gradualLevel},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Angle") ),startAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Angle")),endAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner_Radius")),innerRadius},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill")),supportDrill},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation")),supportRotation}

        };
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java
@ -40,7 +40,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane<Plot> {

        Map<String, Component> paneList = new HashMap<String, Component>();

-        radiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed")});
+        radiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fixed")});
        radius = new UISpinner(MIN_RADIUS, MAX_RADIUS, 1, 100);

        radiusContent = new JPanel(new BorderLayout());
--- a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java
@ -58,9 +58,9 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {

        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StartAngle")),startAngle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Angle")),startAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Angle")),endAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner_Radius")),innerRadius},
                new Component[]{createRadiusPane(),null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation")),supportRotation}
        };
--- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java
@ -63,7 +63,7 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane {
    }

    private JPanel createRadarTypePane() {
-        radarType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Circle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polygonal")},
+        radarType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Circle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polygonal")},
                new String[]{RadarType.CIRCLE.getType(), RadarType.POLYGON.getType()});
        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape"), radarType);
        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"), panel);
--- a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java
@ -34,8 +34,8 @@ public class LegendLabelFormatPane extends JPanel{
    }

    public LegendLabelFormatPane(){
-        labelFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")});
+        labelFormatStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
        labelFormat = new FormatPaneWithOutFont();
        htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight();
        htmlLabelPane.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
@ -51,8 +51,8 @@ public class LegendLabelFormatPane extends JPanel{
                }
            }
        };
-        centerPane.add(labelFormat,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+        centerPane.add(labelFormat,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));


        double p = TableLayout.PREFERRED;
@ -62,7 +62,7 @@ public class LegendLabelFormatPane extends JPanel{
        double[] rowSize = {p, p, p};
        Component[][] components = new Component[][]{
                new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Label_Format"), SwingConstants.LEFT), labelFormatStyle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Format"), SwingConstants.LEFT), labelFormatStyle},
                new Component[]{centerPane,null},
        };
        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize);
@ -86,9 +86,9 @@ public class LegendLabelFormatPane extends JPanel{
                if(!populate) {
                    checkCustomLabelText();
                }
-                cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
+                cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
            } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
            }
        }
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java
@ -30,7 +30,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula {
                new Component[]{null,null},
                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()},
                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RangeNum")),getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()},

        };
    }
--- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java
@ -53,7 +53,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF
        setRegionVisible(false);

        return new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RangeNum")),getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()},
                new Component[]{numLabel, getRegionNumPane()},
        };
    }
--- a/Show More
+++ b/Show More