diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java index f15f46d9c..4c6aa108c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java @@ -327,7 +327,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private void showRenameWaring(String newName){ - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index ce89dfd24..3542ea6e6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -44,7 +44,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), - com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java index 72e89d6c7..75b274c7d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java @@ -49,7 +49,7 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = { p,f }; double[] rowSize = { p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("UpBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), upBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor}, @@ -102,4 +102,4 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 1d6711414..cadc4af75 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -73,7 +73,7 @@ public class XNumberEditor extends XWrapperedFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Verify-Message")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java index 193fca4dc..c28f3d0ef 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java @@ -52,9 +52,9 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("X-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_X_Coordinate"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Y_Coordinate"); case 2: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java index efd9f9a50..9f6f59e34 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java @@ -29,7 +29,7 @@ public class VerticalBoxProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("VerticalBoxLayout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Box_Layout_Duplicate"); } @Override @@ -99,4 +99,4 @@ public class VerticalBoxProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java index a6f0e6af3..6b5996816 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java @@ -23,7 +23,7 @@ public class VerticalSplitProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Vertical-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Split_Layout"); } @Override @@ -102,4 +102,4 @@ public class VerticalSplitProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 617bfb4bc..3ef7a3961 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -604,7 +604,7 @@ public class FormDesigner extends TargetComponent