Merge pull request #13947 in DESIGN/design from bugfix/11.0 to release/11.0

* commit '1f6c0f6782d980713cae1eec3b15687a98af8be0':
  INO-19848 fix:英文的翻譯會令客戶誤會
  KERNEL-17437 数据源代码移动到独立仓库

build.gradle

@@ -79,7 +79,8 @@ allprojects {
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion
         implementation 'com.fr.activator:fine-activator:' + frVersion
-        implementation 'com.fr.datasource:fine-datasource:' + frVersion
+        implementation 'com.fr.datasource:fine-datasource-api:4.1-SNAPSHOT'
+        implementation 'com.fr.datasource:fine-datasource-core:4.1-SNAPSHOT'
         implementation 'com.fr.decision:fine-decision:' + frVersion
         implementation 'com.fr.schedule:fine-schedule:' + frVersion
         implementation 'com.fr.report:engine-report:' + frDevVersion

designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java

@@ -27,7 +27,7 @@ public class ComboBoxDefinePane extends DictEditorDefinePane<ComboBox> {
 
 	public Component[] createWaterMarkPane() {
 		waterMarkField = new UITextField();
-		return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkField};
+		return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_PlaceHolder")), waterMarkField};
 	}
 
 	protected  void populateSubDictionaryEditorBean(ComboBox ob){