From d6a35a2b782870d03e881b059146073911fdb371 Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Wed, 8 Aug 2018 22:12:50 +0800
Subject: [PATCH] modify on 0808

---
 .../design/chart/series/PlotSeries/MapGroupExtensionPane.java | 2 +-
 .../fr/design/chart/series/PlotSeries/MapImageEditPane.java   | 4 ++--
 .../chart/series/SeriesCondition/LineMarkerTypePane.java      | 4 ++--
 .../chart/gui/other/ChartDesignerInteractivePane.java         | 2 +-
 .../design/mainframe/chart/gui/style/ChartAxisLabelPane.java  | 2 +-
 .../mainframe/chart/gui/style/series/MeterSeriesPane.java     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

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 4cbdcc3ea..8099ec052 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
@@ -211,7 +211,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 	}
 
 	private JMenuItem createAreaItem(final String oldName) {
-		JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Filed"}));
+		JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Region"));
 		editFileItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				final MapCustomPane image = new MapCustomPane();
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
index df5d60c53..c06aa1c15 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java
@@ -630,13 +630,13 @@ public class MapImageEditPane extends BasicBeanPane<String> {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"});
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image");
 		}
 	}
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"});
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image");
 	}
 
 	/**
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java
index 6cd23585a..53e9429b4 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LineMarkerTypePane.java
@@ -28,7 +28,7 @@ public class LineMarkerTypePane extends ConditionAttrSingleConditionPane<DataSer
     public LineMarkerTypePane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
         super(conditionAttributesPane, isRemove);
 
-        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Marker", "FS_Report_Type"}));
+        nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type"));
         markerBox = new MarkerComboBox(MarkerFactory.getMarkerArray());
 
         if (isRemove) {
@@ -39,7 +39,7 @@ public class LineMarkerTypePane extends ConditionAttrSingleConditionPane<DataSer
 
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Marker", "FS_Report_Type"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type");
     }
 
     @Override
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
index 76a19f975..9dace34f7 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
@@ -36,7 +36,7 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"),
                 new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
         list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
-        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Interactive-chart"), null, null));
+        list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null));
 
         return list;
     }
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
index 00d7ecce8..ac5856fc4 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
@@ -81,7 +81,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
     }
 
     private void initComponents() {
-        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Label"));
+        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"));
         auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval"));
         custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval"));
         showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelInterval"),com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelWrap")});
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 84fa6751b..34c86a0dd 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
@@ -43,7 +43,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
     protected JPanel getContentInPlotType() {
         unit = new UITextField();
         angleMax = new UINumberDragPane(0, 360);
-        String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"),
+        String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_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")};
         order = new UIComboBox(orderUnit);
         colorPickerPane = createColorPickerPane();