Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -206,7 +206,7 @@ public class PreferencePane extends BasicPane {
         editPane.add(supportStringToFormulaBox);
 
         //是否默认转化
-        defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Always"));
+        defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Always"));
 
         editPane.add(defaultStringToFormulaBox);
         //不支持转化则不能默认执行
@@ -650,7 +650,7 @@ public class PreferencePane extends BasicPane {
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
-                new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later")},
+                new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer_Later")},
                 null
         );
         if (rv == JOptionPane.OK_OPTION) {

designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@@ -175,12 +175,12 @@ public class AboutPane extends JPanel {
     }
 
     private String getCopyRight() {
-        return append(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL,
+        return append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_CopyRight"), COPYRIGHT_LABEL,
                 ProductConstants.HISTORY, StringUtils.BLANK, CloudCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
     }
 
     private String getBuildTitle() {
-        return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_Version"),
+        return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Version"),
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
 

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -87,7 +87,7 @@ public class AlphaFineConfigPane extends BasicPane {
 
         double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
 
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_SearchRange"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
         isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend"));
         isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"));
         isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon"));
@@ -100,7 +100,7 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     private void createShortcutsPane(JPanel contentPane) {
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Shortcut_Config"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Shortcut_Config"));
         shortcutsField = new UITextField();
         shortcutsField.setEditable(false);
         shortcutsField.selectAll();
@@ -138,8 +138,8 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     private void createOnlinePane(JPanel contentPane) {
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableInternet"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Internet"));
-        isSearchOnlineCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableInternetSearch"));
+        isSearchOnlineCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Internet_Search"));
         isSearchOnlineCheckbox.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -163,7 +163,7 @@ public class AlphaFineConfigPane extends BasicPane {
 
     private void createOpenPane(JPanel contentPane) {
         JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Enable"));
-        isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableAlphaFine"));
+        isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine"));
         northPane.add(isEnabledCheckbox);
         contentPane.add(northPane);
     }

designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java

@@ -36,7 +36,7 @@ public class PluginManagerAction extends UpdateAction {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Manager");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -133,7 +133,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 		JPanel paraMeanPane = new JPanel(new BorderLayout());
 		paraMeanPane.setPreferredSize(new Dimension(680, 90));
-		UILabel paraMean = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Datasource-Param_DES"));
+		UILabel paraMean = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Param_DES"));
 		paraMeanPane.add(paraMean, BorderLayout.CENTER);
 
 
@@ -171,7 +171,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-DS-Database_Query");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS-Database_Query");
 	}
 
 	private void refresh() {
@@ -328,13 +328,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 	private class EditPageQueryAction extends UpdateAction {
 		public EditPageQueryAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_PageQuery"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Page_Query"));
 			this.setMnemonic('L');
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
 		}
 
 		public void actionPerformed(ActionEvent e) {
-			final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_Define_PageQuerySQL"));
+			final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL"));
 			pane.populate(pageQuery);
 			BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame());
 			dialog.addDialogActionListener(new DialogActionAdapter() {

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -133,7 +133,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         // 最上面的pane，文件选择
         JPanel centerPanel = new JPanel();
         centerPanel.setPreferredSize(new Dimension(522, 200));
-        centerPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-File_address")));
+        centerPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File_Address")));
         addToCenterPanel(centerPanel);
 
         // 下面的pane，参数面板
@@ -162,7 +162,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private void addToCenterPanel(JPanel centerPanel){
-        localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Local_file") + ":", true);
+        localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_File") + ":", true);
         urlFileRadioButton = new UIRadioButton("URL:", false);
         ButtonGroup bg = new ButtonGroup();
         bg.add(localFileRadioButton);
@@ -199,7 +199,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         centerPanel.add(filePath, BorderLayout.NORTH);
 
         // 中间的pane，提示信息
-        String tipContent = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "<br>"
+        String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "<br>"
                 + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
         tips = new UILabel(tipContent);
         centerPanel.add(tips, BorderLayout.CENTER);
@@ -209,7 +209,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         public void actionPerformed(ActionEvent arg0) {
             String uri = ParameterHelper.analyze4Templatee( urlText.getText(), params);
             if (!checkURL(uri)) {
-                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning"));
+                JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
                 return;
             }
             params = getEditorPaneParameter();
@@ -257,7 +257,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         controlPane.setLayout(new BorderLayout(8,8));
         controlPane.setPreferredSize(new Dimension(width, height));
         JPanel comboboxPanel = new JPanel(new BorderLayout(8,8));
-        encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Encoding_Type") + ":");
+        encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         encodingComboBox.setSelectedIndex(4);
         encodingComboBox.setPreferredSize(new Dimension(90, 20));
@@ -288,7 +288,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         JPanel northPane = new JPanel(new BorderLayout(8,8));
         controlPane.setLayout(new BorderLayout());
         controlPane.setPreferredSize(new Dimension(width,height));
-        needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FirstRow_IS_ColumnName"), false);
+        needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), false);
         needColumnNameCheckBox.setPreferredSize(new Dimension(checkBoxWidth, 20));
         northPane.add(needColumnNameCheckBox, BorderLayout.EAST);
         controlPane.add(northPane, BorderLayout.NORTH);
@@ -314,7 +314,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         if (urlFileRadioButton.isSelected()) {
             String url = urlText.getText().trim();
             if (!checkURL(url)) {
-                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning"));
+                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
             }
         }
 
@@ -347,7 +347,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         double p = TableLayout.PREFERRED;
         double columnSize[] = {f, p, p};
         double rowSize[] = {B, B, B, B, B, B, B};
-        needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FirstRow_IS_ColumnName"), true);
+        needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true);
         dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dismenber") + ":");
         tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember"), false);
         tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember"));
@@ -374,8 +374,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         bg2.add(spaceDismenberRadioButton);
         bg2.add(commaDismenberRadioButton);
         bg2.add(otherDismenberRadioButton);
-        igoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Series_Dismenber_As_Single"), true);
+        igoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Series_Dismenber_As_Single"), true);
-        encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Encoding_Type") + ":");
+        encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         Component[][] comps = {
                 {encodeLabel,charsetComboBox,null},
@@ -475,7 +475,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 } else {
                     setPanel.add(textSetPanel(width,height), BorderLayout.NORTH);
                 }
-                String tipContent = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "<br>"
+                String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "<br>"
                         + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
                 tips.setText(tipContent);
                 setPanel.revalidate();

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -309,7 +309,7 @@ public abstract class BasicPane extends JPanel {
 
             nameTextField = new UITextField(30);
             JPanel northPane = new JPanel(new BorderLayout(4, 4));
-            northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST);
+            northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), BorderLayout.WEST);
             northPane.add(nameTextField, BorderLayout.CENTER);
             northPane.add(showfield = new UILabel(" "), BorderLayout.EAST);
             showfield.setForeground(new Color(204, 0, 1));

designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java

@@ -291,7 +291,7 @@ public class ValueEditorPaneFactory {
                 formulaEditor,
                 new ParameterEditor(),
                 new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
-                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group"))
+                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
 
@@ -303,7 +303,7 @@ public class ValueEditorPaneFactory {
     public static Editor<?>[] cellGroupEditor() {
         return new Editor[]{
                 new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")),
-                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group"))
+                new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group"))
         };
     }
 
@@ -493,7 +493,7 @@ public class ValueEditorPaneFactory {
 
         JPanel paneLeft = FRGUIPaneFactory.createBorderLayout_S_Pane();
         pane.add(paneLeft);
-        paneLeft.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value") + ":"), BorderLayout.NORTH);
+        paneLeft.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), BorderLayout.NORTH);
         paneLeft.add(keyColumnPane, BorderLayout.CENTER);
 
         JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane();

designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java

@@ -8,7 +8,6 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
 
-import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.license.Licensed;
 import com.fr.plugin.manage.PluginManager;
@@ -59,7 +58,7 @@ public class PluginControlPane extends BasicPane {
                 doSearch(searchTextField.getText());
             }
         });
