Merge pull request #1272 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '7bf8966ab11f57ddd64a1dbcded73279b5328dcd':
  无JIRA任务，修改悬停提示的初始化时间
  无JIRA任务，修复国际化错误

designer/src/com/fr/design/report/UnitFieldPane.java

@@ -48,7 +48,7 @@ public class UnitFieldPane extends JPanel {
             } else if (unitType == Constants.UNIT_INCH) {
                 this.setText(Inter.getLocText("FR-Designer_Unit_INCH"));
             } else {
-                this.setText(Inter.getLocText("FR-Designer_Unit_MM-mm"));
+                this.setText(Inter.getLocText("FR-Designer_Unit_MM"));
             }
 
             //ajust the heigt of unitLabel.

designer_base/src/com/fr/design/gui/ibutton/UIButton.java

@@ -36,7 +36,7 @@ public class UIButton extends JButton implements UIObserver {
 	private CellBorderStyle border = null;
 
 	protected UIObserverListener uiObserverListener;
-	private static final int TOOLTIP_INIT_DELAY = 1000;  // 延迟 1s 显示提示文字
+	private static final int TOOLTIP_INIT_DELAY = 300;  // 延迟 0.3s 显示提示文字
 
 	public UIButton() {
 		this(StringUtils.EMPTY);