Merge pull request #174 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit 'fe1b13b7404ac5b688a31d89130b2eb0875b86ea':
  无JIRA任务，国际化调整
  REPORT-8846 【10.0一轮回归】纸张背景不可导出，导出PDF还是会导出纸张背景

designer-base/src/com/fr/design/menu/KeySetUtils.java

@@ -592,7 +592,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return Inter.getLocText("M_Report-Report_Background");
+            return Inter.getLocText("Fine-Designer_Report_Background");
         }
 
         @Override

designer-realize/src/com/fr/design/report/ReportBackgroundPane.java

@@ -1,16 +1,18 @@
 package com.fr.design.report;
 
-import java.awt.BorderLayout;
+import com.fr.design.dialog.BasicPane;
-
-import com.fr.page.ReportSettingsProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
-import com.fr.general.Inter;
 import com.fr.design.style.background.BackgroundPane;
+import com.fr.general.Inter;
+import com.fr.page.ReportSettingsProvider;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 
 public class ReportBackgroundPane extends BasicPane {
     private UICheckBox isPrintBackgroundCheckBox;
+    private UICheckBox isExportBackgroundCheckBox;
     private BackgroundPane backgroundPane;
 
     public ReportBackgroundPane() {
@@ -19,14 +21,17 @@ public class ReportBackgroundPane extends BasicPane {
         backgroundPane = new BackgroundPane();
         this.add(backgroundPane, BorderLayout.CENTER);
 
-        isPrintBackgroundCheckBox = new UICheckBox(
+        isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Print_Background"));
-                Inter.getLocText("ReportGUI-Print_Background"));
+        isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Export_Background"));
-        this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH);
+        JPanel sourth = new JPanel();
+        sourth.add(isExportBackgroundCheckBox);
+        sourth.add(isPrintBackgroundCheckBox);
+        this.add(sourth, BorderLayout.SOUTH);
     }
     
     @Override
     protected String title4PopupWindow() {
-    	return Inter.getLocText(new String[]{"paper", "Background"});
+    	return Inter.getLocText("Fine-Designer_Report_Background");
     }
 
     /**
@@ -35,6 +40,7 @@ public class ReportBackgroundPane extends BasicPane {
     public void populate(ReportSettingsProvider reportSettings) {
         this.backgroundPane.populate(reportSettings.getBackground());
         this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground());
+        this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground());
     }
 
     /**
@@ -43,5 +49,6 @@ public class ReportBackgroundPane extends BasicPane {
     public void update(ReportSettingsProvider reportSettings) {
         reportSettings.setBackground(this.backgroundPane.update());
         reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected());
+        reportSettings.setExportBackground(this.isExportBackgroundCheckBox.isSelected());
     }
 }