REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

6 years ago · fb60bbac0e
128 changed files with 283 additions and 285 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@ -646,7 +646,7 @@ public class PreferencePane extends BasicPane {
        int rv = JOptionPane.showOptionDialog(
                null,
                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                JOptionPane.YES_NO_OPTION,
                JOptionPane.INFORMATION_MESSAGE,
                null,
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
@ -106,7 +106,7 @@ public class AlphaFineConfigPane extends BasicPane {
        shortcutsField.selectAll();
        shortcutsField.setPreferredSize(new Dimension(100, 20));
        initFieldListener();
-        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":"));
+        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":"));
        northPane.add(shortcutsField);
        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts"));
        label.setForeground(Color.RED);
--- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
@ -223,7 +223,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
            }

            int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
                    JOptionPane.OK_CANCEL_OPTION);
            if (returnVal == JOptionPane.OK_OPTION) {
                DefaultTreeModel treeModel = (DefaultTreeModel) conditionsTree.getModel();
@ -447,7 +447,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa


    private void initButtonPane(JPanel buttonPane) {
-        removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+        removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
        buttonPane.add(removeButton);
        removeButton.setIcon(BaseUtils.readIcon("com/fr/base/images/cell/control/remove.png"));
        removeButton.setEnabled(false);
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@ -383,7 +383,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
        private TableDataTree dataTree;

        public PreviewTableDataAction(TableDataTree dataTree) {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
            this.setMnemonic('p');
            this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.PREVIEW_ICON_PATH));
            this.dataTree = dataTree;
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {

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

        public RemoveAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
            this.setMnemonic('R');
            this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));
        }
@ -264,7 +264,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
            }

            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
            if (returnVal == JOptionPane.OK_OPTION) {
                // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧
                op.removeAction(selectedNO.getName());
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java
@ -127,7 +127,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
        buildTreePanel.add(xxx, BorderLayout.CENTER);
        centerPane.add(buildTreePanel, BorderLayout.NORTH);
        JPanel previewPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
        previewPanel.add(treeDataPreviewButton);
        treeDataPreviewButton.addActionListener(new ActionListener() {
            @Override
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
@ -166,7 +166,7 @@ public class PreviewTableModel extends AbstractTableModel {

    private String checkType(int column) {
        if (dateIndexs.contain(column)) {
-            String s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            String s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
            return ("(" + s + ")");
        }

@ -192,9 +192,9 @@ public class PreviewTableModel extends AbstractTableModel {
                Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column);
                if (clzz != null) {
                    if (Number.class.isAssignableFrom(clzz)) {
-                    s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
+                    s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Number");//bigdecimal
                    } else if (java.sql.Date.class.isAssignableFrom(clzz)) {
-                        s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+                        s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
                    }
                }
            }
@ -203,12 +203,12 @@ public class PreviewTableModel extends AbstractTableModel {
        } else if (o instanceof Double || o instanceof Float) {
            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
        } else if (o instanceof java.sql.Date || o instanceof java.util.Date) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
        } else if (o instanceof Number) {
-            s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number");//bigdecimal
+            s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Number");//bigdecimal
        } else {
            s = "?";
        }
        return ("(" + s + ")");
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
@ -171,7 +171,7 @@ public class PreviewTablePane extends BasicPane {

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

    private void addLoadedListener(LoadedEventListener l) {
@ -464,7 +464,7 @@ public class PreviewTablePane extends BasicPane {

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

        };
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
@ -136,7 +136,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
    }
    private class RemoveParaAction extends UITableEditAction {
        public RemoveParaAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
            this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/remove.png"));
        }

--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@ -54,8 +54,8 @@ import java.util.List;

 public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	private static final int BOTTOM = 6;
-	private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
-    private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh");
+	private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
+    private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh");
 	private ConnectionTableProcedurePane connectionTableProcedurePane;
 	private UITableEditorPane<ParameterProvider> editorPane;

@ -383,4 +383,4 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 			return title;
 		}
 	}
-}
+}
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
@ -236,7 +236,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {

    private void previewPanel(JPanel jPanel){
        JPanel previewPanel = new JPanel(new BorderLayout());
-        UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
        preview.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                preview();
@ -355,8 +355,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
        spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space"));
        commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"), false);
        commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"));
-        otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other") + ":", false);
-        otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"));
+        otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other") + ":", false);
+        otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"));
        otherDismenberTextField = new UITextField(8);
        otherDismenberTextField.setEditable(false);
        otherDismenberRadioButton.addChangeListener(new ChangeListener() {
@ -487,7 +487,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {

    private class RefreshAction extends UITableEditAction {
        public RefreshAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
        }

@ -800,7 +800,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {

        private class RefreshParameterAction extends UpdateAction {
            public RefreshParameterAction() {
-                this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+                this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
                this.setMnemonic('r');
                this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
            }
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
@ -51,7 +51,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
            "com.mysql.jdbc.Driver",
            "org.gjt.mm.mysql.Driver"
    }; // 需要隐藏面板的数据库的驱动
-    private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview");
+    private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
    private ConnectionTableProcedurePane connectionTableProcedurePane;
    private JPanel cardpane;
    private CardLayout cardLayout;
@ -357,7 +357,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp

    protected class RefreshAction extends UITableEditAction {
        public RefreshAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
        }

--- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
@ -67,7 +67,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
        JPanel content = (JPanel) jf.getContentPane();
        content.setLayout(new BorderLayout());
-        content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}), BorderLayout.NORTH);
+        content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))}), BorderLayout.NORTH);
        GUICoreUtils.centerWindow(jf);
        jf.setSize(290, 400);
        jf.setVisible(true);
