diff --git a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
index 1bf8a2f569..b6c10578a7 100644
--- a/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
+++ b/designer/src/com/fr/design/cell/editor/RichTextToolBar.java
@@ -81,7 +81,7 @@ public class RichTextToolBar extends BasicPane{
     private void initAllButton(){
         fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
         fontNameComboBox.setPreferredSize(new Dimension(144, 20));
-        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(FRFontPane.getFontSizes());
 		colorSelectPane = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
 		colorSelectPane.set4Toolbar();
         
diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java
index f0dc742c0f..58a5ef3731 100644
--- a/designer_base/src/com/fr/design/DesignerEnvManager.java
+++ b/designer_base/src/com/fr/design/DesignerEnvManager.java
@@ -131,6 +131,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * DesignerEnvManager.
      */
     public static DesignerEnvManager getEnvManager() {
+        return getEnvManager(true);
+    }
+
+    public static DesignerEnvManager getEnvManager(boolean needCheckEnv) {
         if (designerEnvManager == null) {
             designerEnvManager = new DesignerEnvManager();
             try {
@@ -140,15 +144,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             }
 
             // james：如果没有env定义，要设置一个默认的
-            if (designerEnvManager.nameEnvMap.size() <= 0) {
-                String installHome = StableUtils.getInstallHome();
-                if (installHome != null) {
-                    String name = Inter.getLocText("Default");
-                    String envPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
-                    designerEnvManager.putEnv(name, LocalEnv.createEnv(envPath));
-                    designerEnvManager.setCurEnvName(name);
-                }
+            if (needCheckEnv) {
+                checkNameEnvMap();
             }
+
         }
 
         GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@@ -163,6 +162,20 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         return designerEnvManager;
     }
 
+    public static void checkNameEnvMap() {
+        if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
+            return;
+        }
+        String installHome = StableUtils.getInstallHome();
+        if (installHome != null) {
+            String name = Inter.getLocText("FR-Engine_DEFAULT");
+            String envPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
+            designerEnvManager.putEnv(name, LocalEnv.createEnv(envPath));
+            designerEnvManager.setCurEnvName(name);
+        }
+    }
+
+
     /**
      * 添加设计器中相关的worker
      *
diff --git a/designer_base/src/com/fr/design/data/DesignTableDataManager.java b/designer_base/src/com/fr/design/data/DesignTableDataManager.java
index 5248c9626a..17afec4717 100644
--- a/designer_base/src/com/fr/design/data/DesignTableDataManager.java
+++ b/designer_base/src/com/fr/design/data/DesignTableDataManager.java
@@ -6,19 +6,24 @@ import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.core.DataCoreXmlUtils;
-import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.data.impl.EmbeddedTableData;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.impl.storeproc.StoreProcedureConstants;
-import com.fr.design.data.tabledata.wrapper.*;
 import com.fr.design.DesignModelAdapter;
+import com.fr.design.data.datapane.preview.PreviewTablePane;
+import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper;
+import com.fr.design.data.tabledata.wrapper.StoreProcedureDataWrapper;
+import com.fr.design.data.tabledata.wrapper.StoreProcedureNameWrapper;
+import com.fr.design.data.tabledata.wrapper.TableDataFactory;
+import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.parameter.ParameterInputPane;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.general.ComparatorUtils;
@@ -34,9 +39,16 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.io.ByteArrayOutputStream;
 import java.text.Collator;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * 设计器管理操作数据集的类:
@@ -55,11 +67,11 @@ public abstract class DesignTableDataManager {
      * 其实globalDsCache没有绝对的必要，只是为了操作方便。如果没有它，那么每次清空服务器数据集或者存储过程的时候，还要去遍历找一下，
      * 这个操作可能比较复杂 。 从减少代码复杂度的角度看，还是很有必要的
      */
-    private static java.util.Map<String, TableDataWrapper> globalDsCache = new ConcurrentHashMap<String, TableDataWrapper>();
-    private static java.util.Map<String, String> dsNameChangedMap = new ConcurrentHashMap<String, String>();
+    private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
+    private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
 //    private static List<ChangeListener> dsListeners = new ArrayList<ChangeListener>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<String, List<ChangeListener>>();;
+    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
 
 
     public static String NO_PARAMETER = "no_paramater_pane";
@@ -352,7 +364,20 @@ public abstract class DesignTableDataManager {
      * @throws Exception 异常
      */
     public static EmbeddedTableData previewTableDataNeedInputParameters(TableData tabledata, int rowCount, boolean needLoadingBar) throws Exception {
-        return previewTableData(tabledata, rowCount, true, needLoadingBar);
+        return previewTableData(null, tabledata, rowCount, true, needLoadingBar);
+    }
+
+    /**
+     * 预览需要参数的数据集
+     *
+     * @param tabledata      数据集
+     * @param rowCount       需要预览的行数
+     * @param needLoadingBar 是否需要加载进度条
+     * @return 数据集
+     * @throws Exception 异常
+     */
+    public static EmbeddedTableData previewTableDataNeedInputParameters(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean needLoadingBar) throws Exception {
+        return previewTableData(tableDataSource, tabledata, rowCount, true, needLoadingBar);
     }
 
     /**
@@ -365,7 +390,20 @@ public abstract class DesignTableDataManager {
      * @throws Exception 异常
      */
     public static EmbeddedTableData previewTableDataNotNeedInputParameters(TableData tabledata, int rowCount, boolean needLoadingBar) throws Exception {
-        return previewTableData(tabledata, rowCount, false, needLoadingBar);
+        return previewTableData(null, tabledata, rowCount, false, needLoadingBar);
+    }
+
+    /**
+     * 预览不需要参数的数据集
+     *
+     * @param tabledata      数据集
+     * @param rowCount       需要预览的行数
+     * @param needLoadingBar 是否需要加载进度条
+     * @return 数据集
+     * @throws Exception 异常
+     */
+    public static EmbeddedTableData previewTableDataNotNeedInputParameters(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean needLoadingBar) throws Exception {
+        return previewTableData(tableDataSource, tabledata, rowCount, false, needLoadingBar);
     }
 
     /**
@@ -377,7 +415,7 @@ public abstract class DesignTableDataManager {
      *                              而获取数据集的字段名字时，则没必要
      * @return
      */
-    private static EmbeddedTableData previewTableData(TableData tabledata, int rowCount, boolean isMustInputParameters, boolean needLoadingBar) throws Exception {
+    private static EmbeddedTableData previewTableData(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean isMustInputParameters, boolean needLoadingBar) throws Exception {
         final AutoProgressBar loadingBar = PreviewTablePane.getInstance().getProgressBar();
         Env currentEnv = FRContext.getCurrentEnv();
         ParameterProvider[] parameters = currentEnv.getTableDataParameters(tabledata);
@@ -407,7 +445,7 @@ public abstract class DesignTableDataManager {
                     parameter.setValue(parameterMap.get(parameter.getName()));
                 }
             }
-            return currentEnv.previewTableData(tabledata, parameterMap, rowCount);
+            return currentEnv.previewTableData(tableDataSource, tabledata, parameterMap, rowCount);
         } catch (TableDataException e) {
             throw new TableDataException(e.getMessage(), e);
         } finally {
diff --git a/designer_base/src/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer_base/src/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
index 23b62431ec..0377f0bd4a 100644
--- a/designer_base/src/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java
@@ -1,6 +1,8 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.BaseUtils;
+import com.fr.data.impl.AbstractDatabaseConnection;
+import com.fr.data.impl.Connection;
 import com.fr.design.constants.UIConstants;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.design.border.UIRoundedBorder;
@@ -20,6 +22,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.List;
 
 /**
  * 数据集编辑面板左边的部分
@@ -39,6 +42,12 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	public ConnectionTableProcedurePane() {
 		this.setLayout(new BorderLayout(4, 4));
 		connectionComboBox = new ConnectionComboBoxPanel(com.fr.data.impl.Connection.class) {
+
+			@Override
+			protected void filterConnection(Connection connection, String conName, List<String> nameList) {
+				filter(connection, conName, nameList);
+			}
+
 			protected void refreshItems() {
 				super.refreshItems();
 				if (tableViewList != null) {
@@ -83,6 +92,10 @@ public class ConnectionTableProcedurePane extends BasicPane {
 		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
 	}
 
+	protected void filter(Connection connection, String conName, List<String> nameList) {
+		connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
+	}
+
 	protected JPanel createCheckBoxgroupPane() {
 		JPanel checkBoxgroupPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
 		JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
diff --git a/designer_base/src/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer_base/src/com/fr/design/data/datapane/preview/PreviewTablePane.java
index 28e421b542..71e10728bd 100644
--- a/designer_base/src/com/fr/design/data/datapane/preview/PreviewTablePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/preview/PreviewTablePane.java
@@ -6,6 +6,7 @@ package com.fr.design.data.datapane.preview;
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.TableData;
+import com.fr.data.TableDataSource;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.EmbeddedTableData;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
@@ -13,6 +14,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.AutoProgressBar;
@@ -362,7 +364,8 @@ public class PreviewTablePane extends BasicPane {
                     }
                 }
                 connectionBar.close();
-                previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(tableData, (int) maxPreviewNumberField.getValue(), true);
+                TableDataSource dataSource = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getTarget();
+                previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, tableData, (int) maxPreviewNumberField.getValue(), true);
                 // parameterInputDialog
                 // update之后的parameters,转成一个parameterMap,用于预览TableData
                 PreviewTableModel previewModel = new PreviewTableModel(previewTableData.createDataModel(null), (int) maxPreviewNumberField.getValue());
diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
index 75b3219ebd..947e17106b 100644
--- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@@ -5,7 +5,11 @@ import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.data.core.db.TableProcedure;
+import com.fr.data.impl.AbstractDatabaseConnection;
+import com.fr.data.impl.Connection;
 import com.fr.data.impl.DBTableData;
+import com.fr.data.impl.JDBCDatabaseConnection;
+import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
@@ -37,6 +41,7 @@ import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
+import org.sqlite.JDBC;
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
@@ -102,7 +107,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		sqlSplitPane.add(box, BorderLayout.CENTER);
 
 		// 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table
-		connectionTableProcedurePane = new ConnectionTableProcedurePane();
+		connectionTableProcedurePane = new ConnectionTableProcedurePane() {
+			@Override
+			protected void filter(Connection connection, String conName, List<String> nameList) {
+				connection.addConnection(nameList, conName, new Class[]{JDBCDatabaseConnection.class, JNDIDatabaseConnection.class});
+			}
+		};
 		connectionTableProcedurePane.addDoubleClickListener(new DoubleClickSelectedNodeOnTreeListener() {
 
 			@Override
@@ -138,6 +148,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		this.add(mainSplitPane, BorderLayout.CENTER);
 	}
 
+
 	private boolean isPreviewOrRefreshButton (FocusEvent e) {
 		if (e.getOppositeComponent() != null) {
 			String name = e.getOppositeComponent().getName();
diff --git a/designer_base/src/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java b/designer_base/src/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
index 90e2adfab7..17d42b0e15 100644
--- a/designer_base/src/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
+++ b/designer_base/src/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
@@ -58,7 +58,7 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
 		
 		EmbeddedTableData embeddedTableData = null;
 		try {
-			embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tabledata, TableData.RESULT_NOT_NEED, false);
+			embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tds, tabledata, TableData.RESULT_NOT_NEED, false);
 		} catch (Exception e) {
             if (e.getMessage()!=null) {
                 DesignUtils.errorMessage(e.getMessage());
diff --git a/designer_base/src/com/fr/design/gui/style/FRFontPane.java b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
index 2dafb005dc..54abdd54be 100644
--- a/designer_base/src/com/fr/design/gui/style/FRFontPane.java
+++ b/designer_base/src/com/fr/design/gui/style/FRFontPane.java
@@ -7,6 +7,7 @@ package com.fr.design.gui.style;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Vector;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -37,8 +38,11 @@ import com.fr.design.utils.gui.GUICoreUtils;
  * Pane to edit Font.
  */
 public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObserver {
+    @Deprecated //发布的图表插件用到，8.0就先留着吧。9.0就可以删掉了。
     public static Integer[] FONT_SIZES = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16),
             new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)};
+
+    private static final int MAX_FONT_SIZE = 100;
     private static final Dimension BUTTON_SIZE = new Dimension(24, 20);
     private JPanel buttonPane;
     private JPanel isSuperOrSubPane;
@@ -212,10 +216,18 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         return style.deriveFRFont(frFont);
     }
 
+    public static Vector<Integer> getFontSizes() {
+        Vector<Integer> FONT_SIZES = new Vector<Integer>();
+        for (int i = 1; i < MAX_FONT_SIZE; i++) {
+            FONT_SIZES.add(i);
+        }
+        return FONT_SIZES;
+    }
+
     protected void initComponents() {
         fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
         fontNameComboBox.setPreferredSize(new Dimension(144, 20));
-        fontSizeComboBox = new UIComboBox(FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(getFontSizes());
         this.underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY);
         colorSelectPane = new UIColorButton();
         bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties
index 7fb65a8282..7e96574d4c 100644
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=
 FR-Designer-BBSLogin_Connection-Failure=
-FR-Designer-BBSLogin_Connection-Failure-Tip=
 FR-Designer-BBSLogin_Forgot-Password=
 FR-Designer-BBSLogin_Login=
 FR-Designer-BBSLogin_Login-Failure-Tip=
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=
 FR-Designer-BBSLogin_Register-Account=
 FR-Designer-BBSLogin_Switch-Account=
 FR-Designer-BBSLogin_Privite-Message=
-FR-Designer-BBSLogin_Times=
 FR-Designer-BBSLogin_Username-Empty-Tip=
 FR-Designer-Basic_More_Color=More colors
 FR-Designer-Estate_Any=
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=
 FR-Designer-Output_Excel_Sheet=
 FR-Designer-Output_Excel_Simple=
 FR-Designer-Plugin_PluginMarket_Coding=
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=
-FR-Desinger-Plugin_Updater_Checking_Version_Update=
-FR-Desinger-Plugin_Updater_Update=
-FR-Desinger-Plugin_Updater_Upgrade=
-FR-Desinger-Plugin_Updater_Restore=
-FR-Desinger-Plugin_Updater_New_Version_Available=
-FR-Desinger-Plugin_Updater_JarUpdate=
-FR-Desinger-Plugin_Updater_VersionUpgrade=
-FR-Desinger-Plugin_Updater_Previous_Version=
-FR-Desinger-Plugin_Updater_Current_Version=
-FR-Desinger-Plugin_Updater_Not_Install_Version=
-FR-Desinger-Plugin_Updater_Latest_Version=
-FR-Desinger-Plugin_Updater_Jar_Downloading=
-FR-Desinger-Plugin_Updater_Version_Downloading=
-FR-Desinger-Plugin_Updater_Restart_Designer=
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=
-FR-Desinger-Plugin_Updater_Already_Latest_Version=
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=
-FR-Desinger-Plugin_Updater_Please_Restart=
-FR-Desinger-Plugin_Updater_Jar_Restore=
-FR-Desinger-Plugin_Updater_Version_Restore=
-FR-Desinger-Plugin_Updater_Restore_To=
-FR-Desinger-Plugin_Updater_WorksAfterRestart=
 FR-Designer-Submit_Condition=
-FR-Designer-Widget-Title_border=
-FR-Designer-Widget-Title_border_color=
 FR-Designer_AbsoluteLayout=
 FR-Designer_Allow_Decimals=
 FR-Designer_Allow_Negative=
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=
 FR-Designer_Button-Icon=
 FR-Designer_Button-Name=
 FR-Designer_Button-Type=
-FR-Designer_CardLayout=
 FR-Designer_Cell=
 FR-Designer_Chart_Cell=
 FR-Designer_Chart_Float=
 FR-Designer_Chart_Float_chart=
-FR-Designer_Check-for-Updates=
 FR-Designer_Choose-Data-Confusion-Tip=
 FR-Designer_Close=
 FR-Designer_Column=
 FR-Designer_Column_Measure=
 FR-Designer_Condition_Attributes=
-FR-Designer_Confusion-Col-Name=
 FR-Designer_Confusion-key=
 FR-Designer_Currency_Line=
 FR-Designer_Current_tab=
@@ -100,7 +68,6 @@ FR-Designer_File=File
 FR-Designer_Filter_Conditions=Filter Conditions
 FR-Designer_Finish-Modify-Share=
 FR-Designer_Fit=
-FR-Designer_Fit-App=
 FR-Designer_Font-Family=
 FR-Designer_Font-Size=
 FR-Designer_Forbid_Drag_into_Adapt_Pane=Forbid Drag into Para Pane
@@ -130,15 +97,12 @@ FR-Designer_Layout_Constraints=
 FR-Designer_Length=
 FR-Designer_Loading_Data=
 FR-Designer_M-Exit=
-FR-Designer_M-Help=
 FR-Designer_M-Insert=
 FR-Designer_M-Repeat-Freeze=
 FR-Designer_M-Server=
 FR-Designer_M-SwitchWorkspace=
 FR-Designer_M-Template=
 FR-Designer_MDX_Explain=
-FR-Designer_M_Help-About_Software=
-FR-Designer_M_Help-Tutorial=
 FR-Designer_Max_Value=
 FR-Designer_Min_Value=
 FR-Designer_MobilePhone=
@@ -154,7 +118,6 @@ FR-Designer_PostCode=
 FR-Designer_Present=Present
 FR-Designer_Preview=Preview
 FR-Designer_Preview-Data-Confusion=
-FR-Designer_Product_Demo=
 FR-Designer_Query_Type=
 FR-Designer_Refresh=Refresh
 FR-Designer_Refresh_Parameter_In_SQL=
@@ -176,15 +139,12 @@ FR-Designer_Song_TypeFace=Song TypeFace
 FR-Designer_Start-Date=
 FR-Designer_Subscript=
 FR-Designer_Superscript=
-FR-Designer_Support_QQ=
 FR-Designer_Swatch=
-FR-Designer_Tab_title=
 FR-Designer_TableData=
 FR-Designer_Thank_guest=
 FR-Designer_Thanks-To=
 FR-Designer_Title=
 FR-Designer_Total=Total
-FR-Designer_UnSignIn=
 FR-Designer_Underline=
 FR-Designer_Used=
 FR-Designer_User-defined-MDX=
@@ -202,7 +162,6 @@ FR-Designer_XMLA_Explain=
 FR-Designer_bold=
 FR-Designer_font=
 FR-Designer_italic=
-FR-Designer_product_feedback=
 FR-Designer_XMLA=
 FR-Designer-StyleAlignment_Layout_Default=Default
 FR-Designer-StyleAlignment_Layout_Image_Titled=Titled
@@ -236,7 +195,6 @@ FR-Designer_Save_Path=
 FR-Designer_Chart_Acc_Set=Chart_Acc_Set
 FR-Designer_Gradient-Color=Gradient Color
 FR-Designer_DEFAULT=DEFAULT
-FR-Designer_chart-PreStyle=Chart PreStyle
 FR-Designer_Chart-PreStyle=Chart PreStyle
 FR-Designer_Already_exist=
 FR-Designer_Database=Database
@@ -357,7 +315,6 @@ FR-Designer_KeyPoint=KeyPoint
 FR-Designer_loadedTreeModel=loadedTreeModel
 FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\:
 FR-Designer-Plugin_Please_Update_Jar=
-FR-Designer-Invalid_Page_Number=Invalid Page Number
 FR-Designer_XMLA_Database=Database
 FR-Designer_XMLA_UserName=User name
 FR-Designer_XMLA_Password=Password
@@ -379,7 +336,6 @@ FR-Designer_Clear_All=
 FR-Designer_Log=
 FR-Designer-Plugin_Expire_Dialog_Title=Plug expired
 FR-Designer-Plugin_Expire_Dialog_Text=Plugin expired, go sail soft application center to make a purchase.
-FR-Designer-Plugin_Finerest_Addon=Fineres Addon
 FR-Designer_Performance_First=
 FR-Designer_Total_N_Grade=Total-N-Grade
 FR-Designer-BBSLogin_Login-Title=
@@ -415,7 +371,6 @@ FR-Designer_Current_Preview_Rows=
 FR-Designer_Data=Data
 FR-Designer_Error=Error
 FR-Designer_formDesignerModule=
-FR-Designer-Website_Url=
 FR-Designer-BBSLogin_Download-Unlogin-Tip=
 FR-Designer-App_ReLayout=AppRelayout
 FR-Designer_Mobile-Attr=
@@ -431,24 +386,17 @@ FR-Designer_COMMUNITY_BUG=
 FR-Designer_COMMUNITY_SIGN=
 FR-Designer_COMMUNITY_QUESTIONS=
 FR-Designer_Mobile-Zoom=
-FR-Designer_Mobile-Open=
 FR-Designer_Mobile-Warning=
-FR-Designer_Button-OK=OK
-FR-Designer_Button-Cancel=Cancel
 FR-Designer_Write-Save-Formula=
 FR-Designer_Export-Save-Formula=
 FR-Designer_Form-Fit-Tip=
 FR-Designer_Form-Frozen-Tip=
 FR-Designer_Form-Forzen-Speed=
 FR-Designer_Attention=
-FR-Designer_Forbid_Widgets_Intersects=
 FR-Designer_Widget_Scaling_Mode_Fit=
 FR-Designer_Widget_Scaling_Mode_Fixed=
 FR-Designer-Widget_Area_Scaling=
 FR-Designer-Widget_Scaling_Mode=
-FR-Designer-QQLogin-Determine=
-FR-Designer-QQLogin-Cancel=
-FR-Designer-Reuse_Manager=Reuse Manager
 FR-Designer_TableData-Default-Para=Default Para
 FR-Designer_Layout_Block_Absolute=Absolute Layout Block
 FR-Designer_Layout_Block_Tab=Tab Layout
@@ -460,9 +408,6 @@ FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional Adaptive
 FR-Designer-Selected_Widget=
 FR-Designer_LocalWidget=
 FR-Designer_AllCategories=
-FR-Designer_SimpleDetail_Report=
-FR-Designer_SimpleCross_Report=
-FR-Designer_DoubleLayer_Report=
 FR-Designer_Download_Template=
 FR-Designer_Install_Template=
 FR-Designer_Delete_Template=
@@ -523,11 +468,6 @@ FR-Designer_FormulaPane_Search=Search
 FR-Designer_Tab_carousel=
 FR-Designer_setCarousel=
 FR-Designer_carouselInterval=
-FR-Designer_ClassName_panel=ClassName
-FR-Designer_Description_panel=Description
-FR-Designer_Edit_panel=Edit
-FR-Designer_Property_panel=Property
-FR-Designer_Select_panel=Select
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=Set BG of the row being edited
 FR-Designer_Unload_Check=Prompt users when leave  without submitting
@@ -592,7 +532,6 @@ FR-Designer_Background-Pattern=Pattern
 FR-Designer_Properties_Mobile=
 FR-Designer_Edit_Button_ToolBar=
 FR-Designer_Remove_Button_ToolBar=
-FR-Designer_Get-CubeGetting=
 FR-Designer_Oracle=
 FR-Designer_Validate=
 CellWrite-InsertRow_NULL=Null
@@ -936,7 +875,6 @@ Day=Day
 External=External
 Black_Font=Black Font
 LOG-Report_Server_IS_Started=Report Server is Started
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
 FR-Designer_ChooseOneButton=chose one toolbutton
 Widget-Sizing=Sizing
 NO_Border_Line=NO Border Line
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=Use disk cache when records more than
 BorderLayout-South=South
 Export-Text=Text
 JavaScript-Synch=Synch
-FR-App-All_Warning=
 M_Edit-Send_Backward=Send to Backward
 Form-Layout=Layout
 FR-Designer-Plugin_Shop_Need_Update=
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=Plugin need dependence support,need to instal
 Delay=Delay
 FR-Designer-All_MSBold=
 Utils-Now_create_connection=Connecting to database
-FR-Template-Path_chooseRightPath=
 FR-Remote_Re_Connect_to_Server=
 Nation=Nation
 DBCP_MAX_WAIT=MaxWait
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=Insert Slope Line
 FR-Designer-Plugin_Plugin_Description=Description
 ExpandD-Not_Expand=Not to Insert Cell to Display Data
 Utils-Bottom_to_Top=Bottom to Top
-Collect-Click\!_Get_user_information_code=Click\! Get user information code
 FR-Already_exist=
 Send=Send
 M_Edit-Clear_All=All
@@ -1996,7 +1931,6 @@ FR-Designer_Parameter=
 FR-Designer-Plugin_Plugin=Plugin
 FR-Designer_Background=Background
 Template=Template
-
 FR-Designer_Parent_Marked_Field=Parent Marked Field
 FR-Designer_Original_Marked_Filed=Original Marked Filed
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
@@ -2009,3 +1943,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
 FR-Designer_Provide_Choose_All=Provide Select All
 FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load resource file
+
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index e4925190d6..2ca39665a6 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=User name
 FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status
-FR-Designer-BBSLogin_Connection-Failure-Tip=Tip
 FR-Designer-BBSLogin_Forgot-Password=Forget Password
 FR-Designer-BBSLogin_Login=Login
 FR-Designer-BBSLogin_Login-Failure-Tip=Incorrect username or password! please try again
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=Password can not be null
 FR-Designer-BBSLogin_Register-Account=Register Account
 FR-Designer-BBSLogin_Switch-Account=Switch Account
 FR-Designer-BBSLogin_Privite-Message=Private Message
-FR-Designer-BBSLogin_Times=times
 FR-Designer-BBSLogin_Username-Empty-Tip=User name can not be null
 FR-Designer-Basic_More_Color=More colors
 FR-Designer-Estate_Any=Any
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=Excel Export(page break)
 FR-Designer-Output_Excel_Sheet=Excel Export(one page per sheet)
 FR-Designer-Output_Excel_Simple=Excel Export(original)
 FR-Designer-Plugin_PluginMarket_Coding=Plugin store is developing, stay tuned
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=Update&Upgrade
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=Checking JARpackage update
-FR-Desinger-Plugin_Updater_Checking_Version_Update=Checking version update
-FR-Desinger-Plugin_Updater_Update=update
-FR-Desinger-Plugin_Updater_Upgrade=upgrade
-FR-Desinger-Plugin_Updater_Restore=restore
-FR-Desinger-Plugin_Updater_New_Version_Available=New version available
-FR-Desinger-Plugin_Updater_JarUpdate=Jar pack Update:
-FR-Desinger-Plugin_Updater_VersionUpgrade=Version Upgrade:
-FR-Desinger-Plugin_Updater_Previous_Version=to previous version?
-FR-Desinger-Plugin_Updater_Current_Version=to current version
-FR-Desinger-Plugin_Updater_Not_Install_Version=not install version
-FR-Desinger-Plugin_Updater_Latest_Version=latest version
-FR-Desinger-Plugin_Updater_Jar_Downloading=Jar package is downloading
-FR-Desinger-Plugin_Updater_Version_Downloading=New version is downloading
-FR-Desinger-Plugin_Updater_Restart_Designer=Restart designer
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=Cannot connect to version-update-server
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=Cannot connect to version-upgrade-server
-FR-Desinger-Plugin_Updater_Already_Latest_Version=This is the latest version
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=Already backup the old jar package to:
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=Already backup the old version package to:
-FR-Desinger-Plugin_Updater_Please_Restart=,restart designer
-FR-Desinger-Plugin_Updater_Jar_Restore=Jar package restore
-FR-Desinger-Plugin_Updater_Version_Restore=Version restore
-FR-Desinger-Plugin_Updater_Restore_To=Restore to
-FR-Desinger-Plugin_Updater_WorksAfterRestart=version, take effect after restart
 FR-Designer-Submit_Condition=Condition
-FR-Designer-Widget-Title_border=Border
-FR-Designer-Widget-Title_border_color=Color
 FR-Designer_AbsoluteLayout=Absolute Layout
 FR-Designer_Allow_Decimals=allow decimals
 FR-Designer_Allow_Negative=allow negative
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=Hotkeys
 FR-Designer_Button-Icon=Button Icon
 FR-Designer_Button-Name=Button Name
 FR-Designer_Button-Type=Button Type
-FR-Designer_CardLayout=TabLayout
 FR-Designer_Cell=cell
 FR-Designer_Chart_Cell=Chart Hyperlink-Link Cell
 FR-Designer_Chart_Float=Chart Hyperlink-Floating Element
 FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating Chart
-FR-Designer_Check-for-Updates=Check for Updates
 FR-Designer_Choose-Data-Confusion-Tip=\ Please Choose the field needed to be confused and then preview
 FR-Designer_Close=close
 FR-Designer_Column=column
 FR-Designer_Column_Measure=Column axis/measure
 FR-Designer_Condition_Attributes=Condition attributes
-FR-Designer_Confusion-Col-Name=Field Name
 FR-Designer_Confusion-key=Confusion Key
 FR-Designer_Currency_Line=currency line
 FR-Designer_Current_tab=Current tab
@@ -99,7 +67,6 @@ FR-Designer_FS_Close_Other_Templates=Close other templates
 FR-Designer_File=File
 FR-Designer_Filter_Conditions=Filter Conditions
 FR-Designer_Finish-Modify-Share=Finish Modification And Share
-FR-Designer_Fit-App=App self-adaption
 FR-Designer_Fit=self-adaption
 FR-Designer_Font-Family=Font name
 FR-Designer_Font-Size=Font size
@@ -130,15 +97,12 @@ FR-Designer_Layout_Constraints=Layout Constraints
 FR-Designer_Length=Length
 FR-Designer_Loading_Data=Loading Data
 FR-Designer_M-Exit=Exit
-FR-Designer_M-Help=Help
 FR-Designer_M-Insert=Insert
 FR-Designer_M-Repeat-Freeze=Duplicate and freeze
 FR-Designer_M-Server=Server
 FR-Designer_M-SwitchWorkspace=Switch Working Directory
 FR-Designer_M-Template=Template
 FR-Designer_MDX_Explain=Syntax Reference MDX syntax.\nFor example\:\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\nNOTE\: COLUMNS, ROWS can be replaced by 0,1, the query axis only supports returning two axis
-FR-Designer_M_Help-About_Software=About software
-FR-Designer_M_Help-Tutorial=Help tutorial
 FR-Designer_Max_Value=max value
 FR-Designer_Min_Value=min value
 FR-Designer_MobilePhone=Mobile phone
@@ -154,7 +118,6 @@ FR-Designer_PostCode=Postcode
 FR-Designer_Present=Present
 FR-Designer_Preview=Preview
 FR-Designer_Preview-Data-Confusion=Preview Data After Confusion
-FR-Designer_Product_Demo=Demo
 FR-Designer_Query_Type=Query type
 FR-Designer_Refresh=Refresh
 FR-Designer_Refresh_Parameter_In_SQL=Whether to refresh parameters in the SQL
@@ -176,15 +139,12 @@ FR-Designer_Song_TypeFace=Song TypeFace
 FR-Designer_Start-Date=Start Date
 FR-Designer_Subscript=Subscript
 FR-Designer_Superscript=Superscript
-FR-Designer_Support_QQ=Support online
 FR-Designer_Swatch=Sample
-FR-Designer_Tab_title=Tab title
 FR-Designer_TableData=Data set
 FR-Designer_Thank_guest=Special thanks to
 FR-Designer_Thanks-To=Thanks To
 FR-Designer_Title=Title
 FR-Designer_Total=Total
-FR-Designer_UnSignIn=Not Sign In
 FR-Designer_Underline=Underline
 FR-Designer_Used=Recently Used
 FR-Designer_User-defined-MDX=Custom MDX query
@@ -202,7 +162,6 @@ FR-Designer_XMLA_Explain=Before using the cube access data, you need a successfu
 FR-Designer_bold=Bold
 FR-Designer_font=Font
 FR-Designer_italic=Italic
-FR-Designer_product_feedback=Product feedback
 FR-Designer_XMLA=Multi-dimensional DB
 FR-Designer-StyleAlignment_Layout_Default=Default
 FR-Designer-StyleAlignment_Layout_Image_Titled=Tile
@@ -230,7 +189,6 @@ FR-Designer-Collect_Information_Successfully=Collect Successfully
 FR-Designer_Chart_Acc_Set=Acc
 FR-Designer_Gradient-Color=Gradient
 FR-Designer_DEFAULT=DEFAULT
-FR-Designer_chart-PreStyle=Chart PreStyle
 FR-Designer_Chart-PreStyle=Chart PreStyle
 FR-Designer_Already_exist=Already Exist
 FR-Designer_Database=DB
@@ -357,7 +315,6 @@ FR-Designer_KeyPoint=KeyPoint
 FR-Designer_loadedTreeModel=loadedTreeModel
 FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\:
 FR-Designer-Plugin_Please_Update_Jar=Please Update Jar To\:
-FR-Designer-Invalid_Page_Number=Invalid Page Number
 FR-Designer_XMLA_Database=DB
 FR-Designer_XMLA_UserName=User name
 FR-Designer_XMLA_Password=Password
@@ -379,7 +336,6 @@ FR-Designer_Clear_All=Clear All
 FR-Designer_Log=Log
 FR-Designer-Plugin_Expire_Dialog_Title=Plug expired
 FR-Designer-Plugin_Expire_Dialog_Text=Plugin expired, go sail soft application center to make a purchase.
-FR-Designer-Plugin_Finerest_Addon=Fanruan Plugins
 FR-Designer_Performance_First=Performance First
 FR-Designer_Total_N_Grade=Total\:${N}Layer
 FR-Designer-BBSLogin_Login-Title=BBS Login
@@ -417,7 +373,6 @@ FR-Designer_Current_Preview_Rows=Current Number of Preview Rows
 FR-Designer_Data=Data
 FR-Designer_Error=Error
 FR-Designer_formDesignerModule=Form Designer
-FR-Designer-Website_Url=http\://www.finereport.com/en
 FR-Designer-BBSLogin_Download-Unlogin-Tip=Login to download
 FR-Designer-App_ReLayout=AppRelayout
 FR-Designer_Mobile-Attr=Mobile Attr
@@ -433,24 +388,17 @@ FR-Designer_COMMUNITY_BUG=bug report
 FR-Designer_COMMUNITY_SIGN=sign
 FR-Designer_COMMUNITY_QUESTIONS=questions
 FR-Designer_Mobile-Zoom=Zoom
-FR-Designer_Mobile-Open=Open
 FR-Designer_Mobile-Warning=Max height cannot exceed 80% of display area
-FR-Designer_Button-OK=OK
-FR-Designer_Button-Cancel=Cancel
 FR-Designer_Write-Save-Formula=Preserve formula when fill
 FR-Designer_Export-Save-Formula=Preserve formula when export
 FR-Designer_Form-Fit-Tip=Adaptive plug-in
 FR-Designer_Form-Frozen-Tip=When use Frozen, suggest install
 FR-Designer_Form-Forzen-Speed=, use bidirectional and horizontal adaption to improve the speed.
 FR-Designer_Attention=Attention
-FR-Designer_Forbid_Widgets_Intersects=Forbid component overlap
 FR-Designer_Widget_Scaling_Mode_Fit=Area-Fit
 FR-Designer_Widget_Scaling_Mode_Fixed=Area-Fixed
 FR-Designer-Widget_Area_Scaling=Component area scaling
 FR-Designer-Widget_Scaling_Mode=Scaling mode
-FR-Designer-QQLogin-Determine=Determine
-FR-Designer-QQLogin-Cancel=Cancel
-FR-Designer-Reuse_Manager=Component management
 FR-Designer_TableData-Default-Para=Default parameter
 FR-Designer_Layout_Block_Absolute=Absolute layout block
 FR-Designer_Layout_Block_Tab=Tab block
@@ -522,11 +470,6 @@ FR-Designer_FormulaPane_Search=Search
 FR-Designer_Tab_carousel=Tab carousel
 FR-Designer_setCarousel=Start
 FR-Designer_carouselInterval=Interval
-FR-Designer_ClassName_panel=Class Name
-FR-Designer_Description_panel=Description
-FR-Designer_Edit_panel=Edit
-FR-Designer_Property_panel=Property
-FR-Designer_Select_panel=Sel
 FR-Designer_LayoutTable_Column_Width=250
 FR-Designer_Set_BG_Of_Current_Row=Set BG of the row being edited
 FR-Designer_Unload_Check=Prompt users when leave without submitting
@@ -588,12 +531,8 @@ FR-Designer_Style=Style
 FR-Designer_Color=Color
 FR-Designer_Border=Border
 FR-Designer_Background-Pattern=Pattern
-FR-Designer_SimpleDetail_Report=
-FR-Designer_SimpleCross_Report=
 FR-Designer_Edit_Button_ToolBar=Edit Button ToolBar
 FR-Designer_Remove_Button_ToolBar=Remove Button ToolBar
-FR-Designer_Get-CubeGetting=
-FR-Designer_DoubleLayer_Report=
 FR-Designer_Get-Cube=
 CellWrite-InsertRow_NULL=Null
 DashBoard-ChartFloat=Chart
@@ -936,7 +875,6 @@ Day=Day
 External=External
 Black_Font=Black Font
 LOG-Report_Server_IS_Started=Report Server is Started
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=Tips\:You can input B1 to get the data in the second cell of the first row
 FR-Designer_ChooseOneButton=Please chose one control
 Widget-Sizing=Sizing
 NO_Border_Line=NO Border
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=Cache to disk  when records more than
 BorderLayout-South=South
 Export-Text=Text(tab delimited)
 JavaScript-Synch=Synch
-FR-App-All_Warning=Alert
 M_Edit-Send_Backward=Send to Backward
 Form-Layout=Layout
 FR-Designer-Plugin_Shop_Need_Update=Plugin store a new version, whether to update?
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=Plugin need dependence support,need to instal
 Delay=Delay
 FR-Designer-All_MSBold=MS YaHei
 Utils-Now_create_connection=Creating data connection
-FR-Template-Path_chooseRightPath=Please choose a right path
 FR-Remote_Re_Connect_to_Server=The server is down, whether to reconnect it
 Nation=Country
 DBCP_MAX_WAIT=Max wait time
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=Insert Slope Line
 FR-Designer-Plugin_Plugin_Description=Description
 ExpandD-Not_Expand=No extend
 Utils-Bottom_to_Top=From the bottom up
-Collect-Click\!_Get_user_information_code=Get Activation Code
 FR-Already_exist=Current environment is already exist\:
 Send=Send
 M_Edit-Clear_All=All
@@ -1996,7 +1931,6 @@ FR-Designer_Parameter=Parameter
 FR-Designer-Plugin_Plugin=Plugin
 FR-Designer_Background=BG
 Template=Template
-
 FR-Designer_Original_Marked_Filed=Original Tag Field
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
 FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections
@@ -2010,3 +1944,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
 FR-Designer_Provide_Choose_All=Provide Select All
 FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load Configuration File
+
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index 7fd4fb541d..c0ef55e166 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=\u30E6\u30FC\u30B6\u30FC\u540D
 FR-Designer-BBSLogin_Connection-Failure=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u72B6\u614B\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044
-FR-Designer-BBSLogin_Connection-Failure-Tip=\u30D2\u30F3\u30C8
 FR-Designer-BBSLogin_Forgot-Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5FD8\u308C\u305F
 FR-Designer-BBSLogin_Login=\u30ED\u30B0\u30A4\u30F3
 FR-Designer-BBSLogin_Login-Failure-Tip=\u30E6\u30FC\u30B6\u30FC\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC\u3067\u3059\u3002\u518D\u5EA6\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u7A
 FR-Designer-BBSLogin_Register-Account=\u30A2\u30AB\u30A6\u30F3\u30C8\u767B\u9332
 FR-Designer-BBSLogin_Switch-Account=\u30A2\u30AB\u30A6\u30F3\u30C8\u5207\u308A\u66FF\u3048
 FR-Designer-BBSLogin_Privite-Message=\u500B\u4EBA\u30E1\u30C3\u30BB\u30FC\u30B8
-FR-Designer-BBSLogin_Times=\u56DE
 FR-Designer-BBSLogin_Username-Empty-Tip=\u30E6\u30FC\u30B6\u30FC\u540D\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
 FR-Designer-Basic_More_Color=\u305D\u306E\u4ED6\u306E\u8272
 FR-Designer-Estate_Any=\u5236\u9650\u306A\u3057
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=Excel\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8(\u30DA\u
 FR-Designer-Output_Excel_Sheet=Excel\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8(1\u30DA\u30FC\u30B81\u30B7\u30FC\u30C8)
 FR-Designer-Output_Excel_Simple=Excel\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8(\u6A19\u6E96)
 FR-Designer-Plugin_PluginMarket_Coding=\u30D7\u30E9\u30B0\u30A4\u30F3\u30B9\u30C8\u30A2\u306F\u958B\u767A\u4E2D\u3067\u3059\u3002\u304A\u5F85\u3061\u4E0B\u3055\u3044
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3068\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=Jar\u30D5\u30A1\u30A4\u30EB\u30C1\u30A7\u30C3\u30AF\u691C\u8A3C\u4E2D
-FR-Desinger-Plugin_Updater_Checking_Version_Update=\u30D0\u30FC\u30B8\u30E7\u30F3\u30C1\u30A7\u30C3\u30AF\u691C\u8A3C\u4E2D
-FR-Desinger-Plugin_Updater_Update=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-FR-Desinger-Plugin_Updater_Upgrade=\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9
-FR-Desinger-Plugin_Updater_Restore=\u30EA\u30AB\u30D0\u30EA
-FR-Desinger-Plugin_Updater_New_Version_Available=\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059
-FR-Desinger-Plugin_Updater_JarUpdate=Jar\u30D5\u30A1\u30A4\u30EB\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-FR-Desinger-Plugin_Updater_VersionUpgrade=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30A2\u30C3\u30D7\u30B0\u30EC\u30FC\u30C9
-FR-Desinger-Plugin_Updater_Previous_Version=\u65E7\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u623B\u3057\u307E\u3059\u304B?
-FR-Desinger-Plugin_Updater_Current_Version=\u73FE\u5728\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
-FR-Desinger-Plugin_Updater_Not_Install_Version=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u7528\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3
-FR-Desinger-Plugin_Updater_Jar_Downloading=Jar\u30D5\u30A1\u30A4\u30EB\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D
-FR-Desinger-Plugin_Updater_Version_Downloading=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30D1\u30C3\u30B1\u30FC\u30B8\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D
-FR-Desinger-Plugin_Updater_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u66F4\u65B0\u30B5\u30FC\u30D0\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u30D0\u30FC\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30B5\u30FC\u30D0\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093
-FR-Desinger-Plugin_Updater_Already_Latest_Version=\u65E2\u306B\u6700\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u3067\u3059
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u53E4\u3044Jar\u30D5\u30A1\u30A4\u30EB\u3092\u4E0B\u8A18\u306B\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3057\u307E\u3057\u305F\:
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u53E4\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u4E0B\u8A18\u306B\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3057\u307E\u3057\u305F\:
-FR-Desinger-Plugin_Updater_Please_Restart=\u3001\u30C7\u30B6\u30A4\u30CA\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044
-FR-Desinger-Plugin_Updater_Jar_Restore=Jar\u30D5\u30A1\u30A4\u30EB\u30EA\u30AB\u30D0\u30EA
-FR-Desinger-Plugin_Updater_Version_Restore=\u30D0\u30FC\u30B8\u30E7\u30F3\u30EA\u30AB\u30D0\u30EA
-FR-Desinger-Plugin_Updater_Restore_To=\u3078\u30EA\u30AB\u30D0\u30EA
-FR-Desinger-Plugin_Updater_WorksAfterRestart=\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u6709\u52B9\u306B\u306A\u308A\u307E\u3059\u3002
 FR-Designer-Submit_Condition=\u6761\u4EF6
-FR-Designer-Widget-Title_border=\u67A0
-FR-Designer-Widget-Title_border_color=\u8272
 FR-Designer_AbsoluteLayout=\u7D76\u5BFE\u30EC\u30A4\u30A2\u30A6\u30C8
 FR-Designer_Allow_Decimals=\u5C0F\u6570\u306E\u8A31\u53EF
 FR-Designer_Allow_Negative=\u8CA0\u5024\u306E\u8A31\u53EF
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=\u30B7\u30E7\u30FC\u30C8\u30AB\u30C3\u30C8\u30AD\u30F
 FR-Designer_Button-Icon=\u30DC\u30BF\u30F3\u30A2\u30A4\u30B3\u30F3
 FR-Designer_Button-Name=\u30DC\u30BF\u30F3\u540D
 FR-Designer_Button-Type=\u30DC\u30BF\u30F3\u30BF\u30A4\u30D7
-FR-Designer_CardLayout=Tab\u30EC\u30A4\u30A2\u30A6\u30C8
 FR-Designer_Cell=\u30BB\u30EB
 FR-Designer_Chart_Cell=\u30B0\u30E9\u30D5\u30EA\u30F3\u30AF-\u30BB\u30EB
 FR-Designer_Chart_Float=\u30B0\u30E9\u30D5\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u8981\u7D20
 FR-Designer_Chart_Float_chart=\u30B0\u30E9\u30D5\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u30B0\u30E9\u30D5
-FR-Designer_Check-for-Updates=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D
 FR-Designer_Choose-Data-Confusion-Tip=\ \u6DF7\u4EA4\u3059\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u9078\u629E\u5F8C\u30D7\u30EC\u30D3\u30E5\u30FC\u3057\u3066\u304F\u3060\u3055\u3044
 FR-Designer_Close=\u9589\u3058\u308B
 FR-Designer_Column=\u5217
 FR-Designer_Column_Measure=\u5217\u8EF8/\u30E1\u30B8\u30E3\u30FC
 FR-Designer_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027
-FR-Designer_Confusion-Col-Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D
 FR-Designer_Confusion-key=\u6DF7\u4EA4\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9
 FR-Designer_Currency_Line=\u6841\u533A\u5207\u308A\u7DDA
 FR-Designer_Current_tab=\u7DE8\u96C6\u4E2D\u306Etab
@@ -99,7 +67,6 @@ FR-Designer_FS_Close_Other_Templates=\u4ED6\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\
 FR-Designer_File=\u30D5\u30A1\u30A4\u30EB
 FR-Designer_Filter_Conditions=\u30D5\u30A3\u30EB\u30BF\u6761\u4EF6
 FR-Designer_Finish-Modify-Share=\u4FEE\u6B63\u3092\u7D42\u4E86\u3057\u5171\u6709
-FR-Designer_Fit-App=App\u81EA\u52D5\u8ABF\u6574
 FR-Designer_Fit=\u81EA\u52D5\u8ABF\u6574
 FR-Designer_Font-Family=\u30D5\u30A9\u30F3\u30C8\u540D
 FR-Designer_Font-Size=\u30D5\u30A9\u30F3\u30C8\u30B5\u30A4\u30BA
@@ -130,15 +97,12 @@ FR-Designer_Layout_Constraints=\u4F4D\u7F6E\u3068\u30B5\u30A4\u30BA
 FR-Designer_Length=\u9577\u3055
 FR-Designer_Loading_Data=\u30C7\u30FC\u30BF\u3092\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059
 FR-Designer_M-Exit=\u7D42\u4E86
-FR-Designer_M-Help=\u30D8\u30EB\u30D7
 FR-Designer_M-Insert=\u633F\u5165
 FR-Designer_M-Repeat-Freeze=\u91CD\u8907\u3068\u56FA\u5B9A\u8A2D\u5B9A
 FR-Designer_M-Server=\u30B5\u30FC\u30D0
 FR-Designer_M-SwitchWorkspace=\u4F5C\u696D\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5207\u308A\u66FF\u3048
 FR-Designer_M-Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 FR-Designer_MDX_Explain=MDX\u8A00\u8A9E\u306E\u6587\u6CD5\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\:\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u6CE8\:COLUMNS\u3001ROWS\u306F0\u30011\u3092\u4F7F\u7528\u3057\u3066\u4EE3\u66FF\u53EF\u80FD\u3067\u3059\u3002\u30AF\u30A8\u30EA\u8EF8\u306F2\u3064\u306E\u8EF8\u623B\u3057\u306B\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
-FR-Designer_M_Help-About_Software=\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u306B\u3064\u3044\u3066
-FR-Designer_M_Help-Tutorial=\u30D8\u30EB\u30D7\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
 FR-Designer_Max_Value=\u6700\u5927\u5024
 FR-Designer_Min_Value=\u6700\u5C0F\u5024
 FR-Designer_MobilePhone=\u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3
@@ -154,7 +118,6 @@ FR-Designer_PostCode=\u90F5\u4FBF\u756A\u53F7
 FR-Designer_Present=\u5F62\u614B
 FR-Designer_Preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 FR-Designer_Preview-Data-Confusion=\u6DF7\u4EA4\u5F8C\u306E\u30C7\u30FC\u30BF\u3092\u30D7\u30EC\u30D3\u30E5\u30FC
-FR-Designer_Product_Demo=\u88FD\u54C1\u30C7\u30E2
 FR-Designer_Query_Type=\u30AF\u30A8\u30EA\u65B9\u6CD5
 FR-Designer_Refresh=\u66F4\u65B0
 FR-Designer_Refresh_Parameter_In_SQL=SQL\u4E2D\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B
@@ -176,15 +139,12 @@ FR-Designer_Song_TypeFace=\u5B8B\u4F53
 FR-Designer_Start-Date=\u958B\u59CB\u65E5
 FR-Designer_Subscript=\u4E0B\u4ED8\u304D
 FR-Designer_Superscript=\u4E0A\u4ED8\u304D
-FR-Designer_Support_QQ=\u6280\u8853QQ
 FR-Designer_Swatch=\u30B5\u30F3\u30D7\u30EB
-FR-Designer_Tab_title=tab\u30BF\u30A4\u30C8\u30EB
 FR-Designer_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
 FR-Designer_Thank_guest=\u7279\u306B\u3053\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u30C7\u30B6\u30A4\u30CA\u30FC\u306E\u4F7F\u3044\u3084\u3059\u3055\u306B\u3064\u3044\u3066\u8CA2\u732E\u3057\u3066\u304F\u308C\u305F\u4EE5\u4E0B\u306E\u30E6\u30FC\u30B6\u30FC\u9054\u306B\u611F\u8B1D\u3057\u307E\u3059
 FR-Designer_Thanks-To=\u611F\u8B1D
 FR-Designer_Title=\u30BF\u30A4\u30C8\u30EB
 FR-Designer_Total=\u5408\u8A08
-FR-Designer_UnSignIn=\u672A\u30ED\u30B0\u30A4\u30F3
 FR-Designer_Underline=\u4E0B\u7DDA
 FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528\u3057\u305F
 FR-Designer_User-defined-MDX=\u30AB\u30B9\u30BF\u30E0MDX\u30AF\u30A8\u30EA
@@ -202,7 +162,6 @@ FR-Designer_XMLA_Explain=\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\
 FR-Designer_bold=\u592A\u5B57
 FR-Designer_font=\u30D5\u30A9\u30F3\u30C8
 FR-Designer_italic=\u659C\u4F53
-FR-Designer_product_feedback=\u88FD\u54C1\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF
 FR-Designer_XMLA=\u591A\u6B21\u5143\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 FR-Designer-StyleAlignment_Layout_Default=\u65E2\u5B9A
 FR-Designer-StyleAlignment_Layout_Image_Titled=\u4E26\u3079\u3066\u8868\u793A
@@ -236,7 +195,6 @@ FR-Designer_Save_Path=\u4FDD\u5B58\u30D1\u30B9
 FR-Designer_Chart_Acc_Set=\u500B\u5225\u8A2D\u5B9A
 FR-Designer_Gradient-Color=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3
 FR-Designer_DEFAULT=\u65E2\u5B9A
-FR-Designer_chart-PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272
 FR-Designer_Chart-PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272
 FR-Designer_Already_exist=\u73FE\u5728\u306E\u74B0\u5883\u306B\u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\:
 FR-Designer_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
@@ -372,7 +330,6 @@ FR-Designer_LiteCondition_Define=\u5B9A\u7FA9
 FR-Designer_Select_All=\u3059\u3079\u3066\u9078\u629E
 FR-Designer-Plugin_Expire_Dialog_Title=\u671F\u9650\u5207\u308C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3
 FR-Designer-Plugin_Expire_Dialog_Text=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u671F\u9650\u5207\u308C\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3001\u30D5\u30A1\u30F3\u30E9\u30F3\u30A2\u30D7\u30EA\u30BB\u30F3\u30BF\u30FC\u3067\u8CFC\u5165\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-FR-Designer-Plugin_Finerest_Addon=\u30D5\u30A1\u30F3\u30E9\u30F3\u30A2\u30D7\u30EA\u30BB\u30F3\u30BF\u30FC
 FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148
 FR-Designer_Total_N_Grade=\u5168\u90E8\u3067\:${N}\u5C64
 FR-Designer_time(s)=\u56DE
@@ -406,17 +363,14 @@ FR-Designer_Event_ShowWidgets=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u76F4\u63A5\u
 FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30FC\u884C\u6570
 FR-Designer_Data=\u30C7\u30FC\u30BF
 FR-Designer_Error=\u30A8\u30E9\u30FC
-FR-Designer-Website_Url=http\://www.finereport.com/jp
 FR-Designer_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC
 FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3
-FR-Designer_Get-CubeGetting=cube\u3092\u53D6\u5F97
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u524D\u306B\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 FR-Designer-App_ReLayout=\u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3\u30EC\u30A4\u30A2\u30A6\u30C8
 FR-Designer_Mobile-Attr=\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u5C5E\u6027
 FR-Designer_Mobile-Vertical=\u7E26
 FR-Designer_Mobile-Horizontal=\u6A2A
 FR-Designer_Mobile-Zoom=\u5E33\u7968\u30BA\u30FC\u30E0
-FR-Designer_Mobile-Open=\u958B\u304F
 FR-Designer_COMMUNITY=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3
 FR-Designer_COMMUNITY_BBS=\u30D5\u30A1\u30F3\u30E9\u30F3BBS
 FR-Designer_COMMUNITY_VIDEO=\u30D3\u30C7\u30AA
@@ -429,13 +383,9 @@ FR-Designer_COMMUNITY_QUESTIONS=\u304A\u554F\u3044\u5408\u308F\u305B
 FR-Designer_Write-Save-Formula=\u6570\u5F0F\u4FDD\u6301(\u66F8\u304D\u8FBC\u307F/\u30C7\u30FC\u30BF\u5206\u6790)
 FR-Designer_Export-Save-Formula=\u6570\u5F0F\u4FDD\u6301(\u7DE8\u96C6/\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8)
 FR-Designer_Attention=\u6CE8\u610F
-FR-Designer_Forbid_Widgets_Intersects=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u91CD\u306A\u308A\u7981\u6B62
 FR-Designer_Widget_Scaling_Mode_Fit=\u30B5\u30A4\u30BA\u8ABF\u6574
 FR-Designer_Widget_Scaling_Mode_Fixed=\u30B5\u30A4\u30BA\u56FA\u5B9A
 FR-Designer-Widget_Area_Scaling=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30A8\u30EA\u30A2\u30BA\u30FC\u30E0
-FR-Designer-QQLogin-Determine=\u78BA\u5B9A
-FR-Designer-QQLogin-Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-FR-Designer-Reuse_Manager=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u7BA1\u7406
 FR-Designer_Layout_Block_Absolute=\u7D76\u5BFE\u30AD\u30E3\u30F3\u30D0\u30B9\u30D6\u30ED\u30C3\u30AF
 FR-Designer_Layout_Block_Tab=Tab\u30D6\u30ED\u30C3\u30AF
 FR-Designer_Layout_Block_Blank=\u7A7A\u767D\u30D6\u30ED\u30C3\u30AF
@@ -500,11 +450,6 @@ FR-Designer_FormulaPane_Search=\u691C\u7D22
 FR-Designer_Tab_carousel=tab\u30AB\u30EB\u30FC\u30BB\u30EB
 FR-Designer_setCarousel=\u30AB\u30EB\u30FC\u30BB\u30EB\u30AA\u30F3
 FR-Designer_carouselInterval=\u30AB\u30EB\u30FC\u30BB\u30EB\u9593\u9694
-FR-Designer_ClassName_panel=\u30AF\u30E9\u30B9\u540D
-FR-Designer_Description_panel=\u8AAC\u660E
-FR-Designer_Edit_panel=\u7DE8\u96C6
-FR-Designer_Property_panel=\u5C5E\u6027
-FR-Designer_Select_panel=\u9078\u629E
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=\u7DE8\u96C6\u884C\u80CC\u666F\u8A2D\u5B9A
 FR-Designer_Unload_Check=\u672A\u30B3\u30DF\u30C3\u30C8\u30D2\u30F3\u30C8
@@ -564,21 +509,16 @@ FR-Designer_Color=\u8272
 FR-Designer_Border=\u67A0
 FR-Designer_Background-Pattern=\u30D1\u30BF\u30FC\u30F3
 FR-Designer_Printer_Native_Button=\u30ED\u30FC\u30AB\u30EB\u5370\u5237
-FR-Designer_SimpleDetail_Report=\u7C21\u5358\u660E\u7D30\u5E33\u7968
 FR-Designer_Reset=\u30EA\u30BB\u30C3\u30C8
 FR-Designer_WidgetOrder=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u306E\u9806\u756A
-FR-Designer_Button-OK=OK
 FR-Designer_Mobile-Warning=\u6700\u5927\u306E\u9AD8\u3055\u306F\u8868\u793A\u30A8\u30EA\u30A2\u306E80\uFF05\u4EE5\u4E0A\u306B\u306A\u308A\u307E\u305B\u3093
 FR-Designer_Mobile_Form_Analysis_Annotation=\u8AAC\u660E\:\u3053\u306E\u8A2D\u5B9A\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30A2\u30D7\u30EA\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
-FR-Designer-Invalid_Page_Number=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u756A\u53F7
 FR-Designer_Form-Forzen-Speed=\u3001\u305D\u3057\u3066\u6A2A\u65B9\u5411\u81EA\u5DF1\u8ABF\u6574\u307E\u305F\u306F\u4E21\u65B9\u5411\u81EA\u52D5\u8ABF\u6574\u3092\u5229\u7528\u3057\u3001\u5E33\u7968\u8868\u793A\u306E\u30B9\u30D4\u30FC\u30C9\u3092\u4E0A\u3052\u3067\u304D\u307E\u3059\u3002
 FR-Designer_Properties_Mobile=\u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3\u5C5E\u6027
 FR-Designer_AllCategories=\u3059\u3079\u3066\u306E\u30AB\u30C6\u30B4\u30EA
 FR-Designer-Selected_Widget=\u9078\u629E\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
-FR-Designer_SimpleCross_Report=\u7C21\u6613\u30AF\u30ED\u30B9\u5E33\u7968
 FR-Designer_Log=\u30ED\u30B0
 FR-Designer_Form-Fit-Tip=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3
-FR-Designer_Button-Cancel=\u53D6\u308A\u6D88\u3057
 FR-Designer_LocalWidget=\u30ED\u30FC\u30AB\u30EB\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u30E9\u30A4\u30D6\u30E9\u30EA
 FR-Designer_Alert=\u30A2\u30E9\u30FC\u30C8
 FR-Designer_TableData-Default-Para=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306E\u65E2\u5B9A\u30D1\u30E9\u30E1\u30FC\u30BF
@@ -593,7 +533,6 @@ FR-Designer_Allow-Blank=\u7A7A\u6B04\u3092\u8A31\u53EF
 FR-Designer_Clear_All=\u3059\u3079\u3066\u30AF\u30EA\u30A2
 FR-Designer_Delete_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u524A\u9664
 FR-Designer_Mobile_Report_Analysis_Annotation=\u8AAC\u660E\:\u8A72\u5F53\u5C5E\u6027\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30A2\u30D7\u30EA\u3067\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3001\u30DA\u30FC\u30B8\u5225\u30D7\u30EC\u30D3\u30E5\u30FC\u3060\u3051\u5BFE\u5FDC\u3001\u66F8\u304D\u8FBC\u307F\u30D7\u30EC\u30D3\u30E5\u30FC\u6642\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002
-FR-Designer_DoubleLayer_Report=2\u968E\u30BF\u30A4\u30C8\u30EB
 FR-Designer_Validate=\u691C\u8A3C
 CellWrite-InsertRow_NULL=\u7A7A\u6B04
 DashBoard-ChartFloat=\u30B0\u30E9\u30D5
@@ -936,7 +875,6 @@ Day=\u65E5
 External=\u5916\u90E8
 Black_Font=SimHei
 LOG-Report_Server_IS_Started=\u5E33\u7968\u30B5\u30FC\u30D0\u306F\u8D77\u52D5\u6E08\u307F
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=\u30D2\u30F3\u30C8\:B1\u3092\u5165\u529B\u3059\u308B\u3068\u3001\u30BB\u30EBB1\u306E\u30C7\u30FC\u30BF\u3092\u53C2\u7167\u3067\u304D\u307E\u3059\u3002
 FR-Designer_ChooseOneButton=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u3092\u9078\u629E\u3057\u3066\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044
 Widget-Sizing=\u30B5\u30A4\u30BA\u8ABF\u6574
 NO_Border_Line=\u67A0\u306A\u3057
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=\u30C7\u30A3\u30B9\u30AF\u30AD\u30E3\u30C3\u30B7\u30E5 \u6761\
 BorderLayout-South=\u5357
 Export-Text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB(\u30BF\u30D6\u533A\u5207\u308A)
 JavaScript-Synch=\u540C\u671F
-FR-App-All_Warning=\u8B66\u544A
 M_Edit-Send_Backward=\u80CC\u9762\u3078\u79FB\u52D5(B)
 Form-Layout=\u30EC\u30A4\u30A2\u30A6\u30C8
 FR-Designer-Plugin_Shop_Need_Update=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u30B9\u30C8\u30A2\u304C\u3042\u308A\u307E\u3059\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B?
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u30B5\u3
 Delay=\u9045\u5EF6
 FR-Designer-All_MSBold=\u30DE\u30A4\u30AF\u30ED\u30BD\u30D5\u30C8\u30E4\u30D8\u30A4
 Utils-Now_create_connection=\u30C7\u30FC\u30BF\u63A5\u7D9A\u78BA\u7ACB\u4E2D
-FR-Template-Path_chooseRightPath=\u6B63\u3057\u3044\u30D1\u30B9\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
 FR-Remote_Re_Connect_to_Server=\u30B5\u30FC\u30D0\u3068\u63A5\u7D9A\u3057\u3066\u3044\u307E\u305B\u3093\u3001\u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B?
 Nation=\u56FD
 DBCP_MAX_WAIT=\u63A5\u7D9A\u4E0D\u8DB3\u6642\u306E\u6700\u5927\u5F85\u6A5F\u6642\u9593
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=\u659C\u7DDA
 FR-Designer-Plugin_Plugin_Description=\u30D7\u30E9\u30B0\u30A4\u30F3\u8AAC\u660E
 ExpandD-Not_Expand=\u5C55\u958B\u3057\u306A\u3044
 Utils-Bottom_to_Top=\u4E0B\u304B\u3089\u4E0A\u3078
-Collect-Click\!_Get_user_information_code=\u30AF\u30EA\u30C3\u30AF\!\u30A2\u30AF\u30C6\u30A3\u30D9\u30FC\u30B7\u30E7\u30F3\u30B3\u30FC\u30C9\u3092\u53D6\u5F97
 FR-Already_exist=\u304A\u4F7F\u3044\u306E\u74B0\u5883\u306B\u65E2\u306B\u3042\u308A\u307E\u3059\:
 Send=\u8EE2\u9001
 M_Edit-Clear_All=\u3059\u3079\u3066(A)
@@ -2008,4 +1943,5 @@ Default=\u65E2\u5B9A
 FR-Designer_Sheet_Label_Page_Display_Position=Sheet\u30E9\u30D9\u30EB\u30DA\u30FC\u30B8\u306E\u8868\u793A\u4F4D\u7F6E
 FR-Designer_Provide_Choose_All=\u5168\u9078\u629E\u53EF\u80FD
 FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
-FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
\ No newline at end of file
+FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
+
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index 84b0e8f076..51b97b98bc 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D
 FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624.
-FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC
 FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8BB0\u5BC6\u7801
 FR-Designer-BBSLogin_Login=\u767B\u5F55
 FR-Designer-BBSLogin_Login-Failure-Tip=\uC0AC\uC6A9\uC790\uC774\uB984\uB610\uB294\uBE44\uBC00\uBC88\uD638\uC785\uB825\uC624\uB958.\uB2E4\uC2DC\uB85C\uADF8\uC778\uD574\uC8FC\uC2ED\uC2DC\uC624.
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=\uC554\uD638\uB294\uBE48\uCE78\uC73C\uB8
 FR-Designer-BBSLogin_Register-Account=\u6CE8\u518C\u8D26\u53F7
 FR-Designer-BBSLogin_Switch-Account=\uC804\uD658\uACC4\uC815\uBC88\uD638
 FR-Designer-BBSLogin_Privite-Message=\uAC1C\uC778\u0020\uBA54\uC2DC\uC9C0
-FR-Designer-BBSLogin_Times=\uD68C
 FR-Designer-BBSLogin_Username-Empty-Tip=\uC0AC\uC6A9\uC790\uC774\uB984\uC740\uBE48\uCE78\uC73C\uB85C\uB458\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
 FR-Designer-Basic_More_Color=\uB354\uBCF4\uAE30\uC0C9
 FR-Designer-Estate_Any=\uC81C\uD55C\uC5C6\uC74C
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\u
 FR-Designer-Output_Excel_Sheet=Excel\uCD9C\uB825(\uD398\uC774\uC9C0\uB098\uB204\uAE30Sheet\uB0B4\uBCF4\uB0B4\uAE30)
 FR-Designer-Output_Excel_Simple=Excel\uCD9C\uB825(\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30)
 FR-Designer-Plugin_PluginMarket_Coding=\uD50C\uB7EC\uADF8\uC778\uC2A4\uD1A0\uC5B4\uB97C\uAC1C\uBC1C\uC911\uC785\uB2C8\uB2E4.\uAE30\uB2E4\uB824\uC8FC\uC2ED\uC2DC\uC624.
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\uC5C5\uB370\uC774\uD2B8\uC5C5\uADF8\uB808\uC774\uB4DC
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=Jar\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC\uC911
-FR-Desinger-Plugin_Updater_Checking_Version_Update=\uBC84\uC804\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC\uC911
-FR-Desinger-Plugin_Updater_Update=\uC5C5\uB370\uC774\uD2B8
-FR-Desinger-Plugin_Updater_Upgrade=\uC5C5\uADF8\uB808\uC774\uB4DC
-FR-Desinger-Plugin_Updater_Restore=\uBCF5\uC6D0
-FR-Desinger-Plugin_Updater_New_Version_Available=\uC0C8\uB85C\uC6B4\uBC84\uC804\uC774\uC788\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_JarUpdate=Jar\uD329\uC5C5\uB370\uC774\uD2B8\uFF1A
-FR-Desinger-Plugin_Updater_VersionUpgrade=\uBC84\uC804\uC5C5\uADF8\uB808\uC774\uB4DC\uFF1A
-FR-Desinger-Plugin_Updater_Previous_Version=\uC774\uC804\uBC84\uC804\uC73C\uB85C\uAC00\uC2DC\uACA0\uC2B5\uB2C8\uAE4C\uFF1F
-FR-Desinger-Plugin_Updater_Current_Version=\uD604\uC7AC\uBC84\uC804\uFF1A
-FR-Desinger-Plugin_Updater_Not_Install_Version=\uC124\uCE58\uB41C\uBC84\uC804\uC774\uC544\uB2D9\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Latest_Version=\uCD5C\uC2E0\uBC84\uC804\uFF1A
-FR-Desinger-Plugin_Updater_Jar_Downloading=jar\uD329\uB2E4\uC6B4\uB85C\uB4DC\uC644\uB8CC\uB97C\uAE30\uB2E4\uB9AC\uACE0\uC788\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Version_Downloading=\uC5C5\uADF8\uB808\uC774\uB4DC\uD329\uB2E4\uC6B4\uB85C\uB4DC\uC644\uB8CC\uB97C\uAE30\uB2E4\uB9AC\uACE0\uC788\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Restart_Designer=\uC7AC\uBD80\uD305\uC124\uACC4\uAE30
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\uBC84\uC804\uC5C5\uB370\uC774\uD2B8\uC11C\uBC84\uB97C\uC5F0\uACB0\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\uBC84\uC804\uC5C5\uADF8\uB808\uC774\uB4DC\uC11C\uBC84\uB97C\uC5F0\uACB0\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Already_Latest_Version=\uCD5C\uC2E0\uBC84\uC804\uC785\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=\uAE30\uC874 jar\uD329\uC744\uBC31\uC5C5\uD558\uC600\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\uAE30\uC874\uBC84\uC804\uD329\uC744\uBC31\uC5C5\uD558\uC600\uC2B5\uB2C8\uB2E4.
-FR-Desinger-Plugin_Updater_Please_Restart=\uC124\uACC4\uAE30\uB97C\uC7AC\uBD80\uD305\uD574\uC8FC\uC2ED\uC2DC\uC624.
-FR-Desinger-Plugin_Updater_Jar_Restore=Jar\uD329\uBCF5\uC6D0
-FR-Desinger-Plugin_Updater_Version_Restore=\uBC84\uC804\uBCF5\uC6D0
-FR-Desinger-Plugin_Updater_Restore_To=\uB85C\uBCF5\uC6D0
-FR-Desinger-Plugin_Updater_WorksAfterRestart=\uBC84\uC804.\uC7AC\uBD80\uD305\uC720\uD6A8\uD568
 FR-Designer-Submit_Condition=\uC870\uAC74
-FR-Designer-Widget-Title_border=\uD14C\uB450\uB9AC
-FR-Designer-Widget-Title_border_color=\uC0C9
 FR-Designer_AbsoluteLayout=\uC808\uB300 \uB808\uC774\uC544\uC6C3
 FR-Designer_Allow_Decimals=\uC18C\uC218\uD5C8\uC6A9
 FR-Designer_Allow_Negative=\uB9C8\uC774\uB108\uC2A4\uAC12\uD5C8\uC6A9
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=\uB2E8\uCD95\uD0A4
 FR-Designer_Button-Icon=\uD0A4\uC544\uC774\uCF58
 FR-Designer_Button-Name=\uD0A4\uBA85\uCE6D
 FR-Designer_Button-Type=\uD0A4\uC720\uD615
-FR-Designer_CardLayout=Tab\uB808\uC774\uC544\uC6C3
 FR-Designer_Cell=\uC140
 FR-Designer_Chart_Cell=\uCC28\uD2B8 \uD558\uC774\uD37C\uB9C1\uD06C-\uC140 \uC5F0\uB3D9
 FR-Designer_Chart_Float=\uCC28\uD2B8\uD558\uC774\uD37C\uB9C1\uD06C-\uC5F0\uB3D9\uC11C\uC2A4\uD39C\uC2A4\uC694\uC18C
 FR-Designer_Chart_Float_chart=\uCC28\uD2B8 \uD558\uC774\uD37C\uB9C1\uD06C-\uC704\uC82F \uCC28\uD2B8
-FR-Designer_Check-for-Updates=\uC5C5\uB370\uC774\uD2B8\uAC80\uC0AC
 FR-Designer_Choose-Data-Confusion-Tip=\\ud63c\uD569\uD560\uD544\uB4DC\uB97C\uC120\uD0DD\uD6C4\uBBF8\uB9AC\uBCF4\uAE30
 FR-Designer_Close=\uB2EB\uAE30
 FR-Designer_Column=\uC5F4
 FR-Designer_Column_Measure=\uC5F4\uCD95/\uCE21\uC815\uAC12
 FR-Designer_Condition_Attributes=\uC870\uAC74\uC18D\uC131
-FR-Designer_Confusion-Col-Name=\uD544\uB4DC\uC774\uB984
 FR-Designer_Confusion-key=\uD63C\uD569\uD0A4\uC6CC\uB4DC
 FR-Designer_Currency_Line=\uAE08\uC561\uC120
 FR-Designer_Current_tab=\uD604\uC7AC\uD3B8\uC9D1tab
@@ -99,7 +67,6 @@ FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30
 FR-Designer_File=\uD30C\uC77C
 FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74
 FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720
-FR-Designer_Fit-App=App\uC790\uAE30\uC801\uC751
 FR-Designer_Fit=\uC790\uAE30\uC801\uC751
 FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D
 FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30
@@ -130,15 +97,12 @@ FR-Designer_Layout_Constraints=\uC704\uCE58\uC640\uD06C\uAE30
 FR-Designer_Length=\uAE38\uC774
 FR-Designer_Loading_Data=\uB85C\uB529\uB370\uC774\uD130\uB85C\uB529\uC911
 FR-Designer_M-Exit=\uB098\uAC00\uAE30
-FR-Designer_M-Help=\uB3C4\uC6C0\uB9D0
 FR-Designer_M-Insert=\uC0BD\uC785
 FR-Designer_M-Repeat-Freeze=\uC911\uBCF5\uBC0F\uACE0\uC815\uC124\uC815
 FR-Designer_M-Server=\uC11C\uBC84
 FR-Designer_M-SwitchWorkspace=\uC804\uD658\uC791\uC5C5\uB514\uB809\uD130\uB9AC
 FR-Designer_M-Template=\uD15C\uD50C\uB9BF
 FR-Designer_MDX_Explain=\uADF8\uB798\uBA38\uC11C\uC2DD\uC740MDX\uADF8\uB798\uBA38\uCC38\uC870.\ n\uC608\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\uBE44\uACE0\uFF1ACOLUMNS, ROWS\uB2940, 1\uB85C\uB300\uCCB4\uD560\uC218\uC788\uC73C\uBA70,\uCC3E\uC544\uBCF4\uAE30\uCD95\uC740\uB3CC\uC544\uAC00\uAE30\uB450\uCD95\uB9CC\uC9C0\uC6D0\uD568.
-FR-Designer_M_Help-About_Software=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC5D0\uB300\uD558\uC5EC
-FR-Designer_M_Help-Tutorial=\uB3C4\uC6C0\uB9D0\uD14D\uC2A4\uD2B8\uBD81
 FR-Designer_Max_Value=\uCD5C\uB300\uAC12
 FR-Designer_Min_Value=\uCD5C\uC18C\uAC12
 FR-Designer_MobilePhone=\uD734\uB300\uD3F0
@@ -154,7 +118,6 @@ FR-Designer_PostCode=\uC6B0\uD3B8\uBC88\uD638
 FR-Designer_Present=\uD615\uD0DC
 FR-Designer_Preview=\uBBF8\uB9AC\uBCF4\uAE30
 FR-Designer_Preview-Data-Confusion=\uD63C\uD569\uD6C4\uC758\uB370\uC774\uD130\uBBF8\uB9AC\uBCF4\uAE30
-FR-Designer_Product_Demo=\uC81C\uD488\uC2DC\uC5F0
 FR-Designer_Query_Type=\uCC3E\uC544\uBCF4\uAE30\uBC29\uC2DD
 FR-Designer_Refresh=\uC0C8\uB85C\uACE0\uCE68
 FR-Designer_Refresh_Parameter_In_SQL=SQL\uC758\uB9E4\uAC1C\uBCC0\uC218\uB97C\uC0C8\uB85C\uACE0\uCE68\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C
@@ -176,15 +139,12 @@ FR-Designer_Song_TypeFace=\uC1A1\uCCB4
 FR-Designer_Start-Date=\uC2DC\uC791\uB0A0\uC9DC
 FR-Designer_Subscript=\uBC11\uC904
 FR-Designer_Superscript=\uC717\uC904
-FR-Designer_Support_QQ=\uAE30\uC220QQ
 FR-Designer_Swatch=\uC0D8\uD50C
-FR-Designer_Tab_title=tab \uC81C\uBAA9
 FR-Designer_TableData=\uB370\uC774\uD130\uC138\uD2B8
 FR-Designer_Thank_guest=\uD3EC\uB7FC\uD310\uC288\uC758\uD574\uB2F9\uBC84\uC804\uC124\uACC4\uAE30\uC0AC\uC6A9\uC131\uC5D0\uB300\uD55C\uD070\uACF5\uD5CC\uC5D0\uAC10\uC0AC\uB4DC\uB9BD\uB2C8\uB2E4.
 FR-Designer_Thanks-To=\uC778\uC0AC\uB9D0
 FR-Designer_Title=\uC81C\uBAA9
 FR-Designer_Total=\uCD1D
-FR-Designer_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D
 FR-Designer_Underline=\uBC11\uC904
 FR-Designer_Used=\uCD5C\uADFC\uC0AC\uC6A9
 FR-Designer_User-defined-MDX=\uC0AC\uC6A9\uC790\uC815\uC758 MDX\uCC3E\uC544\uBCF4\uAE30
@@ -202,7 +162,6 @@ FR-Designer_XMLA_Explain=\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uC138\uD2B8\uB97C\
 FR-Designer_bold=\uAD75\uAC8C
 FR-Designer_font=\uAE00\uAF34
 FR-Designer_italic=\uAE30\uC6B8\uAE30
-FR-Designer_product_feedback=\uC81C\uD488\uD53C\uB4DC\uBC31
 FR-Designer_XMLA=\uB2E4\uCC28\uC6D0\uB370\uC774\uD130\uBCA0\uC774\uC2A4
 FR-Designer-StyleAlignment_Layout_Default=\uAE30\uBCF8
 FR-Designer-StyleAlignment_Layout_Image_Titled=\uD0C0\uC77C
@@ -236,7 +195,6 @@ FR-Designer_Save_Path=\uC800\uC7A5\uACBD\uB85C
 FR-Designer_Chart_Acc_Set=\uC815\uD655\uD55C\uC124\uC815
 FR-Designer_Gradient-Color=\uADF8\uB77C\uB370\uC774\uC158\uC0C9\uC0C1
 FR-Designer_DEFAULT=\uAE30\uBCF8
-FR-Designer_chart-PreStyle=\uCC28\uD2B8\uC0AC\uC804\uC815\uC758\uB41C\uC0C9\uBC30\uD569
 FR-Designer_Chart-PreStyle=\uCC28\uD2B8\uC0AC\uC804\uC815\uC758\uB41C\uC0C9\uBC30\uD569
 FR-Designer_Already_exist=\uD604\uC7AC\uD658\uACBD\uC774\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4\:
 FR-Designer_Database=\uB370\uC774\uD130\uBCA0\uC774\uC2A4
@@ -357,7 +315,6 @@ FR-Designer_KeyPoint=\uD575\uC2EC\uB178\uB4DC
 FR-Designer_loadedTreeModel=\uB85C\uB529\uC5D0\uC2E4\uD328\uD558\uC600\uC2B5\uB2C8\uB2E4.\uAC80\uC0AC\uD6C4\uB2E4\uC2DC\uC2DC\uB3C4\uD574\uC8FC\uC2ED\uC2DC\uC624.
 FR-Designer-Failed_to_load_the_plugin=\uD50C\uB7EC\uADF8\uC778\uC744\uB85C\uB529\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.\uD50C\uB7EC\uADF8\uC778\uC744\uC5C5\uB370\uC774\uD2B8\uD574\uC8FC\uC138\uC694.
 FR-Designer-Plugin_Please_Update_Jar=Jar\uD329\uC744\uC5C5\uB370\uC774\uD2B8\uD574\uC8FC\uC138\uC694.\uD50C\uB7EC\uADF8\uC778\uC740\uCD5C\uC800\uBC84\uC804\uC774\uC788\uC5B4\uC57C\uD569\uB2C8\uB2E4.
-FR-Designer_Get-CubeGetting=cube\uD68D\uB4DD
 FR-Designer_XMLA_Database=\uB370\uC774\uD130\uBCA0\uC774\uC2A4
 FR-Designer_XMLA_UserName=\uC0AC\uC6A9\uC790\uC774\uB984
 FR-Designer_XMLA_Password=\uC554\uD638
@@ -379,7 +336,6 @@ FR-Designer_Copy=\uBCF5\uC0AC
 FR-Designer_Log=\uB85C\uADF8
 FR-Designer-Plugin_Expire_Dialog_Title=\uD50C\uB7EC\uADF8\uC778\uAE30\uAC04\uCD08\uACFC
 FR-Designer-Plugin_Expire_Dialog_Text=\uD50C\uB7EC\uADF8\uC778\uAE30\uAC04\uC774\uCD08\uACFC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\uD310\uB87C\uC571\uC13C\uD130\uC5D0\uC11C\uAD6C\uB9E4\uD574\uC8FC\uC2ED\uC2DC\uC624.
-FR-Designer-Plugin_Finerest_Addon=\uD310\uB87C\uC571\uC13C\uD130
 FR-Designer_Performance_First=\uC131\uB2A5\uC6B0\uC120\uC21C\uC704
 FR-Designer_Total_N_Grade=\uCD1D\:${N}\uACC4\uCE35
 FR-Designer-BBSLogin_Login-Title=\uD3EC\uB7FC\uACC4\uC815\uC73C\uB85C\uB85C\uADF8\uC778
@@ -415,20 +371,15 @@ FR-Designer_Event_ShowWidgets=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC9C1\u
 FR-Designer_Current_Preview_Rows=\uD604\uC7AC\uD589\uC218\uBBF8\uB9AC\uBCF4\uAE30
 FR-Designer_Data=\uB370\uC774\uD130
 FR-Designer_Error=\uC624\uB958
-FR-Designer-Website_Url=http\://www.finereport.com/
 FR-Designer-BBSLogin_Download-Unlogin-Tip=
 FR-Designer-App_ReLayout=\uC804\uD654 \uB808\uC774\uC544\uC6C3 \uC791\uC5C5
 FR-Designer_Write-Save-Formula=\uAE30\uC785\uD558\uC5EC \uBCF4\uACE0\uD558\uB2E4 \uBCF4\uAD00 \uACF5\uC2DD
 FR-Designer_Export-Save-Formula=\uB0B4\uBCF4\uB0B4\uAE30 \uC720\uBCF4 \uACF5\uC2DD
 FR-Designer_Attention=\uC8FC\uC758
-FR-Designer_Forbid_Widgets_Intersects=\uC11C\uB85C \uACB9\uCE58\uB294 \uAE08\uC9C0 \uAD6C\uC131 \uC694\uC18C
 FR-Designer_Widget_Scaling_Mode_Fit=\uC801\uC751 \uAD6C\uC5ED
 FR-Designer_Widget_Scaling_Mode_Fixed=\uACE0\uC815 \uD06C\uAE30
 FR-Designer-Widget_Area_Scaling=\uAD6C\uC131 \uC694\uC18C \uC601\uC5ED \uD06C\uAE30 \uC870\uC815
 FR-Designer-Widget_Scaling_Mode=\uD655\uB300 / \uCD95\uC18C \uB17C\uB9AC
-FR-Designer-QQLogin-Determine=\uACB0\uC815
-FR-Designer-QQLogin-Cancel=\uCDE8\uC18C
-FR-Designer-Reuse_Manager=
 FR-Designer_Layout_Block_Absolute=
 FR-Designer_Layout_Block_Tab=
 FR-Designer_Layout_Block_Blank=
@@ -436,7 +387,6 @@ FR-Designer_Attr_Layout=
 FR-Designer_Attr_Layout_Type=
 FR-Designer_Attr_Bidirectional_Adaptive=
 FR-Designer-Selected_Widget=
-FR-Designer_SimpleDetail_Report=
 FR-Designer_Download_Template=
 FR-Designer_Install_Template=
 FR-Designer_Mobile-Refresh=
@@ -495,11 +445,6 @@ FR-Designer_FormulaPane_Search=\uAC80\uC0C9
 FR-Designer_Tab_carousel=
 FR-Designer_setCarousel=
 FR-Designer_carouselInterval=
-FR-Designer_ClassName_panel=\uD074\uB798\uC2A4\uB124\uC784
-FR-Designer_Description_panel=\uC124\uBA85
-FR-Designer_Edit_panel=\uD3B8\uC9D1
-FR-Designer_Property_panel=\uC18D\uC131
-FR-Designer_Select_panel=\uC120\uD0DD
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=\uAE30\uC785\uD604\uC7AC\uD3B8\uC9D1\uD589\uBC30\uACBD\uC124\uC815
 FR-Designer_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C\uC54C\uB9BC
@@ -563,11 +508,9 @@ FR-Designer_Too_Large_To_Paste=
 FR-Designer_COMMUNITY_QUESTIONS=
 FR-Designer_COMMUNITY_NEED=
 FR-Designer_WidgetOrder=
-FR-Designer_Button-OK=
 FR-Designer_Mobile-Warning=
 FR-Designer_COMMUNITY=
 FR-Designer_Mobile_Form_Analysis_Annotation=
-FR-Designer-Invalid_Page_Number=
 FR-Designer_Form-Forzen-Speed=
 FR-Designer_Properties_Mobile=
 FR-Designer_AllCategories=
@@ -575,16 +518,13 @@ FR-Designer_COMMUNITY_VIDEO=
 FR-Designer_Too_Small_To_Paste=
 FR-Designer_COMMUNITY_HELP=
 FR-Designer_Mobile-Zoom=
-FR-Designer_SimpleCross_Report=
 FR-Designer_Mobile-Horizontal=
 FR-Designer_Form-Fit-Tip=
 FR-Designer_Mobile-Vertical=
-FR-Designer_Button-Cancel=
 FR-Designer_LocalWidget=
 FR-Designer_COMMUNITY_SIGN=
 FR-Designer_TableData-Default-Para=
 FR-Designer_Edit_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uD3B8\uC9D1
-FR-Designer_Mobile-Open=
 FR-Designer_Form-Frozen-Tip=
 FR-Designer_Remove_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uC81C\uAC70
 FR-Designer_Allow-Blank=
@@ -593,7 +533,6 @@ FR-Designer_formDesignerModule=
 FR-Designer_COMMUNITY_UPDATE=
 FR-Designer_Delete_Template=
 FR-Designer_Mobile_Report_Analysis_Annotation=
-FR-Designer_DoubleLayer_Report=
 FR-Designer_Validate=
 CellWrite-InsertRow_NULL=\uB110\uAC12
 DashBoard-ChartFloat=\uCC28\uD2B8
@@ -936,7 +875,6 @@ Day=\uC77C
 External=\uBC14\uAE65
 Black_Font=\uD751\uCCB4
 LOG-Report_Server_IS_Started=\uBB38\uC11C\uC11C\uBC84\uC2E4\uD589\uC911
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=\uC54C\uB9BC\: B1\uC744\uC785\uB825\uD558\uC5EC\uCCAB\uBC88\uC9F8\uD589\uB450\uBC88\uC9F8\uC5F4\uC758\uB370\uC774\uD130\uB97C\uC785\uB825\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.
 FR-Designer_ChooseOneButton=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC120\uD0DD\uD6C4\uCD94\uAC00\uD574\uC8FC\uC2ED\uC2DC\uC624
 Widget-Sizing=\uD06C\uAE30\uC870\uC815
 NO_Border_Line=\uD14C\uB450\uB9AC\uC120\uC5C6\uC74C
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=\uB808\uCF54\uB4DC\uC218\uAC00~\uC774\uC0C1\uC77C\uB54C\uB514\
 BorderLayout-South=\uB0A8
 Export-Text=\uD14D\uC2A4\uD2B8\uD30C\uC77C(\uD0ED\uAE30\uD638\uB85C\uAD6C\uBD84)
 JavaScript-Synch=\uB3D9\uAE30\uD654
-FR-App-All_Warning=\uACBD\uACE0
 M_Edit-Send_Backward=\uC544\uB798\uB85C\uC774\uB3D9\u4E00\uACC4\uCE35(B)
 Form-Layout=\uB808\uC774\uC544\uC6C3
 FR-Designer-Plugin_Shop_Need_Update=\uC704\uC82F \uC5EC\uBD80\uB97C \uC5C5\uB370\uC774\uD2B8, \uC0C8 \uBC84\uC804\uC744 \uC800\uC7A5?
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=
 Delay=\uC9C0\uC5F0
 FR-Designer-All_MSBold=\uB9C8\uC774\uD06C\uB85C\uC18C\uD504\uD2B8 Yahei
 Utils-Now_create_connection=\uB370\uC774\uD130\uB9C1\uD06C\uC0DD\uC131\uC911
-FR-Template-Path_chooseRightPath=\uC815\uD655\uD55C\uACBD\uB85C\uB97C\uC120\uD0DD\uD574\uC8FC\uC2ED\uC2DC\uC624.
 FR-Remote_Re_Connect_to_Server=\uC11C\uBC84\uAC00\uB2EB\uD600\uC788\uC2B5\uB2C8\uB2E4.\uB2E4\uC2DC\uC11C\uBC84\uB97C\uC5F0\uACB0\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 Nation=\uAD6D\uAC00
 DBCP_MAX_WAIT=\uCD5C\uB300\uB300\uAE30\uC2DC\uAC04
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=\uC0AC\uC120\uC0BD\uC785
 FR-Designer-Plugin_Plugin_Description=\uD50C\uB7EC\uADF8\uC778\uC124\uBA85
 ExpandD-Not_Expand=\uD655\uC7A5\uD558\uC9C0\uC54A\uC74C
 Utils-Bottom_to_Top=\uC544\uB798\uC11C\uC704\uB85C
-Collect-Click\!_Get_user_information_code=\!\uB97C\uD074\uB9AD\uD558\uC5EC\uD65C\uC131\uCF54\uB4DC\uB97C\uC5BB\uC2B5\uB2C8\uB2E4.
 FR-Already_exist=\uD604\uC7AC\uD658\uACBD\uC774\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4\:
 Send=\uBC1C\uC1A1
 M_Edit-Clear_All=\uBAA8\uB450 (A)
@@ -1996,7 +1931,6 @@ FR-Designer_Parameter=\uB9E4\uAC1C\uBCC0\uC218
 FR-Designer-Plugin_Plugin=\uD50C\uB7EC\uADF8\uC778
 FR-Designer_Background=\uBC30\uACBD
 Template=\uD15C\uD50C\uB9BF
-
 FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
@@ -2008,4 +1942,5 @@ Default=\uAE30\uBCF8
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=\uC81C\uACF5\uBAA8\uB450\uC120\uD0DD
 FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
-FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
\ No newline at end of file
+FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
+
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index e0bd4bf8d3..b02c6d1942 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D
 FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001
-FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A
 FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8BB0\u5BC6\u7801
 FR-Designer-BBSLogin_Login=\u767B\u5F55
 FR-Designer-BBSLogin_Login-Failure-Tip=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u9646
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
 FR-Designer-BBSLogin_Register-Account=\u6CE8\u518C\u8D26\u53F7
 FR-Designer-BBSLogin_Switch-Account=\u5207\u6362\u8D26\u53F7
 FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u6D88\u606F
-FR-Designer-BBSLogin_Times=\u6B21
 FR-Designer-BBSLogin_Username-Empty-Tip=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A
 FR-Designer-Basic_More_Color=\u66F4\u591A\u989C\u8272
 FR-Designer-Estate_Any=\u4E0D\u9650
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=Excel\u8F93\u51FA(\u5206\u9875\u5BFC\u51FA)
 FR-Designer-Output_Excel_Sheet=Excel\u8F93\u51FA(\u5206\u9875\u5206Sheet\u5BFC\u51FA)
 FR-Designer-Output_Excel_Simple=Excel\u8F93\u51FA(\u539F\u6837\u5BFC\u51FA)
 FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u5F00\u53D1\u4E2D\uFF0C\u656C\u8BF7\u671F\u5F85
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7EA7
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=\u6B63\u5728\u68C0\u6D4BJar\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Checking_Version_Update=\u6B63\u5728\u68C0\u6D4B\u7248\u672C\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Update=\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Upgrade=\u5347\u7EA7
-FR-Desinger-Plugin_Updater_Restore=\u8FD8\u539F
-FR-Desinger-Plugin_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C
-FR-Desinger-Plugin_Updater_JarUpdate=Jar\u5305\u66F4\u65B0\uFF1A
-FR-Desinger-Plugin_Updater_VersionUpgrade=\u7248\u672C\u5347\u7EA7\uFF1A
-FR-Desinger-Plugin_Updater_Previous_Version=\u5230\u4EE5\u524D\u7684\u7248\u672C\uFF1F
-FR-Desinger-Plugin_Updater_Current_Version=\u5F53\u524D\u7248\u672C\uFF1A
-FR-Desinger-Plugin_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88C5\u7248\u672C
-FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u7248\u672C\uFF1A
-FR-Desinger-Plugin_Updater_Jar_Downloading=\u6B63\u5728\u7B49\u5F85jar\u5305\u4E0B\u8F7D\u5B8C\u6210
-FR-Desinger-Plugin_Updater_Version_Downloading=\u6B63\u5728\u7B49\u5F85\u5347\u7EA7\u5305\u4E0B\u8F7D\u5B8C\u6210
-FR-Desinger-Plugin_Updater_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52A1\u5668
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u65E0\u6CD5\u8FDE\u63A5\u7248\u672C\u5347\u7EA7\u670D\u52A1\u5668
-FR-Desinger-Plugin_Updater_Already_Latest_Version=\u5DF2\u7ECF\u662F\u6700\u65B0\u7248\u672C
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u5DF2\u5C06\u65E7jar\u5305\u5907\u4EFD\u5230\uFF1A
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u5DF2\u5C06\u65E7\u7248\u672C\u5305\u5907\u4EFD\u5230\uFF1A
-FR-Desinger-Plugin_Updater_Please_Restart=\uFF0C\u8BF7\u91CD\u542F\u8BBE\u8BA1\u5668
-FR-Desinger-Plugin_Updater_Jar_Restore=Jar\u5305\u8FD8\u539F
-FR-Desinger-Plugin_Updater_Version_Restore=\u7248\u672C\u8FD8\u539F
-FR-Desinger-Plugin_Updater_Restore_To=\u8FD8\u539F\u5230
-FR-Desinger-Plugin_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u542F\u751F\u6548
 FR-Designer-Submit_Condition=\u6761\u4EF6
-FR-Designer-Widget-Title_border=\u8FB9\u6846
-FR-Designer-Widget-Title_border_color=\u989C\u8272
 FR-Designer_AbsoluteLayout=\u7EDD\u5BF9\u5E03\u5C40
 FR-Designer_Allow_Decimals=\u5141\u8BB8\u5C0F\u6570
 FR-Designer_Allow_Negative=\u5141\u8BB8\u8D1F\u503C
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=\u5FEB\u6377\u952E
 FR-Designer_Button-Icon=\u6309\u94AE\u56FE\u6807
 FR-Designer_Button-Name=\u6309\u94AE\u540D\u79F0
 FR-Designer_Button-Type=\u6309\u94AE\u7C7B\u578B
-FR-Designer_CardLayout=Tab\u5E03\u5C40
 FR-Designer_Cell=\u5355\u5143\u683C
 FR-Designer_Chart_Cell=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u5355\u5143\u683C
 FR-Designer_Chart_Float=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u60AC\u6D6E\u5143\u7D20
 FR-Designer_Chart_Float_chart=\u56FE\u8868\u8D85\u94FE-\u60AC\u6D6E\u7A97\u56FE\u8868
-FR-Designer_Check-for-Updates=\u68C0\u67E5\u66F4\u65B0
 FR-Designer_Choose-Data-Confusion-Tip=\ \u8BF7\u9009\u62E9\u9700\u8981\u6DF7\u6DC6\u7684\u5B57\u6BB5\u540E\u9884\u89C8
 FR-Designer_Close=\u5173\u95ED
 FR-Designer_Column=\u5217
 FR-Designer_Column_Measure=\u5217\u8F74/\u5EA6\u91CF\u503C
 FR-Designer_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027
-FR-Designer_Confusion-Col-Name=\u5B57\u6BB5\u540D\u79F0
 FR-Designer_Confusion-key=\u6DF7\u6DC6\u5173\u952E\u5B57
 FR-Designer_Currency_Line=\u91D1\u989D\u7EBF
 FR-Designer_Current_tab=\u5F53\u524D\u7F16\u8F91tab
@@ -99,7 +67,6 @@ FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u7248
 FR-Designer_File=\u6587\u4EF6
 FR-Designer_Filter_Conditions=\u8FC7\u6EE4\u6761\u4EF6
 FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u5E76\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9002\u5E94
 FR-Designer_Fit=\u81EA\u9002\u5E94
 FR-Designer_Font-Family=\u5B57\u4F53\u540D\u79F0
 FR-Designer_Font-Size=\u5B57\u4F53\u5927\u5C0F
@@ -131,15 +98,12 @@ FR-Designer_Length=\u957F\u5EA6
 FR-Designer_Loading_Data=\u6B63\u5728\u52A0\u8F7D\u6570\u636E
 FR-Designer_M-Exit=\u9000\u51FA
 FR-Designer_Allow-Blank=\u5141\u8BB8\u4E3A\u7A7A
-FR-Designer_M-Help=\u5E2E\u52A9
 FR-Designer_M-Insert=\u63D2\u5165
 FR-Designer_M-Repeat-Freeze=\u91CD\u590D\u4E0E\u51BB\u7ED3\u8BBE\u7F6E
 FR-Designer_M-Server=\u670D\u52A1\u5668
 FR-Designer_M-SwitchWorkspace=\u5207\u6362\u5DE5\u4F5C\u76EE\u5F55
 FR-Designer_M-Template=\u6A21\u677F
 FR-Designer_MDX_Explain=\u8BED\u6CD5\u683C\u5F0F\u53C2\u8003MDX\u8BED\u6CD5\u3002\n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u6CE8\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\uFF0C\u67E5\u8BE2\u8F74\u53EA\u652F\u6301\u8FD4\u56DE\u4E24\u4E2A\u8F74\u3002
-FR-Designer_M_Help-About_Software=\u5173\u4E8E\u8F6F\u4EF6
-FR-Designer_M_Help-Tutorial=\u5E2E\u52A9\u6559\u7A0B
 FR-Designer_Max_Value=\u6700\u5927\u503C
 FR-Designer_Min_Value=\u6700\u5C0F\u503C
 FR-Designer_MobilePhone=\u624B\u673A
@@ -155,7 +119,6 @@ FR-Designer_PostCode=\u90AE\u7F16
 FR-Designer_Present=\u5F62\u6001
 FR-Designer_Preview=\u9884\u89C8
 FR-Designer_Preview-Data-Confusion=\u9884\u89C8\u6DF7\u6DC6\u540E\u7684\u6570\u636E
-FR-Designer_Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Query_Type=\u67E5\u8BE2\u65B9\u5F0F
 FR-Designer_Refresh=\u5237\u65B0
 FR-Designer_Refresh_Parameter_In_SQL=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53C2\u6570
@@ -177,15 +140,12 @@ FR-Designer_Song_TypeFace=\u5B8B\u4F53
 FR-Designer_Start-Date=\u8D77\u59CB\u65E5\u671F
 FR-Designer_Subscript=\u4E0B\u6807
 FR-Designer_Superscript=\u4E0A\u6807
-FR-Designer_Support_QQ=\u6280\u672FQQ
 FR-Designer_Swatch=\u6837\u54C1
-FR-Designer_Tab_title=tab\u6807\u9898
 FR-Designer_TableData=\u6570\u636E\u96C6
 FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u8BBA\u575B\u5E06\u85AF\u5BF9\u8BE5\u7248\u672C\u8BBE\u8BA1\u5668\u6613\u7528\u6027\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E
 FR-Designer_Thanks-To=\u9E23\u8C22
 FR-Designer_Title=\u6807\u9898
 FR-Designer_Total=\u603B\u5171
-FR-Designer_UnSignIn=\u672A\u767B\u5F55
 FR-Designer_Underline=\u4E0B\u5212\u7EBF
 FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528
 FR-Designer_User-defined-MDX=\u81EA\u5B9A\u4E49MDX\u67E5\u8BE2
@@ -203,7 +163,6 @@ FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7EF4\u6570\u636E\u96C6\u53D6\
 FR-Designer_bold=\u52A0\u7C97
 FR-Designer_font=\u5B57\u4F53
 FR-Designer_italic=\u659C\u4F53
-FR-Designer_product_feedback=\u4EA7\u54C1\u53CD\u9988
 FR-Designer_XMLA=\u591A\u7EF4\u6570\u636E\u5E93
 FR-Designer-StyleAlignment_Layout_Default=\u9ED8\u8BA4
 FR-Designer-StyleAlignment_Layout_Image_Titled=\u5E73\u94FA
@@ -237,7 +196,6 @@ FR-Designer_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
 FR-Designer_Chart_Acc_Set=\u7CBE\u786E\u8BBE\u7F6E
 FR-Designer_Gradient-Color=\u6E10\u53D8\u8272
 FR-Designer_DEFAULT=\u9ED8\u8BA4
-FR-Designer_chart-PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272
 FR-Designer_Chart-PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272
 FR-Designer_Already_exist=\u5F53\u524D\u73AF\u5883\u5DF2\u5B58\u5728\:
 FR-Designer_Database=\u6570\u636E\u5E93
@@ -358,8 +316,6 @@ FR-Designer_KeyPoint=\u5173\u952E\u8282\u70B9
 FR-Designer_loadedTreeModel=\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
 FR-Designer-Failed_to_load_the_plugin=\u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6\uFF0C\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF1A
 FR-Designer-Plugin_Please_Update_Jar=\u8BF7\u66F4\u65B0Jar\u5305\u81F3\:
-FR-Designer-Invalid_Page_Number=\u65E0\u6548\u9875\u7801
-FR-Designer_Get-CubeGetting=\u83B7\u53D6cube
 FR-Designer_XMLA_Database=\u6570\u636E\u5E93
 FR-Designer_XMLA_UserName=\u7528\u6237\u540D
 FR-Designer_XMLA_Password=\u5BC6\u7801
@@ -381,7 +337,6 @@ FR-Designer_Copy=\u590D\u5236
 FR-Designer_Log=\u65E5\u5FD7
 FR-Designer-Plugin_Expire_Dialog_Title=\u63D2\u4EF6\u8FC7\u671F
 FR-Designer-Plugin_Expire_Dialog_Text=\u63D2\u4EF6\u8FC7\u671F,\u8BF7\u524D\u5F80\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3\u8FDB\u884C\u8D2D\u4E70\u3002
-FR-Designer-Plugin_Finerest_Addon=\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3
 FR-Designer_Performance_First=\u6027\u80FD\u4F18\u5148
 FR-Designer_Total_N_Grade=\u603B\u5171\:${N}\u5C42
 FR-Designer-BBSLogin_Login-Title=\u8BBA\u575B\u8D26\u53F7\u767B\u9646
@@ -419,7 +374,6 @@ FR-Designer_Current_Preview_Rows=\u5F53\u524D\u9884\u89C8\u884C\u6570
 FR-Designer_Data=\u6570\u636E
 FR-Designer_Error=\u9519\u8BEF
 FR-Designer_formDesignerModule=\u8868\u5355\u8BBE\u8BA1\u5668\u6A21\u5757
-FR-Designer-Website_Url=http\://www.finereport.com/
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D
 FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40
 FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027
@@ -435,24 +389,17 @@ FR-Designer_COMMUNITY_BUG=BUG\u53CD\u9988
 FR-Designer_COMMUNITY_SIGN=\u5E06\u8F6F\u8BA4\u8BC1
 FR-Designer_COMMUNITY_QUESTIONS=\u95EE\u9898\u6C42\u52A9
 FR-Designer_Mobile-Zoom=\u62A5\u8868\u7F29\u653E
-FR-Designer_Mobile-Open=\u5F00\u542F
 FR-Designer_Mobile-Warning=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u8D85\u8FC7\u663E\u793A\u533A\u57DF\u768480%
-FR-Designer_Button-OK=\u77E5\u9053\u4E86
-FR-Designer_Button-Cancel=\u53D6\u6D88
 FR-Designer_Write-Save-Formula=\u586B\u62A5/\u5206\u6790\u65F6\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u4E8E\u8BA1\u7B97
 FR-Designer_Export-Save-Formula=\u5BFC\u51FA/\u7F16\u8F91\u7ED3\u679C\u65F6,\u4FDD\u7559\u516C\u5F0F
 FR-Designer_Form-Fit-Tip=\u81EA\u9002\u5E94\u63D2\u4EF6
 FR-Designer_Form-Frozen-Tip=\u4F7F\u7528\u51BB\u7ED3\u65F6, \u5EFA\u8BAE\u5B89\u88C5
 FR-Designer_Form-Forzen-Speed=, \u5E76\u4F7F\u7528\u6A2A\u5411\u6216\u53CC\u5411\u81EA\u9002\u5E94\u6765\u63D0\u5347\u5C55\u73B0\u901F\u5EA6.
 FR-Designer_Attention=\u6CE8\u610F
-FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u7EC4\u4EF6\u76F8\u4E92\u91CD\u53E0
 FR-Designer_Widget_Scaling_Mode_Fit=\u9002\u5E94\u533A\u57DF
 FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u5927\u5C0F
 FR-Designer-Widget_Area_Scaling=\u7EC4\u4EF6\u533A\u57DF\u7F29\u653E
 FR-Designer-Widget_Scaling_Mode=\u7F29\u653E\u903B\u8F91
-FR-Designer-QQLogin-Determine=\u786E\u5B9A
-FR-Designer-QQLogin-Cancel=\u53D6\u6D88
-FR-Designer-Reuse_Manager=\u7EC4\u4EF6\u7BA1\u7406
 FR-Designer_TableData-Default-Para=\u6570\u636E\u96C6\u9ED8\u8BA4\u53C2\u6570
 FR-Designer_Layout_Block_Absolute=\u7EDD\u5BF9\u753B\u5E03\u5757
 FR-Designer_Layout_Block_Tab=Tab\u5757
@@ -463,9 +410,6 @@ FR-Designer_Attr_Bidirectional_Adaptive=\u53CC\u5411\u81EA\u9002\u5E94
 FR-Designer-Selected_Widget=\u5F53\u524D\u63A7\u4EF6
 FR-Designer_LocalWidget=\u672C\u5730\u7EC4\u4EF6\u5E93
 FR-Designer_AllCategories=\u6240\u6709\u5206\u7C7B
-FR-Designer_SimpleDetail_Report=\u7B80\u5355\u660E\u7EC6\u8868
-FR-Designer_SimpleCross_Report=\u7B80\u5355\u4EA4\u53C9\u8868
-FR-Designer_DoubleLayer_Report=\u53CC\u5C42\u8868\u5934
 FR-Designer_Download_Template=\u4E0B\u8F7D\u7EC4\u4EF6
 FR-Designer_Install_Template=\u5B89\u88C5\u7EC4\u4EF6
 FR-Designer_Delete_Template=\u5220\u9664\u7EC4\u4EF6
@@ -527,11 +471,6 @@ FR-Designer_FormulaPane_Search=\u641C\u7D22
 FR-Designer_Tab_carousel=tab\u8F6E\u64AD
 FR-Designer_setCarousel=\u5F00\u542F\u8F6E\u64AD
 FR-Designer_carouselInterval=\u8F6E\u64AD\u95F4\u9694
-FR-Designer_ClassName_panel=\u7C7B\u540D
-FR-Designer_Description_panel=\u63CF\u8FF0
-FR-Designer_Edit_panel=\u7F16\u8F91
-FR-Designer_Property_panel=\u5C5E\u6027
-FR-Designer_Select_panel=\u9009\u62E9
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=\u586B\u62A5\u5F53\u524D\u7F16\u8F91\u884C\u80CC\u666F\u8BBE\u7F6E
 FR-Designer_Unload_Check=\u672A\u63D0\u4EA4\u79BB\u5F00\u63D0\u793A
@@ -936,7 +875,6 @@ Day=\u5929
 External=\u5916\u90E8
 Black_Font=\u9ED1\u4F53
 LOG-Report_Server_IS_Started=\u62A5\u8868\u670D\u52A1\u5668\u5DF2\u542F\u52A8
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u8FC7\u8F93\u5165B1\u6765\u5199\u5165\u7B2C\u4E00\u884C\u7B2C\u4E8C\u5217\u7684\u6570\u636E\u3002
 FR-Designer_ChooseOneButton=\u8BF7\u9009\u62E9\u4E00\u4E2A\u63A7\u4EF6\u540E\u518D\u6DFB\u52A0
 Widget-Sizing=\u5927\u5C0F\u8C03\u6574
 NO_Border_Line=\u65E0\u6846\u7EBF
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=\u7F13\u5B58\u81F3\u78C1\u76D8\u5F53\u8BB0\u5F55\u6570\u5927\u
 BorderLayout-South=\u5357
 Export-Text=\u6587\u672C\u6587\u4EF6(\u5236\u8868\u7B26\u5206\u9694)
 JavaScript-Synch=\u540C\u6B65
-FR-App-All_Warning=\u8B66\u544A
 M_Edit-Send_Backward=\u4E0B\u79FB\u4E00\u5C42(B)
 Form-Layout=\u5E03\u5C40
 FR-Designer-Plugin_Shop_Need_Update=\u63D2\u4EF6\u5546\u5E97\u6709\u65B0\u7248\u672C,\u662F\u5426\u66F4\u65B0?
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=\u63D2\u4EF6\u9700\u8981\u4F9D\u8D56\u7684\u6
 Delay=\u5EF6\u8FDF
 FR-Designer-All_MSBold=\u5FAE\u8F6F\u96C5\u9ED1
 Utils-Now_create_connection=\u6B63\u5728\u5EFA\u7ACB\u6570\u636E\u8FDE\u63A5
-FR-Template-Path_chooseRightPath=\u8BF7\u9009\u62E9\u6B63\u786E\u8DEF\u5F84
 FR-Remote_Re_Connect_to_Server=\u670D\u52A1\u5668\u5DF2\u5173\u95ED\uFF0C\u662F\u5426\u91CD\u65B0\u8FDE\u63A5\u670D\u52A1\u5668?
 Nation=\u56FD\u5BB6
 DBCP_MAX_WAIT=\u6700\u5927\u7B49\u5F85\u65F6\u95F4
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=\u63D2\u5165\u659C\u7EBF
 FR-Designer-Plugin_Plugin_Description=\u63D2\u4EF6\u63CF\u8FF0
 ExpandD-Not_Expand=\u4E0D\u6269\u5C55
 Utils-Bottom_to_Top=\u4ECE\u4E0B\u5230\u4E0A
-Collect-Click\!_Get_user_information_code=\u70B9\u51FB\!\u83B7\u53D6\u6FC0\u6D3B\u7801
 FR-Already_exist=\u5F53\u524D\u73AF\u5883\u5DF2\u5B58\u5728\:
 Send=\u53D1\u9001
 M_Edit-Clear_All=\u5168\u90E8(A)
@@ -1996,7 +1931,6 @@ FR-Designer_Parameter=\u53C2\u6570
 FR-Designer-Plugin_Plugin=\u63D2\u4EF6
 FR-Designer_Background=\u80CC\u666F
 Template=\u6A21\u7248
-
 FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
 FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
@@ -2009,3 +1943,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u793
 FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9009
 FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
+
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 74857e53bd..4524283848 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -1,6 +1,6 @@
+# generated time: 星期二 十月 24 16:58:25 CST 2017
 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F
 FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B
-FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A
 FR-Designer-BBSLogin_Forgot-Password=\u5FD8\u8A18\u5BC6\u78BC
 FR-Designer-BBSLogin_Login=\u767B\u9304
 FR-Designer-BBSLogin_Login-Failure-Tip=\u5E33\u865F\u6216\u5BC6\u78BC\u932F\u8AA4\uFF0C\u8ACB\u91CD\u65B0\u767B\u9304
@@ -9,7 +9,6 @@ FR-Designer-BBSLogin_Password-Empty-Tip=\u5BC6\u78BC\u4E0D\u80FD\u70BA\u7A7A
 FR-Designer-BBSLogin_Register-Account=\u8A3B\u518A\u5E33\u865F
 FR-Designer-BBSLogin_Switch-Account=\u5207\u63DB\u5E33\u865F
 FR-Designer-BBSLogin_Privite-Message=\u79C1\u4EBA\u8A0A\u606F
-FR-Designer-BBSLogin_Times=\u6B21
 FR-Designer-BBSLogin_Username-Empty-Tip=\u4F7F\u7528\u8005\u70BA\u7A7A\u63D0\u793A
 FR-Designer-Basic_More_Color=\u66F4\u591A\u984F\u8272
 FR-Designer-Estate_Any=\u4E0D\u9650
@@ -27,35 +26,7 @@ FR-Designer-Output_Excel_Page=Excel(\u5206\u9801\u532F\u51FA)
 FR-Designer-Output_Excel_Sheet=Excel\u8F38\u51FA(\u5206\u9801\u5206Sheet\u532F\u51FA)
 FR-Designer-Output_Excel_Simple=Excel\u8F38\u51FA(\u539F\u6A23\u532F\u51FA)
 FR-Designer-Plugin_PluginMarket_Coding=\u63D2\u4EF6\u5546\u5E97\u6B63\u5728\u958B\u767C\u4E2D\uFF0C\u656C\u8ACB\u671F\u5F85
-FR-Desinger-Plugin_Updater_UpdateAndUpgrade=\u66F4\u65B0\u5347\u7D1A
-FR-Desinger-Plugin_Updater_Checking_Jar_Update=\u6B63\u5728\u6AA2\u6E2CJar\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Checking_Version_Update=\u6B63\u5728\u6AA2\u6E2C\u7248\u672C\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Update=\u66F4\u65B0
-FR-Desinger-Plugin_Updater_Upgrade=\u5347\u7D1A
-FR-Desinger-Plugin_Updater_Restore=\u9084\u539F
-FR-Desinger-Plugin_Updater_New_Version_Available=\u6709\u65B0\u7248\u672C
-FR-Desinger-Plugin_Updater_JarUpdate=Jar\u5305\u66F4\u65B0\uFF1A
-FR-Desinger-Plugin_Updater_VersionUpgrade=\u7248\u672C\u5347\u7D1A\uFF1A
-FR-Desinger-Plugin_Updater_Previous_Version=\u5230\u4EE5\u524D\u7684\u7248\u672C\uFF1F
-FR-Desinger-Plugin_Updater_Current_Version=\u7576\u524D\u7248\u672C\uFF1A
-FR-Desinger-Plugin_Updater_Not_Install_Version=\u4E0D\u662F\u5B89\u88DD\u7248\u672C
-FR-Desinger-Plugin_Updater_Latest_Version=\u6700\u65B0\u7248\u672C\uFF1A
-FR-Desinger-Plugin_Updater_Jar_Downloading=\u6B63\u5728\u7B49\u5F85jar\u5305\u4E0B\u8F09\u5B8C\u6210
-FR-Desinger-Plugin_Updater_Version_Downloading=\u6B63\u5728\u7B49\u5F85\u5347\u7D1A\u5305\u4E0B\u8F09\u5B8C\u6210
-FR-Desinger-Plugin_Updater_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668
-FR-Desinger-Plugin_Updater_Connect_VersionUpdateServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u66F4\u65B0\u670D\u52D9\u5668
-FR-Desinger-Plugin_Updater_Connect_VersionUpgradeServer_Failed=\u7121\u6CD5\u9023\u63A5\u7248\u672C\u5347\u7D1A\u670D\u52D9\u5668
-FR-Desinger-Plugin_Updater_Already_Latest_Version=\u5DF2\u7D93\u662F\u6700\u65B0\u7248\u672C
-FR-Desinger-Plugin_Updater_Backup_OldJar_To=\u5DF2\u5C07\u820Ajar\u5305\u5099\u4EFD\u5230\uFF1A
-FR-Desinger-Plugin_Updater_Backup_OldVersion_To=\u5DF2\u5C07\u820A\u7248\u672C\u5305\u5099\u4EFD\u5230\uFF1A
-FR-Desinger-Plugin_Updater_Please_Restart=\uFF0C\u8ACB\u91CD\u555F\u8A2D\u8A08\u5668
-FR-Desinger-Plugin_Updater_Jar_Restore=Jar\u5305\u9084\u539F
-FR-Desinger-Plugin_Updater_Version_Restore=\u7248\u672C\u9084\u539F
-FR-Desinger-Plugin_Updater_Restore_To=\u9084\u539F\u5230
-FR-Desinger-Plugin_Updater_WorksAfterRestart=\u7248\u672C\uFF0C\u91CD\u555F\u751F\u6548
 FR-Designer-Submit_Condition=\u63D0\u4EA4\u689D\u4EF6
-FR-Designer-Widget-Title_border=\u6A19\u984C\u6846\u7DDA
-FR-Designer-Widget-Title_border_color=\u6A19\u984C\u6846\u7DDA\u984F\u8272
 FR-Designer_AbsoluteLayout=\u7D55\u5C0D\u4F48\u5C40
 FR-Designer_Allow_Decimals=\u5141\u8A31\u5C0F\u6578
 FR-Designer_Allow_Negative=\u5141\u8A31\u8CA0\u503C
@@ -69,18 +40,15 @@ FR-Designer_Button-Hotkeys=\u5FEB\u6377\u9375
 FR-Designer_Button-Icon=\u6309\u9215\u5716\u793A
 FR-Designer_Button-Name=\u6309\u9215\u540D\u7A31
 FR-Designer_Button-Type=\u6309\u9215\u985E\u578B
-FR-Designer_CardLayout=\u5361\u7247\u8A2D\u8A08
 FR-Designer_Cell=\u5132\u5B58\u683C
 FR-Designer_Chart_Cell=\u5716\u8868\u5132\u5B58\u683C
 FR-Designer_Chart_Float=\u5716\u8868\u8D85\u93C8-\u806F\u52D5\u61F8\u6D6E\u5143\u7D20
 FR-Designer_Chart_Float_chart=\u5716\u8868\u8D85\u93C8-\u61F8\u6D6E\u7A97\u5716\u8868
-FR-Designer_Check-for-Updates=\u6AA2\u67E5\u66F4\u65B0
 FR-Designer_Choose-Data-Confusion-Tip=\u8ACB\u9078\u64C7\u9700\u8981\u6DF7\u6DC6\u7684\u6B04\u4F4D\u5F8C\u9810\u89BD
 FR-Designer_Close=\u95DC\u9589
 FR-Designer_Column=\u6B04
 FR-Designer_Column_Measure=\u6B04\u4F4D\u6E2C\u91CF
 FR-Designer_Condition_Attributes=\u689D\u4EF6\u5C6C\u6027
-FR-Designer_Confusion-Col-Name=\u6B04\u4F4D\u540D\u7A31
 FR-Designer_Confusion-key=\u6DF7\u6DC6\u95DC\u9375\u5B57
 FR-Designer_Currency_Line=\u9322\u5E63\u7DDA
 FR-Designer_Current_tab=\u7576\u524D\u7DE8\u8F2FTab
@@ -99,7 +67,6 @@ FR-Designer_FS_Close_Other_Templates=\u95DC\u9589\u5176\u4ED6\u7BC4\u672C
 FR-Designer_File=\u6A94\u6848
 FR-Designer_Filter_Conditions=\u904E\u6FFE\u689D\u4EF6
 FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u4E26\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9069\u61C9
 FR-Designer_Fit=\u81EA\u9069\u61C9
 FR-Designer_Font-Family=\u5B57\u9AD4\u540D\u7A31
 FR-Designer_Font-Size=\u5B57\u9AD4\u5927\u5C0F
@@ -130,15 +97,12 @@ FR-Designer_Layout_Constraints=\u898F\u5283\u7D04\u675F
 FR-Designer_Length=\u9577\u5EA6
 FR-Designer_Loading_Data=\u6B63\u5728\u8F09\u5165\u8CC7\u6599
 FR-Designer_M-Exit=\u9000\u51FA
-FR-Designer_M-Help=\u8AAA\u660E
 FR-Designer_M-Insert=\u63D2\u5165
 FR-Designer_M-Repeat-Freeze=\u91CD\u8907\u8207\u51CD\u7D50
 FR-Designer_M-Server=\u4F3A\u670D\u5668
 FR-Designer_M-SwitchWorkspace=\u5207\u63DB\u5DE5\u4F5C\u5340\u9593
 FR-Designer_M-Template=\u7BC4\u672C
 FR-Designer_MDX_Explain=\u8A9E\u6CD5\u683C\u5F0F\u53C3\u8003MDX\u8A9E\u6CD5\u3002\n\u4F8B\u5982\uFF1A\nWITH\nMEMBER [Measures].[Special Discount] AS\n[Measures].[Discount Amount] * 1.5\nSELECT\n[Measures].[Special Discount] on COLUMNS,\nNON EMPTY [Product].[Product].MEMBERS  ON Rows\nFROM [Adventure Works]\nWHERE [Product].[Category].[Bikes]\n\u8A3B\uFF1ACOLUMNS\u3001ROWS\u53EF\u4EE5\u4F7F\u75280\u30011\u4EE3\u66FF\u67E5\u8EF8\u53EA\u652F\u63F4\u8FD4\u56DE\u5169\u500B\u8EF8\u3002
-FR-Designer_M_Help-About_Software=\u95DC\u65BC\u8EDF\u9AD4
-FR-Designer_M_Help-Tutorial=\u64CD\u4F5C\u8AAA\u660E
 FR-Designer_Max_Value=\u6700\u5927\u503C
 FR-Designer_Min_Value=\u6700\u5C0F\u503C
 FR-Designer_MobilePhone=\u624B\u6A5F
@@ -154,7 +118,6 @@ FR-Designer_PostCode=\u90F5\u905E\u5340\u865F
 FR-Designer_Present=\u6A21\u5F0F
 FR-Designer_Preview=\u9810\u89BD
 FR-Designer_Preview-Data-Confusion=\u6DF7\u6DC6\u8CC7\u6599\u9810\u89BD
-FR-Designer_Product_Demo=\u7522\u54C1\u5C55\u793A
 FR-Designer_Query_Type=\u67E5\u8A62\u985E\u578B
 FR-Designer_Refresh=\u91CD\u65B0\u6574\u7406
 FR-Designer_Refresh_Parameter_In_SQL=\u5728SQL\u4E2D\u91CD\u65B0\u6574\u7406\u7684\u53C3\u6578
@@ -176,15 +139,12 @@ FR-Designer_Song_TypeFace=\u5B8B\u9AD4
 FR-Designer_Start-Date=\u958B\u59CB\u65E5\u671F
 FR-Designer_Subscript=\u4E0B\u6A19
 FR-Designer_Superscript=\u4E0A\u6A19
-FR-Designer_Support_QQ=\u652F\u63F4QQ
 FR-Designer_Swatch=\u6A23\u54C1
-FR-Designer_Tab_title=tab\u6A19\u984C
 FR-Designer_TableData=\u8CC7\u6599\u96C6
 FR-Designer_Thank_guest=\u611F\u8B1D\u5BA2\u6236
 FR-Designer_Thanks-To=\u9CF4\u8B1D
 FR-Designer_Title=\u6A19\u984C
 FR-Designer_Total=\u7E3D\u5171
-FR-Designer_UnSignIn=\u672A\u767B\u9304
 FR-Designer_Underline=\u5E95\u7DDA
 FR-Designer_Used=\u6700\u8FD1\u4F7F\u7528
 FR-Designer_User-defined-MDX=\u81EA\u5B9A\u7FA9MDX\u67E5\u8A62
@@ -201,7 +161,6 @@ FR-Designer_XMLA_Explain=\u5728\u4F7F\u7528\u591A\u7DAD\u8CC7\u6599\u96C6\u53D6\
 FR-Designer_bold=\u7C97\u9AD4
 FR-Designer_font=\u5B57\u9AD4
 FR-Designer_italic=\u659C\u9AD4
-FR-Designer_product_feedback=\u554F\u984C\u53CD\u994B
 FR-Designer_SampleText=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C
 FR-Designer_XMLA=\u591A\u7DAD\u8CC7\u6599\u5EAB
 FR-Designer-StyleAlignment_Layout_Default=\u9810\u8A2D
@@ -236,7 +195,6 @@ FR-Designer_Save_Path=\u5B58\u5132\u8DEF\u5F91
 FR-Designer_Chart_Acc_Set=\u7CBE\u78BA\u8A2D\u5B9A
 FR-Designer_Gradient-Color=\u6F38\u8B8A\u8272
 FR-Designer_DEFAULT=\u9810\u8A2D
-FR-Designer_chart-PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272
 FR-Designer_Chart-PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272
 FR-Designer_Already_exist=\u7576\u524D\u74B0\u5883\u5DF2\u5B58\u5728
 FR-Designer_Database=\u8CC7\u6599\u5EAB
@@ -357,8 +315,6 @@ FR-Designer_KeyPoint=\u95DC\u9375\u7BC0\u9EDE
 FR-Designer_loadedTreeModel=\u52A0\u8F09\u5931\u6557,\u8ACB\u6AA2\u67E5\u5F8C\u91CD\u8A66
 FR-Designer-Failed_to_load_the_plugin=\u7121\u6CD5\u52A0\u8F09\u63D2\u4EF6\uFF0C\u8ACB\u66F4\u65B0\u63D2\u4EF6\uFF1A
 FR-Designer-Plugin_Please_Update_Jar=\u8ACB\u66F4\u65B0Jar\u5305\u81F3\:
-FR-Designer-Invalid_Page_Number=\u7121\u6548\u9801\u78BC
-FR-Designer_Get-CubeGetting=\u7372\u53D6cube
 FR-Designer_XMLA_Database=\u8CC7\u6599\u5EAB
 FR-Designer_XMLA_UserName=\u5E33\u865F
 FR-Designer_XMLA_Password=\u5BC6\u78BC
@@ -380,7 +336,6 @@ FR-Designer_Clear_All=\u6E05\u9664\u5168\u90E8
 FR-Designer_Log=\u65E5\u8A8C
 FR-Designer-Plugin_Expire_Dialog_Title=\u63D2\u4EF6\u904E\u671F
 FR-Designer-Plugin_Expire_Dialog_Text=\u63D2\u4EF6\u904E\u671F,\u8ACB\u524D\u5F80\u5E06\u8EDF\u61C9\u7528\u4E2D\u5FC3\u9032\u884C\u8CFC\u8CB7\u3002
-FR-Designer-Plugin_Finerest_Addon=\u5E06\u8F6F\u5E94\u7528\u4E2D\u5FC3
 FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148
 FR-Designer_Total_N_Grade=\u7E3D\u5171\:${N}\u5C64
 FR-Designer-BBSLogin_Login-Title=\u8AD6\u58C7\u8CEC\u865F\u767B\u9678
@@ -417,7 +372,6 @@ FR-Designer_Current_Preview_Rows=\u7576\u524D\u9810\u89BD\u5217\u6578
 FR-Designer_Data=\u8CC7\u6599
 FR-Designer_Error=\u932F\u8AA4
 FR-Designer_formDesignerModule=\u8868\u55AE\u8A2D\u8A08\u5668\u6A21\u584A
-FR-Designer-Website_Url=http\://www.finereport.com/tw
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u9304\u5F8C\u624D\u80FD\u4E0B\u8F09
 FR-Designer-App_ReLayout=\u624B\u6A5F\u91CD\u4F48\u5C40
 FR-Designer_Mobile-Attr=\u79FB\u52D5\u7AEF\u5C6C\u6027
@@ -432,25 +386,18 @@ FR-Designer_COMMUNITY_HELP=\u5E6B\u52A9\u6587\u6A94
 FR-Designer_COMMUNITY_VIDEO=\u5165\u9580\u8996\u983B
 FR-Designer_COMMUNITY_BBS=\u5E06\u8EDF\u8AD6\u58C7
 FR-Designer_COMMUNITY=\u793E\u5340
-FR-Designer_Mobile-Open=\u958B\u555F
 FR-Designer_Mobile-Zoom=\u5831\u8868\u7E2E\u653E
 FR-Designer_Mobile-Warning=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u8D85\u904E\u986F\u793A\u5340\u57DF\u768480%
-FR-Designer_Button-OK=\u77E5\u9053\u4E86
-FR-Designer_Button-Cancel=\u53D6\u6D88
 FR-Designer_Write-Save-Formula=\u586B\u5831/\u5206\u6790\u6642\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u65BC\u8A08\u7B97
 FR-Designer_Export-Save-Formula=\u532F\u51FA/\u7DE8\u8F2F\u7D50\u679C\u6642,\u4FDD\u7559\u516C\u5F0F
 FR-Designer_Form-Fit-Tip=\u81EA\u9069\u61C9\u63D2\u4EF6
 FR-Designer_Form-Frozen-Tip=\u4F7F\u7528\u51CD\u7D50\u6642, \u5EFA\u8B70\u5B89\u88DD
 FR-Designer_Form-Forzen-Speed=, \u5E76\u4F7F\u7528\u6A6B\u5411\u6216\u96D9\u5411\u81EA\u9069\u61C9\u4F86\u63D0\u5347\u5C55\u73FE\u901F\u5EA6.
 FR-Designer_Attention=\u6CE8\u610F
-FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u7D44\u4EF6\u76F8\u4E92\u91CD\u758A
 FR-Designer_Widget_Scaling_Mode_Fit=\u9069\u61C9\u5340\u57DF
 FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u5927\u5C0F
 FR-Designer-Widget_Area_Scaling=\u7D44\u4EF6\u5340\u57DF\u7E2E\u653E
 FR-Designer-Widget_Scaling_Mode=\u7E2E\u653E\u908F\u8F2F
-FR-Designer-QQLogin-Determine=\u78BA\u5B9A
-FR-Designer-QQLogin-Cancel=\u53D6\u6D88
-FR-Designer-Reuse_Manager=\u7D44\u4EF6\u7BA1\u7406
 FR-Designer_TableData-Default-Para=\u6578\u64DA\u96C6\u9ED8\u8A8D\u53C3\u6578
 FR-Designer_Layout_Block_Absolute=\u7D55\u5C0D\u756B\u5E03\u584A
 FR-Designer_Layout_Block_Tab=Tab\u584A
@@ -515,11 +462,6 @@ FR-Designer_FormulaPane_Search=\u641C\u7D22
 FR-Designer_Tab_carousel=Tab\u8F2A\u64AD
 FR-Designer_setCarousel=\u958B\u555F\u8F2A\u64AD
 FR-Designer_carouselInterval=\u8F2A\u64AD\u9593\u9694
-FR-Designer_ClassName_panel=\u985E\u540D
-FR-Designer_Description_panel=\u63CF\u8FF0
-FR-Designer_Edit_panel=\u7DE8\u8F2F
-FR-Designer_Property_panel=\u5C6C\u6027
-FR-Designer_Select_panel=\u9078\u64C7
 FR-Designer_LayoutTable_Column_Width=160
 FR-Designer_Set_BG_Of_Current_Row=\u586B\u5831\u7576\u524D\u7DE8\u8F2F\u5217\u80CC\u666F\u8A2D\u5B9A
 FR-Designer_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B\u63D0\u793A
@@ -581,11 +523,9 @@ FR-Designer_Style=\u6A23\u5F0F
 FR-Designer_Color=\u984F\u8272
 FR-Designer_Border=\u6846\u7DDA
 FR-Designer_Background-Pattern=\u5716\u6848
-FR-Designer_SimpleDetail_Report=\u7C21\u55AE\u660E\u7D30\u8868
 FR-Designer_Reset=\u53D6\u6D88\u522A\u9664
 FR-Designer_AllCategories=\u6240\u6709\u5206\u985E
 FR-Designer-Selected_Widget=\u7576\u524D\u63A7\u5236\u9805
-FR-Designer_SimpleCross_Report=\u7C21\u55AE\u4EA4\u53C9\u8868
 FR-Designer_LocalWidget=\u672C\u5730\u7D44\u4EF6\u5EAB
 FR-Designer_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
@@ -593,7 +533,6 @@ FR-Designer_Install_Template=\u5B89\u88DD\u7D44\u4EF6
 FR-Designer_Allow-Blank=\u5141\u8A31\u70BA\u7A7A
 FR-Designer_Delete_Template=\u522A\u9664\u7D44\u4EF6
 FR-Designer_Download_Template=\u4E0B\u8F09\u7D44\u4EF6
-FR-Designer_DoubleLayer_Report=\u96D9\u5C64\u8868\u982D
 FR-Designer_Validate=\u6821\u9A57
 CellWrite-InsertRow_NULL=\u7A7A\u503C
 DashBoard-ChartFloat=\u5716\u8868
@@ -936,7 +875,6 @@ Day=\u5929
 External=\u5916\u90E8
 Black_Font=\u9ED1\u9AD4
 LOG-Report_Server_IS_Started=\u5831\u8868\u4F3A\u670D\u5668\u5DF2\u555F\u52D5
-Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u6B04\u7684\u8CC7\u6599\u3002
 FR-Designer_ChooseOneButton=\u8ACB\u9078\u64C7\u4E00\u500B\u63A7\u5236\u9805\u5F8C\u518D\u65B0\u589E
 Widget-Sizing=\u5927\u5C0F\u8ABF\u6574
 NO_Border_Line=\u7121\u6846\u7DDA
@@ -1470,7 +1408,6 @@ Max-Mem-Row-Count=\u7DE9\u5B58\u81F3\u78C1\u7247\u7576\u8A18\u9304\u6578\u5927\u
 BorderLayout-South=\u5357
 Export-Text=\u6587\u5B57\u6A94\u6848(\u88FD\u9304\u7B26\u5206\u9694)
 JavaScript-Synch=\u540C\u6B65
-FR-App-All_Warning=\u8B66\u544A
 M_Edit-Send_Backward=\u4E0B\u79FB\u4E00\u5C64(B)
 Form-Layout=\u5E03\u5C40
 FR-Designer-Plugin_Shop_Need_Update=\u63D2\u4EF6\u5546\u5E97\u6709\u65B0\u7248\u672C,\u662F\u5426\u66F4\u65B0?
@@ -1515,7 +1452,6 @@ FR-Designer-Plugin_DownLoadMessage=\u63D2\u4EF6\u9700\u8981\u4F9D\u8CF4\u7684\u6
 Delay=\u5EF6\u9072
 FR-Designer-All_MSBold=\u5FAE\u8EDF\u96C5\u9ED1
 Utils-Now_create_connection=\u6B63\u5728\u5EFA\u7ACB\u8CC7\u6599\u9023\u63A5
-FR-Template-Path_chooseRightPath=\u8ACB\u9078\u64C7\u6B63\u78BA\u8DEF\u5F91
 FR-Remote_Re_Connect_to_Server=\u4F3A\u670D\u5668\u5DF2\u95DC\u9589\uFF0C\u662F\u5426\u91CD\u65B0\u9023\u63A5\u4F3A\u670D\u5668?
 Nation=\u570B\u5BB6
 DBCP_MAX_WAIT=\u6700\u5927\u7B49\u5F85\u6642\u9593
@@ -1833,7 +1769,6 @@ M_Insert-Slope_Line=\u63D2\u5165\u659C\u7DDA
 FR-Designer-Plugin_Plugin_Description=\u63D2\u4EF6\u63CF\u8FF0
 ExpandD-Not_Expand=\u4E0D\u64F4\u5C55
 Utils-Bottom_to_Top=\u5F9E\u4E0B\u5230\u4E0A
-Collect-Click\!_Get_user_information_code=\u9EDE\u64CA\!\u7372\u53D6\u7528\u6236\u8A0A\u606F\u78BC
 FR-Already_exist=\u7576\u524D\u74B0\u5883\u5DF2\u5B58\u5728
 Send=\u767C\u9001
 M_Edit-Clear_All=\u5168\u90E8(A)
@@ -1996,7 +1931,6 @@ FR-Designer_Parameter=\u53C3\u6578
 FR-Designer-Plugin_Plugin=\u63D2\u4EF6
 FR-Designer_Background=\u586B\u6EFF\u8272\u5F69
 Template=\u7BC4\u672C
-
 FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
 FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
@@ -2010,3 +1944,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u793
 FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9078
 FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
+
diff --git a/designer_base/src/com/fr/design/style/FRFontPane.java b/designer_base/src/com/fr/design/style/FRFontPane.java
index 84801945d5..0ad4702f09 100644
--- a/designer_base/src/com/fr/design/style/FRFontPane.java
+++ b/designer_base/src/com/fr/design/style/FRFontPane.java
@@ -11,6 +11,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.Vector;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -63,18 +64,24 @@ public class FRFontPane extends BasicPane {
     private FRFontPreviewArea preview;
     
     private EventListenerList eventChangeList = new EventListenerList();
-    
-    public static  Integer[] Font_Sizes = {new Integer(6), new Integer(8), new Integer(9),
-        new Integer(10), new Integer(11), new Integer(12),
-        new Integer(14), new Integer(16), new Integer(18),
-        new Integer(20), new Integer(22), new Integer(24),
-        new Integer(26), new Integer(28), new Integer(36),
-        new Integer(48), new Integer(72)};
-    
+
+    private static final int MAX_FONT_SIZE = 100;
+
+    // 兼容调用老接口（FRFontPane.FONT_SIZES）的代码（例如图表插件）
+    public static final Vector<Integer> FONT_SIZES = getFontSizes();
+
     public FRFontPane() {
     	this.initComponents();
     }
-      
+
+    public static Vector<Integer> getFontSizes() {
+        Vector<Integer> FONT_SIZES = new Vector<Integer>();
+        for (int i = 1; i < MAX_FONT_SIZE; i++) {
+            FONT_SIZES.add(i);
+        }
+        return FONT_SIZES;
+    }
+
     protected void initComponents() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
diff --git a/designer_base/src/com/fr/design/style/FontSizeStylePane.java b/designer_base/src/com/fr/design/style/FontSizeStylePane.java
index 5e83f5ecb1..ac179f3087 100644
--- a/designer_base/src/com/fr/design/style/FontSizeStylePane.java
+++ b/designer_base/src/com/fr/design/style/FontSizeStylePane.java
@@ -51,7 +51,7 @@ public class FontSizeStylePane extends JPanel {
 
         fontVSizPane.add(Box.createHorizontalStrut(6));
 
-        JPanel sizePanel = FRFontPane.createTextFieldListPane("", 	sizeField = new UINumberField(), sizeList = new JList(FRFontPane.Font_Sizes));
+        JPanel sizePanel = FRFontPane.createTextFieldListPane("", 	sizeField = new UINumberField(), sizeList = new JList(FRFontPane.getFontSizes()));
         sizeField.setMaxDecimalLength(1);
         
         sizeField.setEditable(false);
diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 3c25fc7ff0..72a20cf939 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -10,6 +10,7 @@ import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.base.Utils;
 import com.fr.base.remote.RemoteDeziConstants;
+import com.fr.data.TableDataSource;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.Connection;
@@ -85,6 +86,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -157,6 +159,15 @@ public class RemoteEnv extends AbstractEnv {
         return password;
     }
 
+    // 修复密码中包含特殊字符，无法登录的问题
+    private String getEncodedPassword() {
+        try {
+            return URLEncoder.encode(password, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return password;
+        }
+    }
+
     public void setPassword(String password) {
         this.password = password;
         clearUserID();
@@ -382,7 +393,7 @@ public class RemoteEnv extends AbstractEnv {
         para.put("op", "fr_remote_design");
         para.put("cmd", "test_server_connection");
         para.put("user", user);
-        para.put("password", password);
+        para.put("password", getEncodedPassword());
 
         if (path.startsWith("https") && (!DesignerEnvManager.getEnvManager().isHttps())) {
             return false;
@@ -505,7 +516,7 @@ public class RemoteEnv extends AbstractEnv {
         para.put("op", "fr_remote_design");
         para.put("cmd", "r_sign_in");
         para.put("user", user);
-        para.put("password", password);
+        para.put("password", getEncodedPassword());
 
         simulaRPC(para, true);
 
@@ -1253,6 +1264,11 @@ public class RemoteEnv extends AbstractEnv {
         return DavXMLUtils.readXMLParameters(input);
     }
 
+    @Override
+    public EmbeddedTableData previewTableData(Object tableData, Map parameterMap, int rowCount) throws Exception {
+        return previewTableData(null, tableData, parameterMap, rowCount);
+    }
+
     /**
      * 根据指定的参数生成一个实际可预览的数据集
      *
@@ -1262,7 +1278,7 @@ public class RemoteEnv extends AbstractEnv {
      * @return 实际的二维数据集
      * @throws Exception 如果生成数据失败则抛出此异常
      */
-    public EmbeddedTableData previewTableData(Object tableData, java.util.Map parameterMap, int rowCount) throws Exception {
+    public EmbeddedTableData previewTableData(TableDataSource dataSource, Object tableData, java.util.Map parameterMap, int rowCount) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
         // 把tableData写成xml文件到out
@@ -1301,6 +1317,11 @@ public class RemoteEnv extends AbstractEnv {
         return previewTableData(tableData, parameterMap, -1);
     }
 
+    @Override
+    public Object previewTableData(TableDataSource dataSource, Object tableData, Map parameterMap, int start, int end, String[] cols, int[] colIdx) throws Exception {
+        return previewTableData(dataSource, tableData, parameterMap, -1);
+    }
+
     /**
      * nameValuePairs,这个参数要接着this.path,拼成一个URL,否则服务器端req.getParameter是无法得到的
      *
@@ -1990,7 +2011,7 @@ public class RemoteEnv extends AbstractEnv {
         para.put("op", "fr_remote_design");
         para.put("cmd", "design_get_designer_version");
         para.put("user", user);
-        para.put("password", password);
+        para.put("password", getEncodedPassword());
 
         HttpClient client = createHttpMethod(para, true);
         try {
diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index 5d76b6a19e..1685c07112 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/designer_base/src/com/fr/start/BaseDesigner.java
@@ -156,7 +156,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     protected void initLanguage() {
         //这两句的位置不能随便调换，因为会影响语言切换的问题
-        FRContext.setLanguage(DesignerEnvManager.getEnvManager().getLanguage());
+        FRContext.setLanguage(DesignerEnvManager.getEnvManager(false).getLanguage());
+        DesignerEnvManager.checkNameEnvMap();
     }
 
     protected void initDefaultFont() {
diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index 7c5b77f524..a9430614d9 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -10,6 +10,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
@@ -43,6 +44,10 @@ public class StartServer {
      * 找默认工作目录，不应该按照名字去找，而应该按照安装路径，因为默认工作目录的名字可能会改变。
      */
 	public static void browserDemoURL() {
+		if (FRContext.getCurrentEnv() instanceof RemoteEnv) {
+			browser(FRContext.getCurrentEnv().getPath() + "?op=fs");
+			return;
+		}
 		if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
 			String web = GeneralContext.getCurrentAppNameOfEnv();
 			browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping()
diff --git a/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java
index c38d2eb738..f0935fcfb1 100644
--- a/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java
+++ b/designer_chart/src/com/fr/design/chart/axis/ChartAlertValuePane.java
@@ -119,12 +119,8 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
 			fontNameBox.addItem(names[i]);
 		}
 		
-		fontSizeBox = new UIComboBox();
+		fontSizeBox = new UIComboBox(FRFontPane.getFontSizes());
 		fontSizeBox.setPreferredSize(new Dimension(80,20));
-		Integer[] sizes = FRFontPane.Font_Sizes;
-		for(int i = 0; i < sizes.length; i++) {
-			fontSizeBox.addItem(sizes[i]);
-		}
 		
 		double t = TableLayout.FILL;
 		double[] rowSize = {t, t, t, t, t};
diff --git a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
index 35cb979c9b..8afecdb3f2 100644
--- a/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
+++ b/designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
@@ -47,7 +47,7 @@ public class DataLabelStylePane extends BasicPane {
 		this.add(fontStyleBox = new UIComboBox(styles));
 		fontStyleBox.setPreferredSize(new Dimension(80, 20));
 		
-		this.add(sizeBox = new UIComboBox(FRFontPane.Font_Sizes));
+		this.add(sizeBox = new UIComboBox(FRFontPane.getFontSizes()));
 		sizeBox.setPreferredSize(new Dimension(80, 20));
 		
 		if (isSurpportFontColor) {
diff --git a/designer_form/src/com/fr/design/designer/beans/models/StateModel.java b/designer_form/src/com/fr/design/designer/beans/models/StateModel.java
index ff3fcbedcd..d089e282f6 100644
--- a/designer_form/src/com/fr/design/designer/beans/models/StateModel.java
+++ b/designer_form/src/com/fr/design/designer/beans/models/StateModel.java
@@ -265,7 +265,15 @@ public class StateModel {
         Rectangle bounds = createCurrentBounds(x, y);
 
         if ((x != currentX) || (y != currentY)) {
-            selectionModel.setSelectedCreators(getHotspotCreators(bounds, designer.getRootComponent()));
+            ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent());
+            if (creators.isEmpty() && designer.getRootComponent().getXCreatorCount() > 0) {
+                //当初始化布局是绝对布局的时候特殊处理，画框的时候若没有控件，默认焦点设置在绝对布局上
+                XCreator layout = designer.getRootComponent().getXCreator(0);
+                if (layout.acceptType(XWAbsoluteBodyLayout.class)) {
+                    creators.add(layout);
+                }
+            }
+            selectionModel.setSelectedCreators(creators);
         }
         selectionModel.setHotspotBounds(null);
     }
diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
index 8a7db60597..b8f1f37644 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
@@ -405,6 +405,7 @@ public class XWCardLayout extends XLayoutContainer {
 		XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) this.getBackupParent();
 		WCardMainBorderLayout border = borderLayout.toData();
 		WCardTitleLayout titleLayout = border.getTitlePart();
+		titleLayout.setCardName(cardLayoutName);
 		WCardTagLayout tagLayout = titleLayout.getTagPart();
 		for (int i = 0, len = tagLayout.getWidgetCount(); i < len; i++) {
 			CardSwitchButton button = tagLayout.getSwitchButton(i);
diff --git a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
index 07621fc260..148ca548a7 100644
--- a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
+++ b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
@@ -93,13 +93,6 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 		this.repaint();
 	}
 
-    private void setRightColumnWidth(boolean automode) {
-		int rightColumnWidth = this.getWidth() - LEFT_COLUMN_WIDTH;
-		TableColumn tcRight = this.getColumn(this.getColumnName(1));
-		tcRight.setMinWidth(automode ? 0 : rightColumnWidth);
-		tcRight.setMaxWidth(automode ? this.getWidth() : rightColumnWidth);
-	}
-
 	private void setDesigner(FormDesigner designer) {
 		this.designer = designer;
 	}
@@ -121,13 +114,6 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 		return null;
 	}
 
-    @Override
-	public void columnMarginChanged(javax.swing.event.ChangeEvent e) {
-		setRightColumnWidth(false);
-		super.columnMarginChanged(e);
-		setRightColumnWidth(true);
-	}
-
     /**
      * 待说明
      */
diff --git a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java
index a797f84cd3..4e1a73c6de 100644
--- a/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java
+++ b/designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java
@@ -43,7 +43,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane {
 	}
 	
 	protected UIScrollPane initRightBottomPane(){
-        this.setFontSizeComboBox(new UIComboBox(FRFontPane.FONT_SIZES));
+        this.setFontSizeComboBox(new UIComboBox(FRFontPane.getFontSizes()));
         this.setFontNameComboBox(new UIComboBox(Utils.getAvailableFontFamilyNames4Report())); 
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));
         fontSizeTypePane.add(this.getFontSizeComboBox(), BorderLayout.CENTER);
diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
index 26f407702d..8a3912bc4d 100644
--- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
+++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
@@ -416,7 +416,7 @@ public class LayoutBorderPane extends BasicPane {
 
     protected UIScrollPane initRightBottomPane(){
         formulaPane = new TinyFormulaPane();
-        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontSizeComboBox = new UIComboBox(FRFontPane.getFontSizes());
         fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
         fontNameComboBox.setPreferredSize(new Dimension(160, 30));
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));