Merge pull request #790 in BA/design from ~MANGO/design:release to release

* commit '5719ba6531eada343b5a51540971e4d47c0137b2':
  修改国际化
  修改国际化
  还原冲突代码

designer_base/src/com/fr/design/locale/designer.properties

@@ -585,5 +585,9 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=AxisValue
+FR-Designer_Logarithmic=Logarithmic
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis
 FR-Designer_Too_Large_To_Paste=too large to paste
-FR-Designer_Too_Small_To_Paste=Too small to paste
+FR-Designer_Too_Small_To_Paste=Too small to paste

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -586,5 +586,9 @@ FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
 FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer_AxisReversed=Axis in reverse order
+FR-Designer_Logarithmic=Log scale
+FR-Designer_Chart_Log_Base=Log Base
+FR-Designer_Chart_F_Radar_Axis=Value Axis
 FR-Designer_Too_Large_To_Paste=Too large to paste!
-FR-Designer_Too_Small_To_Paste=Too small to paste!
+FR-Designer_Too_Small_To_Paste=Too small to paste!

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -541,7 +541,6 @@ FR-Designer_No=\u3044\u3044\u3048
 FR-Designer_Pagination=\u30DA\u30FC\u30B8\u30F3\u30B0
 FR-Designer_DS_TableData=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
 FR-Designer_Parameter-Formula=\u6570\u5F0F
-
 FR-Designer_Background_Null=\u80CC\u666F\u306A\u3057
 FR-Designer_Background_Color=\u8272
 FR-Designer_Background_Texture=\u67C4
@@ -557,4 +556,7 @@ FR-Designer-Move_Tab_First=\u30C8\u30C3\u30D7\u306B\u79FB\u3059
 FR-Designer-Move_Tab_End=\u6700\u5F8C\u306B\u79FB\u3059
 FR-Designer-Move_Tab_Next=\u5F8C\u308D\u306B\u79FB\u3059
 FR-Designer-Move_Tab_Prev=\u524D\u306B\u79FB\u3059
-
+FR-Designer_AxisReversed=\u8EF8\u9006\u914D\u5217
+FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -548,10 +548,12 @@ FR-Designer_Background_Clear=
 FR-Designer_Background_Image_Select=
 FR-Designer_Initial_Background_Tips=
 FR-Designer_Mouse_Move_Tips=
-
 FR-Designer_Mouse_Click_Tips=
 FR-Designer-Move_Tab_First=
 FR-Designer-Move_Tab_End=
 FR-Designer-Move_Tab_Next=
 FR-Designer-Move_Tab_Prev=
-
+FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
+FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
+FR-Designer_Chart_Log_Base=\uAE30\uC218
+FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -590,5 +590,9 @@ FR-Designer-Move_Tab_First=\u79FB\u52A8\u5230\u9996\u4F4D
 FR-Designer-Move_Tab_End=\u79FB\u52A8\u5230\u672B\u5C3E
 FR-Designer-Move_Tab_Next=\u5F80\u540E\u79FB\u52A8
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52A8
+FR-Designer_AxisReversed=\u8F74\u9006\u5E8F
+FR-Designer_Logarithmic=\u5BF9\u6570\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6570
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74
 FR-Designer_Too_Large_To_Paste=\u7EC4\u4EF6\u5927\u5C0F\u8D85\u51FA\u8FB9\u754C\uFF0C\u65E0\u6CD5\u7C98\u8D34\uFF01
 FR-Designer_Too_Small_To_Paste=\u6B64\u5904\u65E0\u6CD5\u7C98\u8D34\uFF0C\u5C0F\u4E8E\u7EC4\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -579,5 +579,9 @@ FR-Designer-Move_Tab_First=\u79FB\u52D5\u5230\u9996\u4F4D
 FR-Designer-Move_Tab_End=\u79FB\u52D5\u5230\u672B\u5C3E
 FR-Designer-Move_Tab_Next=\u5F80\u5F8C\u79FB\u52D5
 FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52D5
+FR-Designer_AxisReversed=\u8EF8\u9006\u5E8F
+FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
+FR-Designer_Chart_Log_Base=\u5E95\u6578
+FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8
 FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\uFF0C\u7121\u6CD5\u7C98\u8CBC\uFF01
-FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
+FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01

designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -42,14 +42,14 @@ public class MinMaxValuePane extends JPanel {
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		double[] columnSize = { p, f };
-		double[] rowSize = { p, p, p, p, p, p, p, p};
+		double[] rowSize = { p, p, p, p};
 
 		Component[][] components  = getPanelComponents();
 		JPanel panel = TableLayoutHelper.createTableLayoutPane(components ,rowSize,columnSize);
 		this.setLayout(new BorderLayout());
 		this.add(panel,BorderLayout.CENTER);
 
-		for(int i = 0; i < components.length; i+=2) {
+		for(int i = 0; i < components.length; i++) {
 			((UICheckBox)components[i][0]).addActionListener(new ActionListener() {
 
 				@Override
@@ -57,19 +57,15 @@ public class MinMaxValuePane extends JPanel {
 					checkBoxUse();
 				}
 			});
-			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i+1][0]);
+			ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i][1]);
 		}
 	}
 	protected Component[][] getPanelComponents() {
 		return 	new Component[][]{
-				new Component[]{minCheckBox},
-				new Component[]{minValueField},
-				new Component[]{maxCheckBox},
-				new Component[]{maxValueField},
-				new Component[]{isCustomMainUnitBox},
-				new Component[]{mainUnitField},
-				new Component[]{isCustomSecUnitBox},
-				new Component[]{secUnitField},
+				new Component[]{minCheckBox, minValueField},
+				new Component[]{maxCheckBox, maxValueField},
+				new Component[]{isCustomMainUnitBox, mainUnitField},
+				new Component[]{isCustomSecUnitBox, secUnitField},
 		};
 	}
 

designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java

@@ -72,7 +72,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
-        axisReversed = new UICheckBox(Inter.getLocText("AxisReversed"));
+        axisReversed = new UICheckBox(Inter.getLocText("FR-Designer_AxisReversed"));
         unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES);
         formatPane = new FormatPane();
         axisLabelPane = new ChartAxisLabelPane();
@@ -151,11 +151,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
 		double[] columnSize = { LayoutConstants.CHART_ATTR_TOMARGIN,p,f};
-		double[] rowSize = { p, p, p};
+		double[] rowSize = { p, p};
 		Component[][] component = new Component[][]{
 				new Component[]{null,initMinMaxValue(),null},
-				new Component[]{null, addLogarithmicPane2ValuePane(), null},
-				new Component[]{null, null, addLogText()},
+				new Component[]{null, addLogarithmicPane2ValuePane(), addLogText()},
 		};
 		return TableLayoutHelper.createTableLayoutPane(component, rowSize, columnSize);
 	}
@@ -172,8 +171,8 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 	// 返回对数相关界面. 百分比 没有此界面.
 	protected JPanel addLogarithmicPane2ValuePane() {
         JPanel labelLogPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
-        labelLogPane.add(logBox = new UICheckBox(Inter.getLocText("Logarithmic")+":"));
-        labelLogPane.add(new UILabel(Inter.getLocText("Chart_Log_Base")));
+        labelLogPane.add(logBox = new UICheckBox(Inter.getLocText("FR-Designer_Logarithmic")+":"));
+        labelLogPane.add(new UILabel(Inter.getLocText("FR-Designer_Chart_Log_Base")));
 
         logBaseField = new UITextField(4);
         logBaseField.setText("10");
@@ -222,7 +221,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
      * @return  返回标题.
 	 */
 	public String title4PopupWindow() {
-		return Inter.getLocText("Chart_F_Radar_Axis");
+		return Inter.getLocText("FR-Designer_Chart_F_Radar_Axis");
 	}
 	
 	@Override