MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: rename 'Cancel' to 'Revert' button in merge

Browse Source 
This action will undo all changes, that was made during merge, so 'cancel' could be not clear enough
This commit is contained in:
Aleksey Pivovarov
2014-08-26 20:02:38 +04:00
parent 7712e6db5c
commit 08c3972d76
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
+1 -1
View File
@@ -29,7 +29,7 @@ public abstract class ActionButtonPresentation {
}
};
public static ActionButtonPresentation CANCEL_WITH_PROMPT = new ActionButtonPresentation(CommonBundle.getCancelButtonText()) {
public static ActionButtonPresentation CANCEL_WITH_PROMPT = new ActionButtonPresentation("Revert") {
@Override
public void run(DialogWrapper dialog) {
if (Messages.showYesNoDialog(dialog.getRootPane(),
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtMergeFiles.java
Vendored
+1 -1
View File
@@ -84,7 +84,7 @@ public class ExtMergeFiles extends BaseExternalTool {
if (Messages.YES == Messages.showYesNoDialog(request.getProject(),
"Press \"Mark as Resolved\" when you finish resolving conflicts in the external tool",
"Merge In External Tool", "Mark as Resolved", "Cancel", null)) {
"Merge In External Tool", "Mark as Resolved", "Revert", null)) {
result = DialogWrapper.OK_EXIT_CODE;
}
((MergeRequestImpl)request).getResultContent().getFile().refresh(false, false);