-        add(GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH);
+        add(GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH);
 
         pluginList = new UIList();
         DefaultListCellRenderer renderer = new DefaultListCellRenderer() {
@@ -95,7 +94,7 @@ public class PluginControlPane extends BasicPane {
 
 
         PluginDescriptionLabel label = new PluginDescriptionLabel();
-        label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin"));
+        label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Plugin"));
         JPanel leftPane = GUICoreUtils.createBorderLayoutPane(
                 jScrollPane, BorderLayout.CENTER,
                 label, BorderLayout.NORTH

designer-base/src/main/java/com/fr/design/extra/PluginDetailPane.java

@@ -26,7 +26,7 @@ public class PluginDetailPane extends BasicPane {
     public PluginDetailPane() {
         setLayout(new BorderLayout());
         PluginDescriptionLabel label = new PluginDescriptionLabel();
-        label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin_Description"));
+        label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Plugin_Description"));
         add(label, BorderLayout.NORTH);
 
         textPane = new JEditorPane();

designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@@ -65,7 +65,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public String textForInstallFromDiskButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_From_Local");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_From_Local");
             }
 
             @Override
@@ -113,7 +113,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public String textForInstallFromDiskButton() {
-                return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_From_Local");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_From_Local");
             }
 
             @Override
@@ -140,7 +140,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      */
     public void loadOnSuccess(List<PluginView> plugins) {
         controlPane.loadPlugins(plugins);
-        tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_All_Plugins") + "(" + plugins.size() + ")");
+        tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins") + "(" + plugins.size() + ")");
     }
 
     /**
@@ -177,7 +177,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                 public void done(PluginTaskResult result) {
                     if (result.isSuccess()) {
                         FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"));
-                        JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Successful"));
+                        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);
                     }
@@ -218,7 +218,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      * @return 标题字符串
      */
     public String textForLoadingLabel() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Load_Plugins_From_Server");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Load_Plugins_From_Server");
     }
 
     /**
@@ -228,7 +228,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      */
     @Override
     public String textForInstallFromDiskFileButton() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_From_Local");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_From_Local");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java

@@ -40,9 +40,9 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
 
         add(panel, BorderLayout.SOUTH);
 
-        disableButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Disable"));
+        disableButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Disable"));
         disableButton.setEnabled(false);
-        deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete"));
+        deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete"));
         deleteButton.setEnabled(false);
         panel.add(disableButton);
         panel.add(deleteButton);
@@ -61,7 +61,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                 if (plugin != null) {
                     boolean isActive = plugin.isActive();
                     PluginMarker pluginMarker = PluginMarker.create(plugin.getID(), plugin.getVersion());
-                    final String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Has_Been_Actived") : com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Has_Been_Disabled");
+                    final String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Actived") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled");
                     if (isActive) {
                         PluginManager.getController().forbid(pluginMarker, new PluginTaskCallback() {
                             @Override
@@ -111,19 +111,19 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
      * @return 同上
      */
     public String tabTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Installed") + "(" + num + ")";
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Installed") + "(" + num + ")";
     }
 
     private void doDelete(PluginView plugin) {
         int rv = JOptionPane.showOptionDialog(
                 PluginInstalledPane.this,
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Will_Be_Delete"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Will_Be_Delete"),
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                 JOptionPane.YES_NO_CANCEL_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
-                new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"),
+                new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer_Later"),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")
                 },
                 null
@@ -145,9 +145,9 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
 
     private void changeTextForButton(PluginView plugin) {
         if (plugin.isActive()) {
-            disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Disable"));
+            disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Disable"));
         } else {
-            disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Active"));
+            disableButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Active"));
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@@ -155,7 +155,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
      */
     @Override
     public String textForLoadingLabel() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Detecting_Update");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Detecting_Update");
     }
 
     protected void installFromDiskFile() {
@@ -199,7 +199,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
             public void done(PluginTaskResult result) {
                 if (result.isSuccess()) {
                     FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Successful"));
+                    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);
                 }

designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@@ -384,7 +384,7 @@ public class PluginWebBridge {
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
-                new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later")},
+                new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer_Later")},
                 null
         );
         if (rv == JOptionPane.OK_OPTION) {

designer-base/src/main/java/com/fr/design/extra/PluginsReaderFromStore.java

@@ -37,7 +37,7 @@ public class PluginsReaderFromStore {
             String charSet = EncodeConstants.ENCODING_UTF_8;
             resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet);
         } catch (Exception e) {
-            throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_PluginMarket_Coding"));
+            throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Plugin_Market_Coding"));
         }
         return parseResText(resText, plugins);
     }
@@ -75,7 +75,7 @@ public class PluginsReaderFromStore {
                     }
                 }
             } catch (JSONException e) {
-                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Read_Plugin_List_Error"));
+                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Read_Plugin_List_Error"));
             }
         }
         return new ArrayList<>(plugins);

designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java

@@ -22,7 +22,7 @@ public class QQLoginDialog extends UIDialog {
         setSize(DEFAULT_SHOP);
         GUICoreUtils.centerWindow(this);
         setResizable(false);
-        setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"));
+        setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Manager"));
     }
 
     @Override

designer-base/src/main/java/com/fr/design/extra/ShopManagerPane.java

@@ -26,6 +26,6 @@ public class ShopManagerPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Manager");
     }
 }

designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@@ -64,7 +64,7 @@ public class WebViewDlgHelper {
             if (!file.exists()) {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
                         com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.INFORMATION_MESSAGE
@@ -96,7 +96,7 @@ public class WebViewDlgHelper {
             BasicPane traditionalStorePane = new BasicPane() {
                 @Override
                 protected String title4PopupWindow() {
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Manager");
                 }
             };
             traditionalStorePane.setLayout(new BorderLayout());
@@ -201,7 +201,7 @@ public class WebViewDlgHelper {
     private static void confirmDownLoadShopJS() {
         int rv = JOptionPane.showConfirmDialog(
                 null,
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                 JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.INFORMATION_MESSAGE
@@ -250,7 +250,7 @@ public class WebViewDlgHelper {
         PluginInstalledPane installedPane = new PluginInstalledPane();
         tabbedPane.addTab(installedPane.tabTitle(), installedPane);
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane));
-        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane));
+        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane));
         return tabbedPane;
     }
 
@@ -282,7 +282,7 @@ public class WebViewDlgHelper {
                     if (get()) {
                         IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
-                        JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);
+                        JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);
                     }
                 } catch (InterruptedException | ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -305,7 +305,7 @@ public class WebViewDlgHelper {
                     if (!ComparatorUtils.equals(isLatest, LATEST)) {
                         int rv = JOptionPane.showConfirmDialog(
                                 null,
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Update"),
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"),
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                                 JOptionPane.OK_CANCEL_OPTION,
                                 JOptionPane.INFORMATION_MESSAGE

designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

@@ -32,7 +32,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
     public void done(PluginTaskResult result){
         if (result.isSuccess()) {
             FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success"));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Successful"));
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful"));
         } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
                     null,

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -168,7 +168,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         if (reportPaths.length == 0) {
             return;
         }
-        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete-File")) != JOptionPane.OK_OPTION) {
+        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_File")) != JOptionPane.OK_OPTION) {
             return;
         }
         for (String reportPath : reportPaths) {

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -188,7 +188,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         this.add(textPane, BorderLayout.CENTER);
         JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Input_formula_in_the_text_area_below") + ":"
+        UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":"
                 + "                         ");
         formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
         initFormulaTextArea();
@@ -201,7 +201,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
         initTipsPane();
 
-        UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Check_Valid"));
+        UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Check_Valid"));
         checkValidButton.addActionListener(checkValidActionListener);
 
         JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@@ -477,7 +477,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Formula_Definition");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Formula_Definition");
     }
 
     /**
@@ -568,7 +568,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                         * 不需要eval
                         * TODO 但有个问题,有些函数的参数个数是有规定的,何以判别之
                         */
-                        (expression != null ? com.fr.design.i18n.Toolkit.i18nText("FormulaD-Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("FormulaD-Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
+                        (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
                         JOptionPane.INFORMATION_MESSAGE);
             }
         }
@@ -588,7 +588,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList);
             functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
             functionTypeScrollPane.setPreferredSize(new Dimension(140, 200));
-            functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST);
+            functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST);
             initTypeListCellRenderer();
             initGroupTypeModel();
             initTypeListSelectionListener();
@@ -702,7 +702,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
             functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
             functionPane.add(
-                    this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_name") + ":", functionNameScrollPane),
+                    this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane),
                     BorderLayout.CENTER);
             functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
             initFunctionNameListCellRenderer();
@@ -924,7 +924,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 rootNode.add(bindCellNode);
             }
 
-            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Data_Fields"),
+            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Data_Fields"),
                     BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"),
                     variableResolver.resolveColumnNames()).createMutableTreeNode());
 

designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@@ -96,7 +96,7 @@ public abstract class FunctionConstants {
 	public static FunctionGroup CUSTOM = new FunctionGroup() {
 		@Override
 		public String getGroupName() {
-			return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function");
 		}
 		
 		@Override
@@ -117,14 +117,14 @@ public abstract class FunctionConstants {
 		}
 	};
 	
-	public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Most_Recently_Used"), new Function[] {
+	public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Most_Recently_Used"), new Function[] {
 		new SUM(), new COUNT(), new AVERAGE(), new CHAR(), new DATE(), new MAX(), new MIN(), new TIME(), new RANGE()
 	});
 	
 	public static NameAndTypeAndFunctionList[] EMBFUNCTIONS = new NameAndTypeAndFunctionList[] {
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Math_&_Trig"), Function.MATH),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Text"), Function.TEXT),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Date_&_Time"), Function.DATETIME),
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Logical"), Function.LOGIC),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT),

designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@@ -199,7 +199,7 @@ public class JavaEditorPane extends BasicPane {
     }
 
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function");
     }
 
     public static final String DEFAULT_TABLEDATA_STRING = "package com.fr.data;\n" +

designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java

@@ -211,7 +211,7 @@ public  class CommitTabbedPane extends JComponent implements MouseListener, Mous
     }
 
     private String createName(){
-        String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Submit");
+        String prefix = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Submit");
         int  count = getTabCount();
         while (true) {
             //从提交1开始
@@ -408,7 +408,7 @@ public  class CommitTabbedPane extends JComponent implements MouseListener, Mous
             selectedIndex = dbManipulationPaneList.size()-1;
             commit2DBJavaScriptPane.updateCardPane();
         } else if (isOverCloseIcon(x)){
-            int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_SureToDelete")+ "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Remove")
+            int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Remove")
                     , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (re == JOptionPane.OK_OPTION) {
                 dbManipulationPaneList.remove(getTabIndex(x));

designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java

@@ -43,7 +43,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
 	private static final long serialVersionUID = 1762889323082827111L;
 
 	private String[] buildWay = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build"),
-		com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto-Build"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layer-Build")};
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layer-Build")};
 
 	public TreeSettingPane(boolean isEditor) {
 		this.initComponents(isEditor);

designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java

@@ -45,9 +45,9 @@ public class DictionaryConstants {
 		};
 	
 	public static final String[] delimiterDisplays = new String[]{
-		com.fr.design.i18n.Toolkit.i18nText("Form-Comma"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Comma"),
-		com.fr.design.i18n.Toolkit.i18nText("Form-Semicolon"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Semicolon"),
-		com.fr.design.i18n.Toolkit.i18nText("Form-Colon")
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Colon")
 		};
 	
 	public static final String[] symbols = new String[]{
@@ -56,8 +56,8 @@ public class DictionaryConstants {
 	
 	public static final String[] symbolDisplays = new String[]{
 		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
-		com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Single_Quote"),
-		com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes")
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Double_Quotes")
 	};
 	// richer:文件类型选择器
 	public static final String[] fileTypes = new String[]{
@@ -77,7 +77,7 @@ public class DictionaryConstants {
 	};
 	
 	public static final String[] fileTypeDisplays = new String[]{
-		com.fr.design.i18n.Toolkit.i18nText("Form-All_Files"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_All_Files"),
 		"txt",
 		"pdf",
 		"jpg,png,gif",

designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java

@@ -57,8 +57,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line"),
             com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")};
 
-    private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Titled"),
+    private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
-            com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Adjust")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
 
     private JPanel hPaneContainer;
     private JPanel vPaneContainer;
@@ -101,8 +101,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}};
         Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
         hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
-        hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Right"),
+        hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")});
         hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
@@ -111,7 +111,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}};
         Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
         vAlignmentPane = new UIButtonGroup<Integer>(vAlignmentIconArray, vAlignment);
-        vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Bottom")});
+        vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")});
         initOtherComponent();
         initAllNames();
 
@@ -257,13 +257,13 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION);
 
         JPanel indentationPane = new JPanel(new BorderLayout());
-        indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Indentation")), SwingConstants.LEFT));
+        indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT));
         indentationPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
         JPanel partSpacingPane = new JPanel(new BorderLayout());
-        partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_PartSpacing")), SwingConstants.LEFT));
+        partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT));
         partSpacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
         JPanel spacingPane = new JPanel(new BorderLayout());
