Merge pull request #364 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0

REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容 * commit '0223d79b55fa335105cbb1066df5d0d85dc0b73d': 规范国际化文件及国际化定义。
6 years ago · 6e4c458396
49 changed files with 63 additions and 63 deletions
--- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
@ -107,7 +107,7 @@ public class TutorialAction extends UpdateAction {
        @Override
        public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help");
        }
        @Override
--- 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
@ -91,7 +91,7 @@ public class AlphaFineConfigPane extends BasicPane {
        isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend"));
        isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"));
        isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon"));
-        isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"));
+        isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
        isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"));
        isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
        JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
--- a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
@ -20,7 +20,7 @@ import java.awt.event.ActionEvent;
 public class ProcedureListAction extends UpdateAction {
    public ProcedureListAction() {
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure") + "(P)" + "...");
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + "(P)" + "...");
        this.setMnemonic('P');
        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
    }
--- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
@ -583,7 +583,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
    @Override
    protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Submit_Condition");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition");
    }
    // samuel:移出来，方便调用
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@ -138,7 +138,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
    }
    private boolean isProcedureName(String oldName) {
-        return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"));
+        return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"));
    }
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java
@ -56,7 +56,7 @@ public class TableDataCreatorProducer {
                return true;
            }
        };
-        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"),
+        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"),
                "Proc",
                "/com/fr/design/images/data/store_procedure.png",
                StoreProcedure.class, ProcedureDataPane.class) {
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java
@ -112,7 +112,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
    }
    private ExpandMutableTreeNode initStoreProcedureNode(Map<String, TableDataWrapper> storeProcedureMap) {
-        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false);
+        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), STORE_PRECEDURE_DATA), false);
        templateNode.addChildTreeNodes(getNodeArrayFromMap(storeProcedureMap));
        return templateNode;
    }
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@ -336,7 +336,7 @@ public class JDBCDefPane extends JPanel {
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java
@ -22,7 +22,7 @@ public class ProcedureManagerPane extends LoadingBasicPane {
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure");
 	}
 	public void populate(ProcedureConfig procedureConfig) {
--- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
@ -384,7 +384,7 @@ public abstract class JListControlPane extends JControlPane {
                if (filterNameableCreator(creator)) {
                    continue;
                }
-                boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
+                boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")) ||
                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                if (isTrue) {
                    this.addShortCut(new LineSeparator());
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java
@ -467,7 +467,7 @@ public abstract class UIListControlPane extends UIControlPane {
                if (!whetherAdd(creator.menuName())) {
                    continue;
                }
-                boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
+                boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")) ||
                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                if (isTrue) {
                    this.addShortCut(new LineSeparator());
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
@ -78,9 +78,9 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
        formulaEditor.setEnabled(true);
        textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
        Component[][] coms = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"),
                        valuePane},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"),
                        textPane}};
        double p = TableLayout.PREFERRED;
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java
@ -386,7 +386,7 @@ public class UICorrelationPane extends JPanel implements UIObserver {
     */
    public static void main(String... args) {
        JFrame jf = new JFrame("test");
-        final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")};
+        final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")};
        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
        JPanel content = (JPanel) jf.getContentPane();
        content.setLayout(new BorderLayout());
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@ -459,7 +459,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                }
            });
-            UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cancel"));
+            UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
            cancelButton.setPreferredSize(new Dimension(80, 25));
            cancelButton.setMinimumSize(new Dimension(80, 25));
            cancelButton.setMaximumSize(new Dimension(80, 25));
--- 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
@ -213,7 +213,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
    @Override
    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Pattern");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
    }
    @Override
--- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java
@ -101,7 +101,7 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus
 		}
 		g.drawString(com.fr.design.i18n.Toolkit.i18nText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y);
-		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y);
+		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y);
 		g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y);
 	}
--- 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
@ -506,7 +506,7 @@ public abstract class ToolBarMenuDock {
    }
    public MenuDef createCommunityMenuDef() {
-        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY"), 'C');
+        MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"), 'C');
        ShortCut[] otherCommunityShortCuts = createCommunityShortCuts();
        for (ShortCut shortCut : otherCommunityShortCuts) {
            menuDef.addShortCut(shortCut);
--- a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java
+++ b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java
@ -15,7 +15,7 @@ import com.fr.stable.StringUtils;
 public class CustomDictPane extends FurtherBasicBeanPane<CustomDictionary> {
 	private static final long serialVersionUID = 1L;
-	private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; // 字典列名key,value
+	private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")}; // 字典列名key,value
 	private CustomDictCorrelationPane correlationPane;
--- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java
@ -31,7 +31,7 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane {
        map.put(ColorBackground.class, BackgroundUIWrapper.create()
                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
        map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
+                .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")));
        map.put(GradientBackground.class, BackgroundUIWrapper.create()
                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")));
--- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java
@ -92,32 +92,32 @@ public class BackgroundFactory {
    private static void registerUniversal(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
        map.put(null, BackgroundUIWrapper.create()
-                .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null")));
+                .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null")));
        map.put(ColorBackground.class, BackgroundUIWrapper.create()
                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
        map.put(TextureBackground.class, BackgroundUIWrapper.create()
-                .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Texture")));
+                .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture")));
        map.put(PatternBackground.class, BackgroundUIWrapper.create()
-                .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Pattern")));
+                .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern")));
        map.put(GradientBackground.class, BackgroundUIWrapper.create()
                .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")));
    }
    private static void registerImageBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
        map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
+                .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")));
    }
    private static void registerBrowserImageBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
        map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
+                .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")));
    }
    private static void registerButtonBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map){
        map.put(ColorBackground.class, BackgroundUIWrapper.create()
                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
        map.put(ImageFileBackground.class, BackgroundUIWrapper.create()
-                .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image")));
+                .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")));
    }
--- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java
@ -27,7 +27,7 @@ public class BackgroundTabPane extends BackgroundPane {
    private static void registerTabpaneBackground(Map<Class<? extends Background>, BackgroundUIWrapper> map) {
        map.put(null, BackgroundUIWrapper.create()
-                .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null")));
+                .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null")));
        map.put(ColorBackground.class, BackgroundUIWrapper.create()
                .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")));
        map.put(GradientBackground.class, BackgroundUIWrapper.create()
--- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java
@ -28,7 +28,7 @@ import java.awt.event.ItemListener;
 public class BackgroundUIComboBoxPane extends BasicPane {
    private static final long serialVersionUID = -3751191424737067321L;
-    protected static final String none = com.fr.design.i18n.Toolkit.i18nText("DataFunction-None");
+    protected static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None");
    protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors");
    protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
    protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
--- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java
@ -77,7 +77,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange {
        selectPictureButton.addActionListener(selectPictureActionListener);
        //布局
-        selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout") + ":"));
+        selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout") + ":"));
        layoutComboBox = new UIComboBox(layoutTypes);
        selectFilePane.add(layoutComboBox);
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
@ -93,7 +93,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
    	this.add(buttonPane, BorderLayout.SOUTH);
    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK"));
-    	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_Cancel"));
+    	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel"));
    	buttonPane.add(ok);
    	buttonPane.add(cancel);
--- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
@ -44,7 +44,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
        labelPane.add(iconPane);
        Component[][] n_components = {
                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()},
                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane},
                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField = new UITextField()},
        };
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
@ -15,7 +15,7 @@ public class PaneTitleConstants {
 	public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Background");
 	public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet");
 	public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label");
-	public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("AnalysisLine");
+	public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line");
 	public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area");
 	public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot");
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java
@ -19,7 +19,7 @@ import com.fr.log.FineLoggerFactory;
 */
 public class CalculateComboBox extends UIComboBox{
-	public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"),
+	public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Average"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Max"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Min"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Count")};
 	public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class, 
@ -31,7 +31,7 @@ public class CalculateComboBox extends UIComboBox{
 	}
 	public void reset() {
-		this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"));
+		this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"));
 	}
 	/**
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
@ -45,7 +45,7 @@ public class XCheckBoxGroup extends XFieldEditor {
 	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
 		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
-				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive"))
+				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class),
 				new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName(
 						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue(
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java
@ -52,7 +52,7 @@ public class XRadioGroup extends XFieldEditor {
 	private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
 		CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] {
-				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive"))
+				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)};
 		if (!toData().isAdaptive()) {
 			crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data
--- a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java
+++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java
@ -5,7 +5,7 @@ package com.fr.design.designer.properties.items;
 public class UnderlineItems implements ItemProvider {
    private static Item[] VALUE_ITEMS = {
-        new Item(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), ""),
+        new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), ""),
        new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), "overline"),
        new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), "line-through"),
        new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), "underline")};
--- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
+++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
@ -73,9 +73,9 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
        formulaEditor.setEnabled(true);
        textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor});
        Component[][] coms = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"),
                        valuePane},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"),
                        textPane}};
        double p = TableLayout.PREFERRED;
--- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java
@ -134,7 +134,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide
    private void initFormButtons() {
        if (componentsList4Form.isEmpty()) {
            // 表单布局
-            this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout")));
+            this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout")));
            WidgetOption[] containerWidgetArray = FormWidgetOption.getFormContainerInstance();
            for (WidgetOption no : containerWidgetArray) {
                this.componentsList4Form.add(new ToolBarButton(no));
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
@ -45,7 +45,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
        UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"));
        backgroundLabel.setVerticalAlignment(SwingConstants.TOP);
        Component[][] n_components = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField},
                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                backgroundCompPane,
                frFont,
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java
@ -30,7 +30,7 @@ public class ButtonGroupDictPane extends JPanel {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true);
+		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true);
 		adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":");
 		columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
@ -289,7 +289,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 					Constants.LINE_THIN, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE),
 			new CellBorderStyle(Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black,
 					Constants.LINE_THICK, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE) };
-	private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Bottom_Border_Line"),
+	private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom_Border_Line"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Double_Bottom_BorderLine"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Bottom_Border_Line"),
 			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Double_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Thick_Bottom_Border_Line"),
--- a/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java
@ -34,7 +34,7 @@ public class EmbeddedExportExportAction extends AbstractExportAction {
    @Override
    protected ChooseFileFilter getChooseFileFilter() {
        return new ChooseFileFilter(EnumSet.of(FileExtension.CPTX, FileExtension.CPT),
-                com.fr.design.i18n.Toolkit.i18nText("Export-Template(embedded_data)"));
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Template(Embedded_Data)"));
    }
    @Override
--- a/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java
@ -34,7 +34,7 @@ public class WordExportAction extends AbstractExportAction {
    @Override
    protected ChooseFileFilter getChooseFileFilter() {
-        return new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("Export-Word"));
+        return new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"));
    }
    @Override
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
@ -333,9 +333,9 @@ public class DSColumnAdvancedPane extends BasicPane {
            bottomFormulaPane = new JFormulaField("-1");
            serialTextField = new UITextField(18);
            JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1")
-                    + "  " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Odd_Selected_(1,3,5...)")), FlowLayout.LEFT);
+                    + "  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Odd_Selected_(1,3,5...)")), FlowLayout.LEFT);
            JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1")
-                    + "  " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
+                    + "  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
            JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
                    serialTextField, new UILabel(
                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
@ -50,7 +50,7 @@ public class DSColumnConditionsPane extends BasicPane {
 //            pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
            pane.add(new UILabel(INSET_TEXT));
-            reselectExpandCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Extend_the_conditions_of_fatherCell(Applied_to_the_data_contains_other_data)"), false);
+            reselectExpandCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Extend_The_Conditions_of_Father_Cell(Applied_To_The_Data_Contains_Other_Data)"), false);
            pane.add(reselectExpandCheckBox);
            reselectExpandCheckBox.setSelected(true);
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java
@ -46,7 +46,7 @@ public class ResultSetGroupPopUpPane extends ResultSetGroupPane {
 		this.setLayout(FRGUIPaneFactory.create1ColumnGridLayout());
 		// 分组
-		groupRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Group(Merger_the_Items_Which_Have_The_Same_Value_in_Column)"));
+		groupRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Group(Merger_The_Items_Which_Have_The_Same_Value_in_Column)"));
 		groupRadioButton.addActionListener(checkEnabledActionListener);
 		groupComboBox.addItemListener(new ItemListener() {
@ -60,13 +60,13 @@ public class ResultSetGroupPopUpPane extends ResultSetGroupPane {
 				new JComponent[]{new UILabel(InsertText), groupRadioButton, groupComboBox, advancedButton}, FlowLayout.LEFT));
 		// 列表
-		listRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Select(Regardless_of_Having_the_Same_Value,Display_all_Item_in_Column)"));
+		listRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Select(Regardless_of_Having_the_Same_Value,Display_All_Item_in_Column)"));
 		listRadioButton.addActionListener(checkEnabledActionListener);
 		this.add(GUICoreUtils.createFlowPane(
 				new JComponent[]{new UILabel(InsertText), listRadioButton}, FlowLayout.LEFT));
 		// 汇总		
-		summaryRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Summary(Including_SUM_,_AVERAGE_,_MAX_,_MIN_And_So_On)"), true);
+		summaryRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Summary(Including_SUM_,_AVERAGE_,_MAX_,_MIN_And_So_On)"), true);
 		summaryRadioButton.addActionListener(checkEnabledActionListener);
 		functionComboBox = new FunctionComboBox(GUICoreUtils.getFunctionArray());
 		this.add(GUICoreUtils.createFlowPane(
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java
@ -54,7 +54,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
        lessModelList = new SearchResult();
        moreModelList = new SearchResult();
        if (StringUtils.isBlank(searchText)) {
-            lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")));
+            lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")));
            return lessModelList;
        }
        if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainDocument()) {
@ -82,10 +82,10 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
                    if (searchResult.isEmpty()) {
                        return lessModelList;
                    } else if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) {
-                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")));
+                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")));
                        lessModelList.addAll(searchResult);
                    } else {
-                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.DOCUMENT));
+                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.DOCUMENT));
                        lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE));
                        moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size()));
                    }
@ -104,7 +104,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
     */
    private SearchResult getNoConnectList() {
        SearchResult result = new SearchResult();
-        result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")));
+        result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")));
        result.add(AlphaFineHelper.NO_CONNECTION_MODEL);
        return result;
    }
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java
@ -39,7 +39,7 @@ public class ButtonGroupDictPane extends JPanel {
 	public void initComponents() {
 		dictPane = new AccessibleDictionaryEditor();
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true);
+		adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true);
 		adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		adaptiveCheckbox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {