Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @return 返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
 	}
 
 

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@@ -42,7 +42,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
 
 
         this.setLayout(new BorderLayout());

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartTableDataPane.java

@@ -47,7 +47,7 @@ public abstract class AbstractExtendedChartTableDataPane<T extends AbstractDataC
 
         if (hasFunction()) {
             function = new CalculateComboBox();
-            components[len] = new Component[]{new UILabel("function", SwingConstants.LEFT), function};
+            components[len] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method"), SwingConstants.LEFT), function};
         }
 
         double p = TableLayout.PREFERRED;