-        spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Spacing")), SwingConstants.LEFT));
+        spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Spacing")), SwingConstants.LEFT));
         spacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
 
         Component[][] components = new Component[][]{
@@ -296,7 +296,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Alignment");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Alignment");
     }
 
     /**

designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java

@@ -1,11 +1,9 @@
 package com.fr.design.gui.style;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.fun.BackgroundQuickUIProvider;
-import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
@@ -74,7 +72,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill") + "     ", SwingConstants.LEFT),typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill") + "     ", SwingConstants.LEFT),typeComboBox},
                 new Component[]{null, centerPane}
         };
         double[] rowSize = {p, p, p};

designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java

@@ -91,7 +91,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
         } else {
             itemNameTextField = new UITextField();
             components = new Component[][]{
-                    {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), itemNameTextField},
+                    {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), itemNameTextField},
                     {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet") + ":"), reportletNamePane},
             };
         }

designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

@@ -0,0 +1,71 @@
+package com.fr.design.i18n;
+
+import com.fr.general.GeneralContext;
+import com.fr.general.log.MessageFormatter;
+import com.fr.locale.DesignI18nProvider;
+import com.fr.locale.InterProviderFactory;
+import com.fr.locale.LocaleBundle;
+import com.fr.locale.LocaleFiles;
+import com.fr.locale.LocaleManager;
+import com.fr.locale.impl.FineLocaleManager;
+
+import java.util.List;
+import java.util.Locale;
+
+public class DesignI18nImpl implements DesignI18nProvider {
+
+    private static DesignI18nImpl instance = new DesignI18nImpl();
+
+    public static DesignI18nImpl getInstance() {
+        return instance;
+    }
+
+    private LocaleManager localeManager = FineLocaleManager.create();
+
+    private DesignI18nImpl() {
+        addResource("com/fr/design/i18n/main");
+        InterProviderFactory.registerDesignI18nProvider(this);
+    }
+
+    @Override
+    public String i18nText(String key) {
+        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key);
+    }
+
+    @Override
+    public String i18nText(String key, Object... args) {
+        String format = InterProviderFactory.getProvider().getLocText(key);
+        MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args);
+        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage());
+    }
+
+    @Override
+    public void addResource(String path) {
+        localeManager.addResource(path);
+    }
+
+    @Override
+    public void removeResource(String path) {
+        localeManager.removeResource(path);
+    }
+
+    @Override
+    public LocaleBundle getLocalBundle(Locale locale) {
+        return localeManager.getLocalBundle(locale);
+    }
+
+    @Override
+    public List<LocaleFiles> getReverseList() {
+        return localeManager.getReverseList();
+    }
+
+    @Override
+    public List<LocaleFiles> getList() {
+        return localeManager.getList();
+    }
+
+    @Override
+    public void clear() {
+        localeManager.clear();
+    }
+}

designer-base/src/main/java/com/fr/design/i18n/Toolkit.java

@@ -1,27 +1,12 @@
 package com.fr.design.i18n;
 
-import com.fr.general.GeneralContext;
-import com.fr.general.log.MessageFormatter;
 import com.fr.locale.InterProviderFactory;
-import com.fr.locale.LocaleManager;
-import com.fr.locale.impl.FineLocaleManager;
 
 /**
  * 设计器国际化类，后面会不再依赖InterProviderFactory
  */
 public class Toolkit {
 
-    private static LocaleManager localeManager = FineLocaleManager.create();
-
-    static {
-        addResource("com/fr/design/i18n/main");
-    }
-
-    public static void addResource(String path) {
-
-        localeManager.addResource(path);
-    }
-
     /**
      * 设计器国际化方法
      *
@@ -29,7 +14,7 @@ public class Toolkit {
      * @return 国际化值
      */
     public static String i18nText(String key) {
-        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key);
+        return DesignI18nImpl.getInstance().i18nText(key);
     }
 
     /**
@@ -41,9 +26,7 @@ public class Toolkit {
      * @return 国际化值
      */
     public static String i18nText(String key, Object... args) {
-        String format = InterProviderFactory.getProvider().getLocText(key);
+        return DesignI18nImpl.getInstance().i18nText(key, args);
-        MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args);
-        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage());
     }
 
     /**

designer-base/src/main/java/com/fr/design/javascript/ParameterJavaScriptPane.java

@@ -29,7 +29,7 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane<ParameterJava
         this.add(parameterViewPane, BorderLayout.CENTER);
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), BorderLayout.NORTH);
         }
     }
 

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -118,7 +118,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
         // 控件设置
-        PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"),
+        PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings"),
                 "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART});
         // 条件属性

designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe;
 
 
-import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 
@@ -44,7 +43,7 @@ public class UndoStateEdit extends AbstractUndoableEdit {
     public void undo() throws CannotUndoException {
         super.undo();
         if (cur.getAuthorityType() == BaseUndoState.AUTHORITY_STATE) {
-            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Undo_All_Authority_Operations") + "?",
+            int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?",
                     com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.NO_OPTION) {
                 return;

designer-base/src/main/java/com/fr/design/mainframe/widget/editors/FormattedEditor.java

@@ -70,7 +70,7 @@ public class FormattedEditor extends AbstractPropertyEditor {
         try {
             format.parseObject(textField.getText());
         } catch (ParseException ex) {
-            throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Format-Error") + "!");
+            throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Format_Error") + "!");
         }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java

@@ -25,7 +25,7 @@ public class TreeModelWrapper implements Encoder, Decoder {
         } else if (v instanceof NameObject) {
             return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build");
         } else {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto-Build");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build");
         }
     }
 

designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java

@@ -77,7 +77,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane<DatabaseDictionary> i
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value"), UILabel.LEFT), keyColumnPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyColumnPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueDictPane}
         };
         JPanel dbDictPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, GAP_HUGER, LayoutConstants.VGAP_LARGE);

designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java

@@ -46,7 +46,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
         double[] rowSize = {p, p, p};
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
 
-        UILabel tag = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Formula_Dictionary_Display_Examples_Html"));
+        UILabel tag = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Dictionary_Display_Examples_Html"));
         tag.setForeground(new Color(143, 143, 146));
         tag.setPreferredSize(new Dimension(225, 80));
         JPanel t = new JPanel(new BorderLayout());
@@ -63,7 +63,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
 
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value"), UILabel.LEFT), keyFormulaContainer},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyFormulaContainer},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueFormulaContainer},
                 new Component[]{tag, null}
         };

designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java

@@ -108,7 +108,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS_TableData") + "  ", UILabel.LEFT), firstLine},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value") + "  ", UILabel.LEFT), keyColumnPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + "  ", UILabel.LEFT), keyColumnPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + "  ", UILabel.LEFT), valueDictPane},
         };
 

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -56,7 +56,7 @@ public class WatermarkPane extends BasicPane {
         // 预览
         JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         contentPane.add(leftPane, BorderLayout.CENTER);
-        leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null));
+        leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"), null));
         JPanel previewPaneWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
         leftPane.add(previewPaneWrapper, BorderLayout.CENTER);
         previewPaneWrapper.setBorder(BorderFactory.createEmptyBorder(2, 8, 4, 8));

designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java

@@ -78,10 +78,10 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
         selectFilePane.add(layoutPane, BorderLayout.CENTER);
 
         //布局
-        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Default"));
+        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"));
-        tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Titled"));
+        tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"));
-        extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Extend"));
+        extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"));
-        adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Adjust"));
+        adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust"));
 
         defaultRadioButton.addActionListener(layoutActionListener);
         tiledRadioButton.addActionListener(layoutActionListener);

designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java

@@ -25,8 +25,8 @@ public class WidgetBoundsPaneFactory {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), createRightPane(width, height)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)},
-                new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"), SwingConstants.CENTER))},
+                new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
         };
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
@@ -57,8 +57,8 @@ public class WidgetBoundsPaneFactory {
                 new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))},
         };
         Component[][] centerComponents = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), createRightPane(width, height)},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)},
-                new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"), SwingConstants.CENTER))},
+                new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Height"), SwingConstants.CENTER))},
         };
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
@@ -79,7 +79,7 @@ public class WidgetBoundsPaneFactory {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), width},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), width},
         };
         double[] rowSize = {p};
         double[] columnSize = {p, f};

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -944,7 +944,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 	}
 
 	protected abstract static class KeyColumnTableModel extends AbstractTableModel {
-        public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA-Key");
+        public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA_Key");
         public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Column");
         public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value");
 

designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java

@@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane<List>{
 	private void initCom() {
 		this.setLayout(new BorderLayout(0, 0));
 		
-		UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) {
+		UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) {
 			public boolean isCellEditable(int row, int col) {
 				return col != 0;
 			}

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java

@@ -86,7 +86,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
 		northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":"));
 		northPane.add(columnBox);
 
-		tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")}, new int[]{}) {
+		tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) {
 			public boolean isCellEditable(int row, int col) {
 				return col != 0;
 			}

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java

@@ -266,7 +266,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 	}
 
 	private JMenuItem createMarkerItem(final String oldName) {
-		JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Marker"}));
+		JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Marker"));
 		editMarkerItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				final MapCustomPane image = new MapCustomPane();

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java

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

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java

@@ -23,7 +23,7 @@ public class MapDataLabelPane extends DataLabelPane {
 
     @Override
     protected String getCategoryString() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name");
     }
 
     @Override

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@@ -51,7 +51,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
 
         if (needRenamePane()) {
             itemNameTextField = new UITextField();
-            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.NORTH);
+            this.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), BorderLayout.NORTH);
         }
 
         this.add(centerPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java

@@ -55,7 +55,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
         double[] columnSize_north = {p, f};
         double[] rowSize_north = {p, p, p, p};
         Component[][] components_north = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
                 new Component[]{new UILabel("x"), xCombox},
                 new Component[]{new UILabel("y"), yCombox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -95,7 +95,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         double f = TableLayout.FILL;
         double[] columnSize = {f};
         double[] rowSize = {p, p, p, p};
-        UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
+        UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
         Label1.setPreferredSize(new Dimension(75, 20));
         UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"));
         Label2.setPreferredSize(new Dimension(75, 20));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java

@@ -51,7 +51,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
 		double[] rowSize = { p,p,p,p,p,p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name") + ":"),seriesName},
+                new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name") + ":"),seriesName},
                 new Component[]{new BoldFontTextLabel("  " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "x" + ":"), xCombox},
                 new Component[]{new BoldFontTextLabel("  " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "y" + ":"), yCombox},
                 new Component[]{new JSeparator(),null},

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java

@@ -154,7 +154,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
         isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Animation_JSShow"));
         isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Drag"));
 
-        isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
+        isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
         dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
         isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent"));
         dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java

@@ -41,7 +41,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{
         isAddress.setSelected(true);
         isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name"));
 
-        isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
+        isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
         valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
 
         divideComoBox = new UIComboBox(ChartConstants.DELIMITERS);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java

@@ -30,7 +30,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane {
 		this.parent = parent;
 		
 		isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"));
-		isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
+		isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
 		isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value"));
         valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java

@@ -98,8 +98,8 @@ public class ChartDatapointLabelPane extends BasicPane{
         if(plot.isSupportCategoryFilter()) {
 		    isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"));
         }
-		isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
+		isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
-		isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
+		isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
 		isValue.setSelected(true);
 		valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java

@@ -94,7 +94,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
     
     private void initMin() {
     	// 最小值.
-        minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
+        minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min_Value"));
         Date tmp = null;
         DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
         Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
@@ -110,7 +110,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
     
     private void initMax() {
     	 // 最大值
-        maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
+        maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Value"));
         Date tmp = null;
         DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
         Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java

@@ -35,7 +35,7 @@ public class AreaPlotPane extends AbstractChartTypePane{
 	protected String[] getTypeTipName() {
 		String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area");
 		String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-		String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+		String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
 		String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
 		return new String[]{
 				stack + area,

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java

@@ -33,7 +33,7 @@ public class BarPlotPane extends AbstractBarPane{
     protected String[] getTypeTipName() {
         String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar");
         String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
         String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
         return new String[]{
                 bar,

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java

@@ -32,7 +32,7 @@ public class ColumnPlotPane extends AbstractBarPane{
     protected String[] getTypeTipName() {
         String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column");
         String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
         String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
         return new String[]{
                 column,

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java

@@ -29,7 +29,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
     protected String[] getTypeTipName() {
         String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area");
         String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
         return new String[]{
                 area,
                 stack + area,

designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java

@@ -29,7 +29,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane {
     protected String[] getTypeTipName() {
         String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar");
         String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
         return new String[]{
                 bar,
                 stack + bar,

designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java

@@ -56,7 +56,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
         double[] rowSize_north = {p, p, p, p};
 
         Component[][] components_north = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
                 new Component[]{new UILabel("x" ), xCombox},
                 new Component[]{new UILabel("y"), yCombox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize},

designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java

@@ -14,7 +14,7 @@ public class ColumnBorderAttriPane extends BorderAttriPane {
     private UISpinner radius;
 
     public ColumnBorderAttriPane() {
-        this(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius"));
+        this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius"));
     }
 
     public ColumnBorderAttriPane(String radiusString) {

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java

@@ -30,7 +30,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
     protected String[] getTypeTipName() {
         String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column");
         String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
         return new String[]{
                 column,
                 stack + column,

designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java

@@ -99,7 +99,7 @@ public class VanChartBackgroundPane extends BasicPane {
 
         return  new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},

designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java

@@ -23,10 +23,10 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
         radius = new UISpinner(0,1000,1,0);
         return  new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java

@@ -33,7 +33,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane {
     protected Component[][] getPaneComponents() {
         return  new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
         };
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java

@@ -30,7 +30,7 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
                 new Component[]{null,null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
         } ;
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java

@@ -16,6 +16,6 @@ public class MapAreaNameFormatPaneWithCheckBox extends CategoryNameFormatPaneWit
 
     @Override
     protected String getCheckBoxText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name");
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java

@@ -18,6 +18,6 @@ public class SeriesNameFormatPaneWithCheckBox extends VanChartFormatPaneWithChec
 
     @Override
     protected String getCheckBoxText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name");
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java

@@ -18,6 +18,6 @@ public class ValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox
 
     @Override
     protected String getCheckBoxText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value");
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java

@@ -199,7 +199,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMin() {
             // 最小值.
-            minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"}));
+            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);
             Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
@@ -214,7 +214,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
 
         private void initMax() {
             // 最大值
-            maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"}));
+            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);
             Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@@ -104,7 +104,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
     protected Component[][] getTopPaneComponents() {
         return new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertAxis},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
         };

designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java

@@ -14,7 +14,7 @@ public class VanChartRadarAlertValuePane extends VanChartAlertValuePane {
 
     protected Component[][] getTopPaneComponents() {
         return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
         };

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java

@@ -31,7 +31,7 @@ public class VanChartPlotLabelPane extends BasicPane {
     public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) {
         this.parent = parent;
         this.plot = plot;
-        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseLabel"));
+        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
         labelPane = new JPanel(new BorderLayout(0, 4));
         createLabelPane();
         addComponents();

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java

@@ -18,7 +18,7 @@ public class VanChartPlotTooltipNoCheckPane extends VanChartPlotTooltipPane {
     }
 
     protected  void addComponents(Plot plot) {
-        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
+        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
         tooltipPane = createTooltipPane(plot);
 
         this.setLayout(new BorderLayout());

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -50,7 +50,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
     }
 
     protected  void addComponents(Plot plot) {
-        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
+        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
         tooltipPane = createTooltipPane(plot);
 
         double p = TableLayout.PREFERRED;

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java

@@ -40,7 +40,7 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{
     }
 
     private void initAllComponent() {
-        seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
+        seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
 
         startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time"));
 

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java

@@ -68,7 +68,7 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
         double[] col = {p,f};
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesComboBox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")), startTimeComboBox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")), endTimeComboBox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")), markerTimeComboBox},

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java

@@ -37,7 +37,7 @@ public class AreaPane extends AbstractReportDataContentPane {
 
     protected Component[][] getComponent () {
        return new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName}
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaName}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java

@@ -42,7 +42,7 @@ public class LongLatAreaPane extends AreaPane {
         return new Component[][]{
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName}
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaName}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java

@@ -52,7 +52,7 @@ public class AreaPane extends AbstractTableDataContentPane {
 
     protected Component[][] getComponent () {
         return new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom}
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaNameCom}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java

@@ -44,7 +44,7 @@ public class LongLatAreaPane extends AreaPane {
         return new Component[][]{
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitudeCom},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitudeCom},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom}
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaNameCom}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java

@@ -36,7 +36,7 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte
             protected void initLayout() {
                 this.setLayout(new BorderLayout(4, 0));
 
-                UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
+                UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
                 label.setPreferredSize(new Dimension(75, 20));
                 this.add(label, BorderLayout.WEST);
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java

@@ -63,7 +63,7 @@ public class VanAreaMapPlotTableDataContentPane extends AbstractTableDataContent
     }
 
     protected JPanel createAreaNamePane() {
-        UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
+        UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
         label.setPreferredSize(new Dimension(80, 20));
         areaNameCom.setPreferredSize(new Dimension(100, 20));
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

@@ -20,7 +20,7 @@ import java.awt.Component;
  * Created by Mitisky on 16/5/4.
  */
 public class VanChartMapPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap");
+    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
 
     private VanChartMapSourceChoosePane sourceChoosePane;
 
@@ -60,7 +60,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
     }
 
     protected Component[][] getPaneComponents(JPanel typePane){

designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java

@@ -18,7 +18,7 @@ public class VanChartMultiPiePlotTooltipNoCheckPane extends VanChartMultiPiePlot
     }
 
     protected  void addComponents(Plot plot) {
-        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
+        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
         tooltipPane = createTooltipPane(plot);
 
         this.setLayout(new BorderLayout());

designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java

@@ -19,7 +19,7 @@ public class VanChartScatterPlotTooltipNoCheckPane extends VanChartScatterPlotTo
     }
 
     protected  void addComponents(Plot plot) {
-        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
+        isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
         tooltipPane = createTooltipPane(plot);
 
         this.setLayout(new BorderLayout());

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -24,6 +24,7 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetHelpDialog;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.form.event.Listener;
+import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
@@ -168,8 +169,14 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 				//新tab默认都有标题
 				borderStyle.setType(LayoutBorderStyle.TITLE);
 			}
-			cardLayout.setWidgetName(XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, ""));
+			String newCardLayoutName = XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, "");
-			wCardTitleLayout.setCardName(cardLayout.getWidgetName());
+			cardLayout.setWidgetName(newCardLayoutName);
+			//修改cardswitchbutton所绑定的cardlayoutname
+			for (int i = 0, len = wCardTagLayout.getWidgetCount(); i < len; i++) {
+				CardSwitchButton button = wCardTagLayout.getSwitchButton(i);
+				button.setCardLayoutName(newCardLayoutName);
+			}
+			wCardTitleLayout.setCardName(newCardLayoutName);
 			wCardTagLayout.setNewTab(true);
 			//这边需要设置成默认值兼容之前的title高度(不知道为啥之前的title的高度会改变)
 			if(this.toData().getNorthSize() != 0){

designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java

@@ -401,7 +401,7 @@ public class LayoutBorderPane extends BasicPane {
     }
 
     protected JComponent[] getBorderCornerSpinnerComp(){
-        return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")+":"),borderCornerSpinner};
+        return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")+":"),borderCornerSpinner};
     }
 
     protected void switchBorderType(){

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -27,7 +27,7 @@ import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.hyperlink.ReportletHyperlinkPane;
 import com.fr.design.hyperlink.WebHyperlinkPane;
-import com.fr.design.i18n.Toolkit;
+import com.fr.design.i18n.DesignI18nImpl;
 import com.fr.design.javascript.EmailPane;
 import com.fr.design.javascript.JavaScriptImplPane;
 import com.fr.design.javascript.ParameterJavaScriptPane;
@@ -124,7 +124,7 @@ public class DesignerActivator extends Activator {
         List<LocaleMarker> markers = rightCollectMutable(InterMutableKey.Path);
         for (LocaleMarker marker : markers) {
             if (marker.match(LocaleScope.DESIGN)) {
-                Toolkit.addResource(marker.getPath());
+                DesignI18nImpl.getInstance().addResource(marker.getPath());
             }
         }
         designerModuleStart();