diff --git a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
index 094915a858..d4a6b8f43a 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java
@@ -136,7 +136,7 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
             int returnVal = FineJOptionPane.showConfirmDialog(
                     DesignerContext.getDesignerFrame(),
                     Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + e.getEditingFILE() + "\" ?",
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE
             );
diff --git a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
index 4e0b4e520d..a5f890de6d 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/FineJOptionPane.java
@@ -39,7 +39,7 @@ public class FineJOptionPane extends JOptionPane {
     }
 
     private final static String MESSAGE_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message");
-    private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm");
+    private final static String CONFIRM_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt");
     private final static String INPUT_DIALOG_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips");
 
     /**
diff --git a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
index 6e6c3d8b9b..800e1596bd 100644
--- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
@@ -304,7 +304,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
                     int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 
                         setCurrentEditor(j);
diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
index 503929e228..b19e243850 100644
--- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
+++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
@@ -285,7 +285,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
             if (designerEnvManager.isSupportStringToFormula()) {
                 if (!designerEnvManager.isDefaultStringToFormula()) {
                     int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula")
-                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                            + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                     if (returnValue == JOptionPane.OK_OPTION) {
 
                         setCurrentEditor(j);
diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
index be7c8c1953..8f2783a3ca 100644
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@@ -1000,7 +1000,7 @@ public class MultiTemplateTabPane extends JComponent {
         if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) {
             specifiedTemplate.stopEditing();
             int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION) {
                 CallbackSaveWorker worker = specifiedTemplate.save();
                 worker.addSuccessCallback(new Runnable() {
diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
index 8da6b7a3b6..5dfedc2662 100644
--- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
@@ -353,7 +353,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     tipContent,
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     YES_NO_OPTION)
                     == JOptionPane.YES_OPTION) {
                 // 删除所有选中的即可
@@ -378,7 +378,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
             if (FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     tipContent,
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     YES_NO_OPTION)
                     == JOptionPane.YES_OPTION) {
                 // 删除其他
diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
index 7168db0b5c..ebe6abb672 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
@@ -153,7 +153,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 				if (selected != null) {
 					int re = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this),
 															   Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?",
-															   Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+															   Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
 															   JOptionPane.OK_CANCEL_OPTION);
 					if (re == JOptionPane.OK_OPTION) {
 						JListUtils.removeSelectedListItems(jlist);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 1ac6538926..afa1a3bcb2 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -797,7 +797,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             if (!editingTemplate.getEditingFILE().exists()) {
                 int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
-                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
+                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION,
                         JOptionPane.QUESTION_MESSAGE);
                 if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java
index 13e5dc28f0..c0337e7b2c 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java
@@ -37,7 +37,7 @@ public class BubbleTip implements GuideTip {
                     int returnVal = FineJOptionPane.showConfirmDialog(
                             currentGuide.getGuideView(),
                             Toolkit.i18nText("Fine-Design_Guide_Option_Warning_Terminal"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                             JOptionPane.YES_NO_OPTION,
                             JOptionPane.QUESTION_MESSAGE);
                     if (returnVal == JOptionPane.YES_OPTION) {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java
index 5877795589..8f258b3e0d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCloseTemplateHelper.java
@@ -88,7 +88,7 @@ public class VcsCloseTemplateHelper {
             specifiedTemplate.stopEditing();
             int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
                     String.format("%s\"%s\" ?",Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save"), specifiedTemplate.getEditingFILE()),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION) {
                 CallbackSaveWorker worker = specifiedTemplate.save();
                 worker.addSuccessCallback(() -> {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
index 98e7bae071..9f19008ee4 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
@@ -222,7 +222,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
             int selVal = FineJOptionPane.showConfirmDialog(
                     RecyclePane.this,
                     isDelete ? getDeleteTip(selectList.size()) : getRestoreTip(selectList.size()),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     JOptionPane.OK_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE);
             if (selVal == JOptionPane.YES_OPTION) {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java
index 4ca132ea5b..b97de53991 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java
@@ -120,7 +120,7 @@ public class VcsCenterPane extends VcsNewPane {
                     int selVal = FineJOptionPane.showConfirmDialog(
                             VcsCenterPane.this,
                             Toolkit.i18nText("Fine-Design_Vcs_Center_Delete", fileName),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                             JOptionPane.OK_CANCEL_OPTION,
                             JOptionPane.QUESTION_MESSAGE);
                     if (selVal == JOptionPane.YES_OPTION) {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
index 8e5e22c475..11da401226 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java
@@ -168,7 +168,7 @@ public class VcsNewPane extends RecyclePane {
                     int selVal = FineJOptionPane.showConfirmDialog(
                             VcsNewPane.this,
                             Toolkit.i18nText("Fine-Design_Vcs_Restore_This_Version_Tips"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                             JOptionPane.OK_CANCEL_OPTION,
                             JOptionPane.QUESTION_MESSAGE);
                     if (selVal == JOptionPane.YES_OPTION) {
@@ -255,7 +255,7 @@ public class VcsNewPane extends RecyclePane {
                     int selVal = FineJOptionPane.showConfirmDialog(
                             VcsNewPane.this,
                             Toolkit.i18nText("Fine-Design_Vcs_Delete_This_Version_Tips"),
-                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                             JOptionPane.OK_CANCEL_OPTION,
                             JOptionPane.QUESTION_MESSAGE);
                     if (selVal == JOptionPane.YES_OPTION) {
diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
index ede9b45d81..1158f97aa3 100644
--- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
@@ -84,7 +84,7 @@ public class UpmFinder {
         if (!checkUPMResourcesExist()) {
             // upm下载
             int val = FineJOptionPane.showConfirmDialog(null, Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE);
             if (val == JOptionPane.OK_OPTION) {
                 try {
                     UpmResourceLoader.INSTANCE.download();
diff --git a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
index 032f16a769..6931fa6636 100644
--- a/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
+++ b/designer-base/src/main/java/com/fr/env/CheckServiceDialog.java
@@ -332,7 +332,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         String[] option = {Toolkit.i18nText("Fine-Design_Report_Yes"), Toolkit.i18nText("Fine-Design_Report_No")};
         if (!jarConsistency) {
             int a = FineJOptionPane.showOptionDialog(getParent(), Toolkit.i18nText("Fine-Design_Basic_Sync_Info_Information"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1);
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION, QUESTION_MESSAGE, IOUtils.readIcon("com/fr/design/icon/versioncheck/question.png"), option, 1);
             if (0 == a) {
                 progressBar.setVisible(true);
                 progressBar.setString(Toolkit.i18nText("Fine-Design_Update_Info_Wait_Message"));
diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
index 66b9d12d3d..f794a0a8e7 100644
--- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
+++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java
@@ -950,7 +950,7 @@ public class FILEChooserPane extends BasicPane {
         if (access(selectedFile) && access(currentDirectory)) {
             if (selectedFile.exists()) {
                 int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
-                        Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+                        Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
                 if (selVal == JOptionPane.YES_OPTION) {
                     option = JOPTIONPANE_OK_OPTION;
                     saveDictionary();
diff --git a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
index bb1ff88c58..87523bfe0a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
@@ -104,7 +104,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
     public void installOnline() {
 
         int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Download_Online_Sources"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 
         if (choose == JOptionPane.OK_OPTION) {
             initDialog();
@@ -237,7 +237,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
 
         if (result) {
             int choose = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 
             if (choose == JOptionPane.OK_OPTION) {
                 RestartHelper.restart();
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
index 1f139bbabf..c77ac788b3 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
@@ -221,7 +221,7 @@ public class XCardSwitchButton extends XButton {
 	private void deleteCard(XCardSwitchButton button, int index){
 		String titleName = button.getContentLabel().getText();
 		int value = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 		if (value != JOptionPane.OK_OPTION) {
 			return;
 		}
@@ -402,7 +402,7 @@ public class XCardSwitchButton extends XButton {
 	private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){
 		String titleName = this.getContentLabel().getText();
 		int value = FineJOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”",
-				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 		if (value != JOptionPane.OK_OPTION) {
 			return;
 		}
diff --git a/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java b/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java
index 3afe612537..bdda0b4db2 100644
--- a/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java
+++ b/designer-form/src/main/java/com/fr/design/fit/toolbar/SwitchAction.java
@@ -233,7 +233,7 @@ public class SwitchAction extends UpdateAction {
         int returnVal = FineJOptionPane.showConfirmDialog(
                 DesignerContext.getDesignerFrame(),
                 message,
-                Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                 YES_NO_OPTION);
         return returnVal == JOptionPane.YES_OPTION;
     }
@@ -249,7 +249,7 @@ public class SwitchAction extends UpdateAction {
         int returnVal = FineJOptionPane.showConfirmDialog(
                 DesignerContext.getDesignerFrame(),
                 Toolkit.i18nText("Fine-Designer_Fit_Cover_File_Switch"),
-                Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                 YES_NO_OPTION);
         return returnVal == JOptionPane.YES_OPTION;
     }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
index b5fac75e5a..295aae7c9c 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
@@ -289,7 +289,7 @@ public class FormEditToolBar extends BasicPane {
                 return;
             }
             int val = FineJOptionPane.showConfirmDialog(FormEditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
             if (val != JOptionPane.YES_OPTION) {
                 return;
             }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
index 97e6d94013..cf5581cf8d 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/DownloadSuitableThemeAction.java
@@ -209,7 +209,7 @@ public class DownloadSuitableThemeAction extends SharedComponentPopupAction {
             int returnVal = FineJOptionPane.showConfirmDialog(
                     window,
                     Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     FineJOptionPane.OK_CANCEL_OPTION);
             if (returnVal == JOptionPane.YES_OPTION) {
                 applyTheme(currentTemplate, theme.getName(), window);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java
index 4de568db7f..85ed94ee19 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/installation/TemplateThemeInstallation.java
@@ -199,7 +199,7 @@ public class TemplateThemeInstallation extends AsyncInstallation {
             int returnVal = FineJOptionPane.showConfirmDialog(
                     window,
                     Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                    Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     FineJOptionPane.OK_CANCEL_OPTION);
             if (returnVal == JOptionPane.YES_OPTION) {
                 applyTheme(currentFormTemplate, theme.getName(), window);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
index d133cd0583..8a52051276 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
@@ -82,7 +82,7 @@ public class OnlineWidgetPackagesShowPane extends AbstractOnlineWidgetShowPane {
                         + Toolkit.i18nText("Fine-Design_Share_Total")
                         + onlineWidgetSelectPane.getSharableWidgetNum()
                         + Toolkit.i18nText("Fine-Design_Share_Piece");
-                int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), message, Toolkit.i18nText("Fine-Design_Basic_Confirm"), FineJOptionPane.YES_NO_OPTION);
+                int returnValue = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), message, Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), FineJOptionPane.YES_NO_OPTION);
                 if (returnValue == FineJOptionPane.OK_OPTION && onlineWidgetSelectPane.getSharableWidgetNum() != 0) {
                     downLoadPackage();
                 }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
index f672b9a232..661c1f7bf1 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
@@ -906,7 +906,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
                 return;
             }
             int returnValue = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Remove_Work_Sheet"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                     JOptionPane.OK_CANCEL_OPTION);
             if (returnValue == JOptionPane.OK_OPTION) {
                 if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
index 8e7c14297c..8b3d9a4782 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
@@ -238,7 +238,7 @@ public class DownloadComponentPackageGuide {
                 themeConfirmDialog = GuideCreateUtils.showConfirmDialog(
                         DesignerContext.getDesignerFrame(),
                         Toolkit.i18nText("Fine-Design_Share_Apply_Suitable_Theme_Tip"),
-                        Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                        Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
                         FineJOptionPane.OK_CANCEL_OPTION);
                 return true;
             }
diff --git a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
index 1b1c1692f0..ee14a914e6 100644
--- a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
@@ -152,7 +152,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
 		if (isLayerReportBox.isSelected()) {
 			if (!ReportUtils.isLayerReportUsable(worksheet)) {
 				int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
-						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
 				if (value != JOptionPane.YES_OPTION) {
 					isLayerReportBox.setSelected(false);
 				}
diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
index 380809faf0..9ae4983227 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java
@@ -298,7 +298,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         if (clientPaging.isSelected()) {
             if (!ReportUtils.isLayerReportUsable(worksheet)) {
                 int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
                 if (value != JOptionPane.YES_OPTION) {
                     clientPaging.setSelected(false);
                 }
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
index f22d44cb3f..0ce920d25d 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
@@ -332,7 +332,7 @@ public class EditToolBar extends BasicPane {
                 return;
             }
             int val = FineJOptionPane.showConfirmDialog(EditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"), JOptionPane.YES_NO_OPTION);
             if (val != JOptionPane.YES_OPTION) {
                 return;
             }
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java b/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
index 347d942834..b64eda37c1 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
@@ -173,7 +173,7 @@ public class EventPane extends BasicPane {
 			}
 
 			int val = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EventPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?",
-					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dialog_Prompt"),
 					JOptionPane.YES_NO_OPTION);
 			if (val != JOptionPane.YES_OPTION) {
 				return;