@ -426,4 +426,4 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
    public boolean shouldResponseChangeListener() {
        return true;
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java
@ -83,7 +83,7 @@ public class ValueEditorPaneFactory {
     * @return 返回公式编辑器面板
     */
    public static ValueEditorPane createFormulaValueEditorPane() {
-        return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))},
+        return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))},
                StringUtils.EMPTY, StringUtils.EMPTY);
    }

@ -227,12 +227,12 @@ public class ValueEditorPaneFactory {
     * @return 值编辑器
     */
    public static Editor<?>[] basicEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new TextEditor(),
                new SpinnerIntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor
        };
@ -244,12 +244,12 @@ public class ValueEditorPaneFactory {
     * @return 值编辑器
     */
    public static Editor<?>[] formEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor,
                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget"))
@ -262,16 +262,16 @@ public class ValueEditorPaneFactory {
     * @return 值编辑器
     */
    public static Editor<?>[] extendedEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor,
                new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"))
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"))
        };
    }

@ -281,16 +281,16 @@ public class ValueEditorPaneFactory {
     * @return 值编辑器
     */
    public static Editor<?>[] extendedCellGroupEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor,
                new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
        };
    }
@ -302,7 +302,7 @@ public class ValueEditorPaneFactory {
     */
    public static Editor<?>[] cellGroupEditor() {
        return new Editor[]{
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
        };
    }
@ -316,7 +316,7 @@ public class ValueEditorPaneFactory {
     */
    public static Editor<?>[] URLEditors(String popupName, String textEditorValue) {
        return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName),
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None") : popupName),
                new TextEditor()
        };
    }
@ -330,9 +330,9 @@ public class ValueEditorPaneFactory {
     */
    public static Editor<?>[] dateEditors(String popupName, String textEditorValue) {
        return new Editor[]{
-                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
-                new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))
+                new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None") : popupName),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
+                new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))
        };
    }

@ -342,17 +342,17 @@ public class ValueEditorPaneFactory {
     * @return 值编辑器
     */
    public static Editor<?>[] allEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
 //        formulaEditor.setEnabled(true);
        return new Editor[]{
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor,
                new ParameterEditor(),
-                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
+                new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")),
                new ColumnSelectedEditor(),
                //23328 allEditors中删除控件选项
 //                new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Widget"))
@ -369,7 +369,7 @@ public class ValueEditorPaneFactory {
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
        };
    }
@ -380,12 +380,12 @@ public class ValueEditorPaneFactory {
     * @return 编辑器
     */
    public static Editor<?>[] noCRnoColumnEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor,
                new ParameterEditor(),
@ -398,7 +398,7 @@ public class ValueEditorPaneFactory {
     * @return 编辑器
     */
    public static Editor<?>[] numberEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
                new IntegerEditor(),
                new DoubleEditor(),
@ -413,9 +413,9 @@ public class ValueEditorPaneFactory {
     * @return 编辑器
     */
    public static Editor<?>[] dateEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        return new Editor[]{
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                formulaEditor,
                new ParameterEditor(),
        };
@ -427,14 +427,14 @@ public class ValueEditorPaneFactory {
     * @return 存储过程的编辑器
     */
    public static Editor<?>[] StoreProcedureEditors() {
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        formulaEditor.setEnabled(true);
        return new Editor[]{
                new CursorEditor(),
                new TextEditor(),
                new IntegerEditor(),
                new DoubleEditor(),
-                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
+                new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")),
                new BooleanEditor(),
                formulaEditor
        };
@ -451,10 +451,10 @@ public class ValueEditorPaneFactory {
        list.add(new TextEditor());
        list.add(new IntegerEditor());
        list.add(new DoubleEditor());
-        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")));
+        list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")));
        list.add(new BooleanEditor());

-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        formulaEditor.setEnabled(true);
        list.add(formulaEditor);

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

@ -235,4 +235,4 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
    protected String title4PopupWindow() {
        return "All";
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java
@ -69,7 +69,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                if (result.isSuccess()) {
                                    JOptionPane.showMessageDialog(null, modifyMessage);
                                } else {
-                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                }
                            }
                        });
@ -80,7 +80,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                                if (result.isSuccess()) {
                                    JOptionPane.showMessageDialog(null, modifyMessage);
                                } else {
-                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                                    JOptionPane.showMessageDialog(null,PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                                }
                            }
                        });
@ -118,7 +118,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
        int rv = JOptionPane.showOptionDialog(
                PluginInstalledPane.this,
                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Will_Be_Delete"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                JOptionPane.YES_NO_CANCEL_OPTION,
                JOptionPane.INFORMATION_MESSAGE,
                null,
@ -135,7 +135,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
        try {
            controlPane.deletePlugin(plugin);
        } catch (Exception e) {
-            JOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(PluginInstalledPane.this, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }

        if (rv == JOptionPane.OK_OPTION) {
--- a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java
@ -95,7 +95,7 @@ public class PluginOperateUtils {
                int rv = JOptionPane.showConfirmDialog(
                        null,
                        com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Confirmed"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                        JOptionPane.OK_CANCEL_OPTION,
                        JOptionPane.INFORMATION_MESSAGE
                );
--- a/designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java
@ -201,7 +201,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
                    FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
                } else {
-                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                }
            }
        });
@ -221,4 +221,4 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
    protected String title4PopupWindow() {
        return "Update";
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
@ -380,7 +380,7 @@ public class PluginWebBridge {
        int rv = JOptionPane.showOptionDialog(
                null,
                message,
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                JOptionPane.YES_NO_OPTION,
                JOptionPane.INFORMATION_MESSAGE,
                null,
--- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
@ -65,7 +65,7 @@ public class WebViewDlgHelper {
                int rv = JOptionPane.showConfirmDialog(
                        null,
                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                        JOptionPane.OK_CANCEL_OPTION,
                        JOptionPane.INFORMATION_MESSAGE
                );
@ -82,7 +82,7 @@ public class WebViewDlgHelper {
                int rv = JOptionPane.showConfirmDialog(
                        null,
                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                        JOptionPane.OK_CANCEL_OPTION,
                        JOptionPane.INFORMATION_MESSAGE
                );
@ -202,7 +202,7 @@ public class WebViewDlgHelper {
        int rv = JOptionPane.showConfirmDialog(
                null,
                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                JOptionPane.OK_CANCEL_OPTION,
                JOptionPane.INFORMATION_MESSAGE
        );
@ -266,7 +266,7 @@ public class WebViewDlgHelper {
                        }
                    });
                } catch (PluginVerifyException e) {
-                    JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
                    return false;
                } catch (Exception e) {
                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
@ -306,7 +306,7 @@ public class WebViewDlgHelper {
                        int rv = JOptionPane.showConfirmDialog(
                                null,
                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"),
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                                JOptionPane.OK_CANCEL_OPTION,
                                JOptionPane.INFORMATION_MESSAGE
                        );
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
@ -43,7 +43,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
@ -63,7 +63,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java
@ -41,7 +41,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
@ -56,7 +56,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
        }else {
            jsCallback.execute("failed");
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }

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

--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
@ -31,7 +31,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
@ -45,7 +45,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
        } else {
            jsCallback.execute("failed");
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
@ -43,7 +43,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence")),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
@ -63,7 +63,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
            int rv = JOptionPane.showOptionDialog(
                    null,
                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"),
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                    JOptionPane.YES_NO_CANCEL_OPTION,
                    JOptionPane.INFORMATION_MESSAGE,
                    null,
@ -77,7 +77,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
        }else {
            jsCallback.execute("failed");
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java
@ -36,7 +36,7 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
        } else {
            jsCallback.execute("failed");
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
+++ b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
@ -50,7 +50,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
            PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
        } else {
            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete_Failed"));
-            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
@ -123,7 +123,7 @@ public class FunctionManagerPane extends BasicPane {
            JPanel reportletNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
            classNameTextField = new UITextField(25);
            reportletNamePane.add(classNameTextField);
-            UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+            UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
            browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width,  classNameTextField.getPreferredSize().height));
            reportletNamePane.add(browserButton);
            browserButton.addActionListener(new ActionListener() {
@ -138,7 +138,7 @@ public class FunctionManagerPane extends BasicPane {
 	                    }).setVisible(true);
                }
            });
-            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+            UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
            editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
            reportletNamePane.add(editorButton);
            editorButton.addActionListener(createEditorButtonActionListener());
@ -211,4 +211,4 @@ public class FunctionManagerPane extends BasicPane {
            return editing;
        }
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
@ -224,7 +224,7 @@ public class JTreeControlPane extends ControlPane {

    private class RemoveTreeNodeAction extends UpdateAction {
        public RemoveTreeNodeAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
            this.setMnemonic('R');
            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
        }
@ -232,7 +232,7 @@ public class JTreeControlPane extends ControlPane {
        public void actionPerformed(ActionEvent e) {
            // TODO remove tree node
            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
            if (val != JOptionPane.OK_OPTION) {
                return;
            }
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
@ -490,11 +490,11 @@ public class RegPane extends BasicPane {
                                                      int index, boolean isSelected, boolean cellHasFocus) {
            super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
            if (value instanceof NoneReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None"));
            } else if (value instanceof LengthReg){
                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"));
            } else if (value instanceof MailReg){
-                this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"));
+                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"));
            } else if (value instanceof PhoneReg){
                this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone"));
            } else if (value instanceof MobileReg) {
@ -510,4 +510,4 @@ public class RegPane extends BasicPane {
        }

    };
-}
+}
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java
@ -380,7 +380,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
        UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"),
                new ReportletHyperlink(), ReportletHyperlinkPane.class);

-        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"),
+        UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
                new EmailJavaScript(), EmailPane.class);

        UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
@ -170,7 +170,7 @@ public class LayerDataControlPane extends ControlPane {

        public RemoveTreeNodeAction() {

-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
            this.setMnemonic('R');
            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
        }
@ -178,7 +178,7 @@ public class LayerDataControlPane extends ControlPane {
        public void actionPerformed(ActionEvent e) {
            // TODO remove tree node
            int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
            if (val != JOptionPane.OK_OPTION) {
                return;
            }
--- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
@ -198,7 +198,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
        JPanel jp1 = new JPanel(new BorderLayout());
        basicPane = new JPanel();
        seniorPane = new JPanel();
-        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane());
+        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());

        jp1.add(basicPane, BorderLayout.NORTH);
@ -269,7 +269,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
        Component[][] components = new Component[][]{
                new Component[]{null, null, null},
                new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)},
-                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right")), SwingConstants.CENTER)},
+                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)},
                new Component[]{null, null, null},
                new Component[]{null, null, null},
                new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
--- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
@ -95,7 +95,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
        this.add(borderPanel, BorderLayout.NORTH);

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

    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
    }

    @Override
--- a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java
@ -133,7 +133,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     */
    public FRFont update(FRFont frFont) {

-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))) {
            frFont = frFont.applyName((String) fontNameComboBox.getSelectedItem());
        }
        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"))) {
@ -265,7 +265,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse

    private void initAllNames() {
        fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"));
-        fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"));
+        fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"));
        fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
        colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground"));
        italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"));
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java
@ -65,7 +65,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
        reportPathTextField = new UITextField(20);
        reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);

-        browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+        browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
        browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
        reportletNamePane.add(browserButton, BorderLayout.EAST);
        browserButton.addActionListener(new ActionListener() {
--- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
@ -45,7 +45,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper

        this.add(parameterViewPane, BorderLayout.CENTER);

-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));

        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Find-Design_Basic_Hyperlink_Extends_Report_Parameters"));
        this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEFT), BorderLayout.SOUTH);
--- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperNorthPane.java
@ -3,7 +3,6 @@ package com.fr.design.hyperlink;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.constants.LayoutConstants;

-import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@ -56,7 +55,7 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
        if (this.needRenamePane) {
            headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL));
            itemNameTextField = new UITextField();
-            headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), BorderLayout.NORTH);
+            headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH);
            headerPane.add(urlWithHelp, BorderLayout.CENTER);
        } else {
            headerPane.add(urlWithHelp, BorderLayout.NORTH);
@ -106,4 +105,4 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane<WebHyperlink> {
        return new JPanel();
    }

-}
+}
--- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java
+++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java
@ -42,7 +42,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {

        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
        this.add(parameterViewPane, BorderLayout.CENTER);
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));

        useCJKCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Use_CJK_To_Encode_Parameter"));
        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Find-Design_Basic_Hyperlink_Extends_Report_Parameters"));
--- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
@ -51,7 +51,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {

    protected void initComponents() {
        parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter")));
+        parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
        parameterPane.addTableEditorListener(new TableModelListener() {
            public void tableChanged(TableModelEvent e) {
                List<ParameterProvider> list = parameterPane.update();
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@ -247,7 +247,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt

        public RefreshTreeAction() {

-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
            this.setSmallIcon(UIConstants.REFRESH_ICON);
        }

@ -301,7 +301,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt

        public DelFileAction() {

-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/source/delete.png"));
        }

--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@ -97,7 +97,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
    private EastRegionContainerPane() {
        super();
        initPropertyItemList();
-        defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available"));
+        defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available"));
        defaultAuthorityPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Not_Support_Authority_Edit"));
        switchMode(PropertyMode.REPORT);
        setContainerWidth(CONTAINER_WIDTH);
@ -134,7 +134,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                "widgetlib", new PropertyMode[]{PropertyMode.FORM},
                new PropertyMode[]{PropertyMode.FORM});
        // 权限编辑
-        PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Permissions_Edition"),
+        PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edition"),
                "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
                new PropertyMode[]{PropertyMode.AUTHORITY_EDITION});
        // 已配置角色
@ -1028,7 +1028,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
            initListener();
            this.setVisible(true);

-            defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available"));
+            defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available"));
        }

        public void showDefaultPane() {
@ -1107,4 +1107,4 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
            });
        }
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java
@ -223,7 +223,7 @@ public class JFormSliderPane extends JPanel {
        double f = TableLayout.FILL;
        double[] columnSize = {p, f};
        double[] rowSize = {p, p, p, p, p, p, p, p};
-        UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce"));
+        UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce"));
        upLabel.setOpaque(false);
        JPanel septPane = new JPanel(new BorderLayout());
        JSeparator sept = new JSeparator();
@ -445,4 +445,4 @@ class FormPopupPane extends JPopupMenu {
    }


-}
+}
--- a/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java
@ -230,7 +230,7 @@ public class JSliderPane extends JPanel {
        double f = TableLayout.FILL;
        double[] columnSize = {p, f};
        double[] rowSize = {p, p, p, p, p, p, p, p, p};
-        UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce"));
+        UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce"));
        upLabel.setOpaque(false);
        JPanel septPane = new JPanel(new BorderLayout());
        JSeparator sept = new JSeparator();
@ -513,4 +513,4 @@ class PopupPane extends UIPopupMenu {
    public Insets getInsets() {
        return new Insets(INSERT_TOPBOTTOM, INSERT_LEFTRIGHT, INSERT_TOPBOTTOM, INSERT_LEFTRIGHT);
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java
@ -58,7 +58,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
        Component[][] components = new Component[][]{
                new Component[]{null, null},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT), backgroundColorPane},
        };
        double[] rowSize = {p, p, p};
        double[] columnSize = {p, f};
@ -222,4 +222,4 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
        foregroundColorPane.setSelectObject(null);
        backgroundColorPane.setSelectObject(null);
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@ -334,7 +334,7 @@ public abstract class ToolBarMenuDock {
            insertMenu(menuDef, MenuHandler.FILE);
            return menuDef;
        }
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F');

        ShortCut[] scs = new ShortCut[0];
        if (!DesignerMode.isAuthorityEditing()) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java
@ -1,6 +1,5 @@
 package com.fr.design.mainframe.toolbar;

-import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.actions.edit.RedoAction;
 import com.fr.design.actions.edit.UndoAction;
@ -18,7 +17,7 @@ import com.fr.stable.ArrayUtils;
 public class VcsScene {

    public static MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F');

        ShortCut[] scs = new ShortCut[0];
        if (!ArrayUtils.isEmpty(scs)) {
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java
@ -56,7 +56,7 @@ public class BasicPropertyPane extends BasicPane {
                }
            }
        };
-        widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"));
+        widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));
        double f = TableLayout.FILL;
        double p = TableLayout.PREFERRED;
        double[] rowSize = {p};
--- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
+++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
@ -81,7 +81,7 @@ public class KeySetUtils {

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

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

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

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

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

        @Override
--- a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
+++ b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
@ -43,7 +43,7 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary");
    }

    @Override
--- a/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java
+++ b/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java
@ -88,7 +88,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
        });
 //        keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
        keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        formulaEditor.setEnabled(true);
 //        valueDictPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
        valueDictPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
@ -171,7 +171,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
        columnIndexEditor1.addItemListener(itemListener);
        keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]);

-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"));
        formulaEditor.setEnabled(true);
        formulaEditor.addChangeListener(new ChangeListener() {

@ -368,4 +368,4 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
    public boolean shouldResponseChangeListener() {
        return true;
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java
@ -163,7 +163,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
    private void checkChanges() {
        //如若有变化，则弹出下面的对话框
        int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?",
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
        if (returnVal == JOptionPane.OK_OPTION) {
            roleTree.refreshTreeNode();
            expandTree(roleTree, true);
@ -361,7 +361,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
    private class RefreshAction extends UpdateAction {

        public RefreshAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
            this.setSmallIcon(UIConstants.REFRESH_ICON);
        }

--- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java
+++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java
@ -239,7 +239,7 @@ public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
     */
    protected void doWithValueChanged(TreeSelectionEvent e) {
        if (e.getNewLeadSelectionPath() != null) {
-            if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) {
+            if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Role"))) {
                roleName = e.getNewLeadSelectionPath().getLastPathComponent().toString();
                setTabRoleName(roleName);
                refreshRoleTree(roleName);
@ -253,7 +253,7 @@ public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
     * @param treepath 所选的节点路径
     */
    protected void doWithValueChanged(TreePath treepath) {
-        if (treepath != null && !treepath.getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) {
+        if (treepath != null && !treepath.getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Role"))) {
            roleName = treepath.getLastPathComponent().toString();
            setTabRoleName(roleName);
            refreshRoleTree(roleName);
@ -536,4 +536,4 @@ public class RoleTree extends UserObjectRefreshJTree<RoleSourceOP> {
    }


-}
+}
--- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
@ -23,7 +23,7 @@ import java.util.Hashtable;
 public class ImageFileChooser extends ExpandFileChooser {

    public ImageFileChooser() {
-        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"));
+        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
        ExampleFileFilter bothFilter = new ExampleFileFilter(
                new String[]{"jpg", "gif", "png", "bmp"},
                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
@ -265,4 +265,4 @@ public class ImageFileChooser extends ExpandFileChooser {
            return useExtensionsInDescription;
        }
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java
@ -50,7 +50,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
        JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
        this.add(previewContainerPane, BorderLayout.CENTER);

-        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
        previewOwnerPane.setLayout(new BorderLayout());
        previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER);
        previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST);
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
@ -87,7 +87,7 @@ public class ColorSelectDetailPane extends BasicPane {
        selectedPanel.setPreviewPanel(new JPanel());

        // 预览
-        previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
        final ColorChooserPreview colorChooserPreview = new ColorChooserPreview();
        ColorSelectionModel model = selectedPanel.getSelectionModel();
        model.addChangeListener(new ChangeListener() {
@ -101,4 +101,4 @@ public class ColorSelectDetailPane extends BasicPane {
        previewPanel.add(colorChooserPreview);
        this.add(previewPanel, BorderLayout.SOUTH);
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
@ -227,7 +227,7 @@ public class DesignUtils {

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

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

 	private void initEditButton(JPanel buttonPane) {
-		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
 		editButton.setPreferredSize(new Dimension(80, 25));
 		editButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@ -422,7 +422,7 @@ public class CustomIconPane extends BasicPane {
            showImageLabel.setPreferredSize(new Dimension(20,20));
            imagePane.add(showImageLabel);
            imagePane.add(browseButton);
-            Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
+            Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};

            JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
            this.add(centerPane, BorderLayout.CENTER);
--- a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
@ -29,7 +29,7 @@ public class IconDefinePane extends BasicPane {
        labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0));
        showIconImageLable = new UILabel();
        showIconImageLable.setPreferredSize(new Dimension(20, 20));
-        editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
        labelPane.add(showIconImageLable);
        iconPane.add(labelPane, BorderLayout.WEST);
@ -89,4 +89,4 @@ public class IconDefinePane extends BasicPane {
    public String update() {
        return this.curIconName;
    }
-}
+}
--- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
@ -34,7 +34,7 @@ public class WidgetBoundsPaneFactory {
        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
        boundsPane.add(panel);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
    }
    public static JPanel createRightPane(Component com1, Component com2){
        double f = TableLayout.FILL;
@ -70,7 +70,7 @@ public class WidgetBoundsPaneFactory {
        centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
        boundsPane.add(northPanel, BorderLayout.NORTH);
        boundsPane.add(centerPanel, BorderLayout.CENTER);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane);
    }


@ -87,6 +87,6 @@ public class WidgetBoundsPaneFactory {
        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6);
        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
        boundsPane.add(panel);
-        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane);
    }
 }
--- a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java
@ -34,7 +34,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
        this.setLayout(FRGUIPaneFactory.createBorderLayout());
        UILabel headLabel = createUILable();
        initBackgroundEditor();
-        String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
+        String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};

        double f = TableLayout.FILL;
        final double p = TableLayout.PREFERRED;
@ -68,7 +68,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
    }

    protected UILabel createUILable(){
-        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"));
+        return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"));
    }

    public void update(T e){
--- a/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java
@ -23,7 +23,7 @@ public class WidgetMobilePane extends JPanel {

    protected void init() {
        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available"));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available"));
        label.setHorizontalAlignment(SwingConstants.CENTER);
        this.add(label);
    }
--- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
@ -37,14 +37,14 @@ public abstract class CustomJobPane  extends BasicBeanPane {
 		classNameTextField = new UITextField(getLengthOfTextField());
 		reportletNamePane.add(classNameTextField);

-		UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+		UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
 		browserButton.setPreferredSize(new Dimension(
-				GraphHelper.getLocTextWidth("FR-Designer_Select") + 20,
+				GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20,
 				classNameTextField.getPreferredSize().height));

-        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        editButton.setPreferredSize(new Dimension(
-				GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20,
+				GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")) + 20,
                classNameTextField.getPreferredSize().height));

 		reportletNamePane.add(browserButton);
--- 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
@ -83,7 +83,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 		pane.add(northPane, BorderLayout.NORTH);
 		
 		parameterViewPane = new ReportletParameterViewPane(paraType, valueEditorPane, valueRenderPane);
-		parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter")));
+		parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
 		parameterViewPane.setPreferredSize(new Dimension(200, 200));
 		pane.add(parameterViewPane, BorderLayout.CENTER);

--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
@ -42,7 +42,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
        this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
        if (needRenamePane()) {
            itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH);
        }

        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
@ -54,7 +54,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
        centerPane.add(colRowPane, BorderLayout.NORTH);

        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter")));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
        parameterViewPane.setPreferredSize(new Dimension(500, 200));
        this.add(parameterViewPane, BorderLayout.SOUTH);
    }
@ -122,4 +122,4 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
        }
    }

-}
+}
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
@ -71,7 +71,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
        centerPane.add(pane, BorderLayout.NORTH);

        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter")));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
        parameterViewPane.setPreferredSize(new Dimension(500, 200));
        this.add(parameterViewPane, BorderLayout.SOUTH);
    }
@ -152,4 +152,4 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
            return false;
        }
    }
