Merge pull request #478 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0

* commit 'f9b9ede9f0c336931abe1ba44a80f40c5e432478':
  无JIRA任务，冲突修复.

designer-base/src/main/java/com/fr/design/preview/FormPreview.java

@@ -1,7 +1,6 @@
 package com.fr.design.preview;
 
 import com.fr.design.fun.impl.AbstractPreviewProvider;
-import com.fr.locale.InterProviderFactory;
 
 
 /**
@@ -13,7 +12,7 @@ public class FormPreview extends AbstractPreviewProvider {
 
     @Override
     public String nameForPopupItem() {
-        return InterProviderFactory.getProvider().getLocText("Fine-Design_Form_M_Form_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Form_Preview");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/preview/MobilePreview.java

@@ -1,7 +1,6 @@
 package com.fr.design.preview;
 
 import com.fr.design.fun.impl.AbstractPreviewProvider;
-import com.fr.general.Inter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,7 +15,7 @@ public class MobilePreview extends AbstractPreviewProvider {
 
     @Override
     public String nameForPopupItem() {
-        return Inter.getLocText("Fine-Engine_Mobile_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Preview");
     }
 
     @Override