From 3511eae0c878c26ff6620ff1596140fcbdb143e3 Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Tue, 14 Aug 2018 10:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/start/server/ServerTray.java | 2 +- .../com/fr/design/actions/columnrow/DSColumnAdvancedAction.java | 2 +- .../main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java | 2 +- .../src/main/java/com/fr/design/dscolumn/DSColumnPane.java | 2 +- .../main/java/com/fr/design/dscolumn/ResultSetGroupPane.java | 2 +- .../src/main/java/com/fr/design/headerfooter/HFContainer.java | 2 +- .../java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/start/server/ServerTray.java b/designer-base/src/main/java/com/fr/start/server/ServerTray.java index 48dff7dd1e..ce2da0407d 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerTray.java +++ b/designer-base/src/main/java/com/fr/start/server/ServerTray.java @@ -52,7 +52,7 @@ public class ServerTray { }); startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start")); stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop")); - MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Exit")); + MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit")); //创建打开监听器 ActionListener startListener = new ActionListener() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java index 6a09e07aa8..c378ea3007 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java @@ -14,7 +14,7 @@ public class DSColumnAdvancedAction extends AbstractCellElementAction { public DSColumnAdvancedAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Advanced")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 2f791dd3f5..38de79701d 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -120,7 +120,7 @@ public class DSColumnAdvancedPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Advanced"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"); } public void populate(TemplateCellElement cellElement) { diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java index 63d6c216b2..cae7a5f514 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java @@ -104,7 +104,7 @@ public class DSColumnPane extends BasicPane { tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane); advancedPane = new DSColumnAdvancedPane(setting); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), advancedPane); this.setPreferredSize(new Dimension(610, 400)); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java index 0a685c9c0c..2097dfcfc3 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java @@ -31,7 +31,7 @@ public abstract class ResultSetGroupPane extends JPanel { protected UIComboBox groupComboBox; protected ResultSetGroupPane(){ - groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Advanced")}); + groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced")}); } abstract void populate(TemplateCellElement cellElement); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java index 84efb7d2db..577a0710b3 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java @@ -286,7 +286,7 @@ public class HFContainer extends JPanel implements Scrollable { int returnVal = JOptionPane.showConfirmDialog( SwingUtilities.getWindowAncestor(HFContainer.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Are_You_Sure_To_Delete_It") + "?", - com.fr.design.i18n.Toolkit.i18nText("Delete"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 9bb72fa168..2bf49b6e30 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -1072,7 +1072,7 @@ public class CellDSColumnEditor extends CellQuickEditor { textFieldPane.add(formulaTextField, BorderLayout.CENTER); textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); - formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "..."); + formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula") + "..."); formulaButton.setPreferredSize(new Dimension(20, formulaTextField.getPreferredSize().height)); formulaButton.addActionListener(formulaButtonActionListener);