-}
+}
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java
@ -39,7 +39,7 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane<FormHyperlinkProvid

        parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
        this.add(parameterViewPane, BorderLayout.CENTER);
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
    }

    @Override
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
@ -135,7 +135,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
    private String[] getNameObj() {
 		ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
        ArrayList<String> nameArr = new ArrayList<String>();
-        nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"));
+        nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"));
        Iterator keys = config.names();
        while (keys.hasNext()) {
            Object key = keys.next();
--- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
@ -96,7 +96,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
        JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
        centerPane.add(previewContainerPane, BorderLayout.CENTER);

-        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
+        JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
        previewOwnerPane.setLayout(new BorderLayout());
        previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER);
        previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST);
@ -116,7 +116,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {

        selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY));

-        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"));
+        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"));
        customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom"));
        ButtonGroup buttonGroup = new ButtonGroup();
        defaultRadioButton.setSelected(true);
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java
@ -27,7 +27,7 @@ public class ChartPreStyleManagerPane extends JListControlPane {
     */
 	public NameableCreator[] createNameableCreators() {
 		return new NameableCreator[]{
-				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PreStyle"),
+				new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"),
 						ChartColorMatching.class, ChartPreStylePane.class)
 		};
 	}
--- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java
@ -39,7 +39,7 @@ public class ChartPreStylePane extends BasicBeanPane<ChartColorMatching> {
 		JPanel pane = new JPanel();
 		pane.setLayout(new FlowLayout(FlowLayout.LEFT));

-		pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")));
+		pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));

        JPanel boxPane = new JPanel();
        boxPane.setLayout(new BorderLayout());
--- 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
@ -201,7 +201,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
            // 最小值.
            minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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);
+            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
            Editor[] editor = new Editor[]{dateEditor, formulaEditor};
            minValueField = new ValueEditorPane(editor);
@ -216,7 +216,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
            // 最大值
            maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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);
+            DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
            Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
            Editor[] editor = new Editor[]{dateEditor, formulaEditor};
            maxValueField = new ValueEditorPane(editor);
@ -385,4 +385,4 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
        }

    }
-}
+}
--- 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
@ -152,7 +152,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
        panel.add(createMapSourcesPane(), BorderLayout.NORTH);
        panel.add(createGISLayerPane(), BorderLayout.CENTER);

-        JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), panel);
+        JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), panel);

        Component[][] comps = new Component[][]{
                new Component[]{BasePane},
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java
@ -41,7 +41,7 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor {
        return (CRPropertyDescriptor[]) ArrayUtils.addAll(
 				new CRPropertyDescriptor[]{
 						new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-						new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class)
+						new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class)
 								.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 				}, super.supportedDescriptor());
    }
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java
@ -42,7 +42,7 @@ public class XTreeEditor extends XWidgetCreator {
                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
                                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                        new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
                                TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                        new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class)
