Merge pull request #731 in BA/design from ~FANGLEI/design:dev to dev

* commit '7e7c6f9983f04d9547e7af2ab3a15aff38c2e0a7':
  修改国际化文件
  修改国际化冲突
  修正“移动端属性”菜单中“解析方式”中的注释分别在报表和表单中有争取的表现

designer/src/com/fr/design/report/mobile/MobileUseHtmlGroupPane.java

@@ -7,6 +7,10 @@ import com.fr.report.mobile.ElementCaseMobileAttr;
  * Created by kunsnat on 2016/8/3.
  */
 public class MobileUseHtmlGroupPane extends MobileUseHtmlGroupBeanPane<ElementCaseMobileAttr> {
+    public MobileUseHtmlGroupPane(String annotation) {
+        super(annotation);
+    }
+
     @Override
     public void populateBean(ElementCaseMobileAttr mobileAttr) {
         if(mobileAttr != null) {

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -34,7 +34,7 @@ public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
         appFitBrowserPane.setAppFitPreviewPane(appFitPreviewPane);
         jPanel.add(appFitBrowserPane);
 
-        jPanel.add(htmlGroupPane = new MobileUseHtmlGroupPane());
+        jPanel.add(htmlGroupPane = new MobileUseHtmlGroupPane(Inter.getLocText("FR-Designer_Mobile_Report_Analysis_Annotation")));
 
         jPanel.add(mobileToolBarPane = new MobileToolBarPane());
 

designer_base/src/com/fr/design/dialog/mobile/MobileUseHtmlGroupBeanPane.java

@@ -23,11 +23,11 @@ public abstract class MobileUseHtmlGroupBeanPane<T> extends BasicBeanPane<T> {
 
     private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
 
-    public MobileUseHtmlGroupBeanPane() {
+    public MobileUseHtmlGroupBeanPane(String annotation) {
-        initComponents();
+        initComponents(annotation);
     }
 
-    private void initComponents() {
+    private void initComponents(String annotation) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(UITitledBorder.createBorderWithTitle(this.title4PopupWindow()));
 
@@ -43,7 +43,7 @@ public abstract class MobileUseHtmlGroupBeanPane<T> extends BasicBeanPane<T> {
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_style")), useApp, useHTML5},
-                new Component[]{new UILabel(Inter.getLocText("FR-mobile_analysis_annotation")), null, null}
+                new Component[]{new UILabel(annotation), null, null}
         };
         JPanel usePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         usePane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));

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

@@ -563,4 +563,8 @@ FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
 FR-Designer_Pagination=Page Break
 FR-Designer_DS_TableData=Data Set
-FR-Designer_Parameter-Formula=Formula
+FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid

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

@@ -564,4 +564,8 @@ FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
 FR-Designer_Pagination=Page Break
 FR-Designer_DS_TableData=Data Set
-FR-Designer_Parameter-Formula=Formula
+FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid

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

@@ -569,3 +569,7 @@ FR-Designer_No=\u5426
 FR-Designer_Pagination=\u5206\u9875
 FR-Designer_DS_TableData=\u6570\u636E\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u63D2\u4EF6\u7248\u672C\u8FC7\u4F4E, \u5B58\u5728API\u4E0D\u517C\u5BB9, \u8BF7\u8054\u7CFB\u5F00\u53D1\u8005\u5347\u7EA7\u63D2\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u987A\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CA\uFF1A\u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u8868\u5355\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CA\: \u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u62A5\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9875\u9884\u89C8\uFF0C\u586B\u62A5\u9884\u89C8\u65F6\u5C5E\u6027\u65E0\u6548.

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

@@ -557,3 +557,7 @@ FR-Designer_No=\u5426
 FR-Designer_Pagination=\u5206\u9801
 FR-Designer_DS_TableData=\u8CC7\u6599\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u63D2\u4EF6\u7248\u672C\u904E\u4F4E, \u5B58\u5728API\u4E0D\u517C\u5BB9, \u8ACB\u806F\u7E6B\u958B\u767C\u8005\u5347\u7D1A\u63D2\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548

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

@@ -36,7 +36,7 @@ public class FormMobileAttrPane extends BasicBeanPane<FormMobileAttr>{
         jPanel2.setLayout(FRGUIPaneFactory.createBorderLayout());
         jPanel2.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
         this.mobileToolBarPane = new MobileToolBarPane();
-        this.mobileUseHtmlGroupPane = new MobileUseHtmlGroupPane();
+        this.mobileUseHtmlGroupPane = new MobileUseHtmlGroupPane(Inter.getLocText("FR-Designer_Mobile_Form_Analysis_Annotation"));
         //设置一个JPanel包裹mobileToolBarPane这个Panel，让jPanel的高度等于mobileToolBarPane高度加10，再放入this中
         jPanel1.setPreferredSize(new Dimension(0, (int)this.mobileToolBarPane.getPreferredSize().getHeight() + PADDINGHEIGHT));
         jPanel2.setPreferredSize(new Dimension(0, (int)this.mobileUseHtmlGroupPane.getPreferredSize().getHeight() + PADDINGHEIGHT));

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

@@ -8,6 +8,10 @@ import com.fr.form.main.mobile.FormMobileAttr;
  * Created by fanglei on 2016/12/28.
  */
 public class MobileUseHtmlGroupPane extends MobileUseHtmlGroupBeanPane<FormMobileAttr> {
+    public MobileUseHtmlGroupPane(String annotation) {
+        super(annotation);
+    }
+
     @Override
     public void populateBean(FormMobileAttr mobileAttr) {
         if(mobileAttr != null) {