From 79d212c06a2fcb791cc16164ff8293fec31d090a Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Tue, 31 Jul 2018 20:04:53 +0800
Subject: [PATCH] Merge pull request #283 in DESIGN/design from
 ~JU/design:release/10.0 to release/10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* commit '8166d5dd409c18c4fe90bc609744cff1801fc161':
  无JIRA任务 打包

Signed-off-by: Wim.Zhai <Wim.Zhai@fanruan.com>
---
 .../chart/series/SeriesCondition/LabelAxisPositionPane.java     | 2 +-
 .../fr/design/mainframe/chart/gui/other/ChartSwitchPane.java    | 2 +-
 .../chart/gui/style/axis/ChartSecondValueNoFormulaPane.java     | 2 +-
 .../fr/van/chart/designer/other/VanChartInteractivePane.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java
index 245573a0b..81ff63d59 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java
@@ -48,7 +48,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane<Data
 
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Owner", "time(s)", "ChartF-Axis"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MajorMinorAxis");
     }
 
     @Override
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java
index 09ca6a638..ce6e30e10 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java
@@ -34,7 +34,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{
 		JPanel pane = new JPanel();
 		pane.setLayout(new BorderLayout());
 		
-		changeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Switch"));
+		changeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch"));
 		
 		pane.add(changeButton, BorderLayout.NORTH);
 		
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java
index bdceb6f47..0c25011e4 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java
@@ -41,6 +41,6 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{
      * @return 第二值轴
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Second", "Chart_F_Radar_Axis"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondValueAxis");
     }
 }
\ No newline at end of file
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
index 08f908d09..1f8485592 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
@@ -122,7 +122,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget);
-        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomGesture"), zoomGesture);
+        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture);
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize},