Merge pull request #1655 in BA/design from ~PLOUGH/design:feature/9.0 to feature/9.0

* commit 'bd791f3ced4e1aa6ff3a72d4addcd5439940ec68':
  MOBILE-6262 FR9.0设计器提供手机端设计画布参考尺寸=>交互验收

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

@@ -2170,7 +2170,6 @@ FR-Designer_Tab_Display_Position=Display Position
 FR-Designer_Set_Mobile_Only_Template=Set as mobile only template
 FR-Designer_Set_Mobile_Canvas_Size=Set as mobile canvas size
 FR-Designer_Adaptive_Property_Auto_Match=Adaptive property auto match
-FR-Designer_Open_Adaptive_Property_Auto_Match=Open adpative property auto match
 FR-Designer_Canvas_Size_Lock_Desc=The size of the canvas is 375*560, the width is locked, the height is customizable
 FR-Designer_Mobile_Screen_Match_Desc=4.7 inch screen phone: fit
 FR-Designer_Mobile_Screen_Zoom_In_Desc=4.7 inch or more mobile phones: zooming in

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

@@ -2169,7 +2169,6 @@ FR-Designer_Tab_Display_Position=Display Position
 FR-Designer_Set_Mobile_Only_Template=Set as mobile only template
 FR-Designer_Set_Mobile_Canvas_Size=Set as mobile canvas size
 FR-Designer_Adaptive_Property_Auto_Match=Adaptive property auto match
-FR-Designer_Open_Adaptive_Property_Auto_Match=Open adpative property auto match
 FR-Designer_Canvas_Size_Lock_Desc=The size of the canvas is 375*560, the width is locked, the height is customizable
 FR-Designer_Mobile_Screen_Match_Desc=4.7 inch screen phone: fit
 FR-Designer_Mobile_Screen_Zoom_In_Desc=4.7 inch or more mobile phones: zooming in

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

@@ -2169,7 +2169,6 @@ FR-Designer_Tab_Template_Six=
 FR-Designer_Tab_Display_Position=
 FR-Designer_Set_Mobile_Only_Template=
 FR-Designer_Set_Mobile_Canvas_Size=
-FR-Designer_Open_Adaptive_Property_Auto_Match=
 FR-Designer_Mobile_Screen_Zoom_In=
 FR-Designer_Mobile_Screen_Zoom_Out=
 FR-Designer_Adaptive_Property_Auto_Match_Desc=

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

@@ -2169,7 +2169,6 @@ FR-Designer_Tab_Display_Position=
 FR-Designer_Set_Mobile_Only_Template=
 FR-Designer_Set_Mobile_Canvas_Size=
 FR-Designer_Adaptive_Property_Auto_Match=
-FR-Designer_Open_Adaptive_Property_Auto_Match=
 FR-Designer_Mobile_Screen_Zoom_In=
 FR-Designer_Mobile_Screen_Zoom_Out=
 FR-Designer_Mobile_Screen_Zoom_Out_Desc=

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

@@ -2170,7 +2170,6 @@ FR-Designer_Tab_Display_Position=\u663E\u793A\u4F4D\u7F6E
 FR-Designer_Set_Mobile_Only_Template=\u8BBE\u7F6E\u4E3A\u624B\u673A\u7AEF\u4E13\u5C5E\u6A21\u7248
 FR-Designer_Set_Mobile_Canvas_Size=\u8BBE\u7F6E\u4E3A\u624B\u673A\u6A21\u7248\u753B\u5E03\u5927\u5C0F
 FR-Designer_Adaptive_Property_Auto_Match=\u81EA\u9002\u5E94\u5C5E\u6027\u81EA\u52A8\u5339\u914D
-FR-Designer_Open_Adaptive_Property_Auto_Match=\u5F00\u542F\u81EA\u9002\u5E94\u5C5E\u6027\u81EA\u52A8\u5339\u914D
 FR-Designer_Canvas_Size_Lock_Desc=\u753B\u5E03\u5927\u5C0F375*560\uFF0C\u5BBD\u5EA6\u9501\u5B9A\uFF0C\u9AD8\u5EA6\u53EF\u81EA\u5B9A\u4E49
 FR-Designer_Mobile_Screen_Match_Desc=4.7\u5BF8\u5C4F\u5E55\u624B\u673A\uFF1A\u9002\u914D
 FR-Designer_Mobile_Screen_Zoom_In_Desc=4.7\u5BF8\u4EE5\u4E0A\u624B\u673A\uFF1A\u653E\u5927

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

@@ -2169,7 +2169,6 @@ FR-Designer_Tab_Display_Position=\u986F\u793A\u4F4D\u7F6E
 FR-Designer_Set_Mobile_Only_Template=\u8A2D\u5B9A\u70BA\u624B\u6A5F\u7AEF\u5C08\u5C6C\u6A21\u7248
 FR-Designer_Set_Mobile_Canvas_Size=\u8A2D\u5B9A\u70BA\u624B\u6A5F\u6A21\u7248\u756B\u5E03\u5927\u5C0F
 FR-Designer_Adaptive_Property_Auto_Match=\u81EA\u6211\u8ABF\u6574\u5185\u5BB9\u81EA\u52D5\u5339\u914D
-FR-Designer_Open_Adaptive_Property_Auto_Match=\u958B\u555F\u81EA\u6211\u8ABF\u6574\u5185\u5BB9\u81EA\u52D5\u5339\u914D
 FR-Designer_Canvas_Size_Lock_Desc=\u756B\u5E03\u5927\u5C0F375*560\uFF0C\u5BEC\u5EA6\u9396\u5B9A\uFF0C\u9AD8\u5EA6\u53EF\u81EA\u5B9A\u7FA9
 FR-Designer_Mobile_Screen_Match_Desc=4.7\u5BF8\u8367\u5E55\u624B\u6A5F\uFF1A\u9069\u914D
 FR-Designer_Mobile_Screen_Zoom_In_Desc=4.7\u5BF8\u4EE5\u4E0A\u624B\u6A5F\uFF1A\u653E\u5927

designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java

@@ -78,13 +78,11 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
 
     private JPanel getAdaptivePropertyAutoMatchCheckPane() {
         JPanel panel = new JPanel(FRGUIPaneFactory.createBorderLayout());
-        final String selectedDesc = Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match");
-        final String unselectedDesc = Inter.getLocText("FR-Designer_Open_Adaptive_Property_Auto_Match");
         adaptivePropertyAutoMatchCheck = new UICheckBox();
         adaptivePropertyAutoMatchCheck.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
-                adaptivePropertyAutoMatchCheck.setText(adaptivePropertyAutoMatchCheck.isSelected() ? selectedDesc : unselectedDesc);
+                adaptivePropertyAutoMatchCheck.setText(Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match"));
             }
         });
         adaptivePropertyAutoMatchCheck.setSelected(true);