@ -56,7 +56,7 @@ public class XTreeEditor extends XWidgetCreator {
                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
                        .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName(
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
                        TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
@ -486,7 +486,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
            g2d.setColor(Color.WHITE);
            //画编辑文字
            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
+            g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"), x + w / 2 - 2, y + h / 2 + 5);
            g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
            GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
            paintExtro(g);
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java
@ -390,7 +390,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 			g2d.setColor(Color.WHITE);
 			//画编辑文字
 			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-			g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
+			g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"), x + w / 2 - 2, y + h / 2 + 5);
 			g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
 			GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
 			paintExtro(g);
@ -511,4 +511,4 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 		return true;
 	}

-}
+}
--- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java
+++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java
@ -60,6 +60,6 @@ public class FormMobileOthersPane extends BasicBeanPane<FormMobileAttr> {

    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other");
    }
 }
--- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java
@ -613,7 +613,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
        }
        FormSubmitButton formSubmitButton = new FormSubmitButton();
        formSubmitButton.setWidgetName("Search");
-        formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query"));
+        formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
        xCreator = XCreatorUtils.createXCreator(formSubmitButton);
        if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP
                * (currentIndex / NUM_IN_A_LINE)))) {
@ -653,7 +653,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
        if (!isWithQueryButton()) {
            FormSubmitButton formSubmitButton = new FormSubmitButton();
            formSubmitButton.setWidgetName("Search");
-            formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query"));
+            formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
            XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton);
            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
                    + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
@ -699,4 +699,4 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
        return new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(),
                new FormDeleteAction(this).createToolBarComponent()};
    }
-}
+}
--- a/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java
+++ b/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java
@ -33,11 +33,11 @@ public class FormHyperlinkGroupPane extends HyperlinkGroupPane {
    public NameableCreator[] createNameableCreators() {
        NameableCreator[] creators = super.createNameableCreators();
        for (int i = 0; i < creators.length; i++) {
-            if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"))) {
-                creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), EmailJavaScript.class, FormEmailPane.class);
+            if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"))) {
+                creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), EmailJavaScript.class, FormEmailPane.class);
                break;
            }
        }
        return creators;
    }
-}
+}
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
@ -291,7 +291,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
        }
        FormSubmitButton formSubmitButton = new FormSubmitButton();
        formSubmitButton.setWidgetName("Search");
-        formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query"));
+        formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
        xCreator = XCreatorUtils.createXCreator(formSubmitButton);
        if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP
                * (currentIndex / NUM_IN_A_LINE)))) {
@ -340,7 +340,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
        if (!isWithQueryButton()) {
            FormSubmitButton formSubmitButton = new FormSubmitButton();
            formSubmitButton.setWidgetName("Search");
-            formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query"));
+            formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
            XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton);
            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
                    + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
@ -149,7 +149,7 @@ public class FormEditToolBar extends BasicPane {

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

    public void populate(FormToolBar ftoolbar) {
@ -361,7 +361,7 @@ public class FormEditToolBar extends BasicPane {

            button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_User_Defined_Event"));
            customPane.add(button);
-            customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit") + "JS", null));
+            customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit") + "JS", null));
            button.addActionListener(l);
            return customPane;
        }
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
@ -194,7 +194,7 @@ public class FormParaWidgetPane extends JPanel {
        JPanel paraPane = new JPanel(new FlowLayout());
        ToolBarButton paraButton = new paraButton(FormWidgetOption.PARAMETERCONTAINER);
        paraPane.add(paraButton);
-        add(createNormalCombinationPane(paraPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter")));
+        add(createNormalCombinationPane(paraPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter")));
        jSeparatorPara = createJSeparator();
        add(jSeparatorPara);

@ -277,7 +277,7 @@ public class FormParaWidgetPane extends JPanel {
        reportPane.add(jComponent, BorderLayout.CENTER);
        JPanel labelPane = new JPanel(new BorderLayout());
        UILabel label = new UILabel(typeName, UILabel.CENTER);
-        if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"), typeName)) {
+        if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), typeName)) {
            paraLabel = label;
        }
        labelPane.add(label, BorderLayout.CENTER);
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
@ -259,7 +259,7 @@ public class FormWidgetDetailPane extends FormDockView{
    private UIButton createRefreshButton() {
        return createToolButton(
                BaseUtils.readIcon("/com/fr/design/form/images/refresh.png"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"),
                new ActionListener() {
                    @Override
                    public void actionPerformed(ActionEvent e) {
@ -332,7 +332,7 @@ public class FormWidgetDetailPane extends FormDockView{
                        JFileChooser fileChooser = new JFileChooser();
                        fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
                        fileChooser.setFileFilter(new FileNameExtensionFilter(".reu", "reu"));
-                        int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select"));
+                        int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
                        if (returnValue == JFileChooser.APPROVE_OPTION) {
                            final File chosenFile = fileChooser.getSelectedFile();
                            installFromDiskZipFile(chosenFile);
--- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
@ -210,7 +210,7 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
    // "无可用配置项"面板
    private JPanel getUnavailablePane() {
        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available"));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available"));
        label.setHorizontalAlignment(SwingConstants.CENTER);
        panel.add(label);
        return panel;
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java
@ -27,7 +27,7 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane {
            pane2.add(otherOtherConfig);
        }
        visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true);
-        visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"));
+        visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));

        visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
        pane2.add(visibleCheckBox);
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java
@ -17,7 +17,7 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane {

    public UICheckBox createOtherConfig() {
        enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Enabled"), true);
-        enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"));
+        enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));

        enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
        return enableCheckBox;
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@ -152,7 +152,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {

        widgetPropertyPane = WidgetBasicPropertyPaneFactory.createBasicPropertyPane(innerCreator);

-        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 280, 20, widgetPropertyPane);
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 280, 20, widgetPropertyPane);

        jPanel.add(uiExpandablePane, BorderLayout.NORTH);

@ -212,7 +212,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
    public void updateCreator() {
        currentEditorDefinePane.setGlobalName(getGlobalName());
        Widget widget = currentEditorDefinePane.updateBean();
-        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")) && widgetPropertyPane != null) {
+        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")) && widgetPropertyPane != null) {
            UITextField widgetNameField = widgetPropertyPane.getWidgetNameField();
            if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) {
                widgetNameField.setText(widget.getWidgetName());
@ -229,7 +229,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
    }

    public void updateWidgetBound() {
-        if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"))) {
+        if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"))) {
            widgetBoundPane.update();
            designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED);
        }
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java
@ -27,7 +27,7 @@ public class ElementCaseToolBarWrapper implements Encoder, Decoder {
        }
        FormToolBarManager[] toolBarManager = (FormToolBarManager[])v;
        if (toolBarManager.length != 0) {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open");
        }
        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Close");
    }
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java
@ -23,7 +23,7 @@ public abstract class DictEditorDefinePane<T extends DictContainedCustomWriteAbl

    protected Component[] createDictPane(){
        dictionaryEditor = new AccessibleDictionaryEditor();
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), dictionaryEditor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor};
    }

    @Override
@ -44,4 +44,4 @@ public abstract class DictEditorDefinePane<T extends DictContainedCustomWriteAbl

    protected abstract T updateSubDictionaryEditorBean();

-}
+}
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java
@ -71,7 +71,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi

    protected Component[] createDictPane(){
        accessibleTreeModelEditor = new AccessibleTreeModelEditor();
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), accessibleTreeModelEditor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), accessibleTreeModelEditor};
    }

    @Override
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
@ -43,7 +43,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
        Component[][] components = new Component[][]{
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                new Component[]{widgetValueLabel, formWidgetValuePane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), dictionaryEditor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor},
                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")), fontSizePane},
                new Component[]{buttonGroupDictPane, null}
        };
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
@ -62,7 +62,7 @@ public class PaddingBoundPane extends BasicPane{
        };
        Component[][] components2 = new Component[][]{
                new Component[]{left, right},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right"), SwingConstants.CENTER)}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right"), SwingConstants.CENTER)}
        };
        JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
        northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java
@ -30,10 +30,10 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
        y = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
        width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
        height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
-        x.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
-        y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
-        width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
-        height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
+        x.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
+        y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
+        width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
+        height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
        this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height));
    }

--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java
@ -58,8 +58,8 @@ public class WidgetBoundPane extends BasicPane {
    public void initBoundPane() {
        width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
        height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
-        width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
-        height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
+        width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
+        height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
        if (creator.acceptType(XWCardLayout.class)) {
            width.setEnabled(false);
            height.setEnabled(false);
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java
@ -29,7 +29,7 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
    @Override
    public void initBoundPane() {
        cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
-        cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"));
+        cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
        this.add(WidgetBoundsPaneFactory.createCardTagBoundPane(cardTagWidth));
    }

--- a/designer-realize/src/main/java/com/fr/design/condition/BackPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/BackPane.java
@ -31,7 +31,7 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
        backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background") + ":");
        this.backgroundPreviewPane = new BackgroundPreviewLabel();
        this.backgroundPreviewPane.setPreferredSize(new Dimension(80, 20));
-        UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        editBackgroundButton.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                final BackgroundPane backgroundPane = new BackgroundPane();
--- a/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java
@ -26,7 +26,7 @@ public class BorderHighlightPane extends ConditionAttrSingleConditionPane<Highli
    private UIButton borderButton;
    public BorderHighlightPane(final ConditionAttributesPane conditionAttributesPane) {
        super(conditionAttributesPane);
-        borderButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        borderButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        borderButton.setPreferredSize(new Dimension(53, 23));
        borderButton.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
@ -69,4 +69,4 @@ public class BorderHighlightPane extends ConditionAttrSingleConditionPane<Highli
    }


-}
+}
--- a/designer-realize/src/main/java/com/fr/design/condition/FontPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/FontPane.java
@ -33,7 +33,7 @@ public class FontPane extends ConditionAttrSingleConditionPane<HighlightAction>
        frFontPreviewPane = new FRFontPreviewArea();
        frFontPreviewPane.setBorder(BorderFactory.createTitledBorder(""));
        frFontPreviewPane.setPreferredSize(new Dimension(80, 20));
-        UIButton editFRFontButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        UIButton editFRFontButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        editFRFontButton.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                final FRFontPane frFontPane = new FRFontPane();
--- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
@ -33,7 +33,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct

    public HyperlinkPane(final ConditionAttributesPane conditionAttributesPane) {
        super(conditionAttributesPane);
-        hyperlinkButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
+        hyperlinkButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
        hyperlinkButton.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                NameJavaScriptGroup nameHyperlinks = jsGroup;
--- a/Show More
+++ b/Show More