From a9b80d32df062d0e4fb562950fed8420a02b0184 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 13 Jan 2017 16:01:53 +0100
Subject: [PATCH] inline with keep declaration: wording to visually distinguish
 options

---
 .../refactoring/inline/InlineFieldDialog.java        |  2 +-
 .../refactoring/inline/InlineMethodDialog.java       |  2 +-
 .../src/messages/RefactoringBundle.properties        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
index 674fb036afa1..a1fb060ef3b6 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
@@ -44,7 +44,7 @@ public class InlineFieldDialog extends InlineOptionsWithSearchSettingsDialog {
   }
 
   protected String getNameLabelText() {
-    final String occurrencesString = myOccurrencesNumber > -1 ? " (" + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? ")" : "s)") : "";
+    final String occurrencesString = myOccurrencesNumber > -1 ? " - " + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? "" : "s") : "";
 
     String fieldText = PsiFormatUtil.formatVariable(myField, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE,PsiSubstitutor.EMPTY);
     return RefactoringBundle.message("inline.field.field.name.label", fieldText, occurrencesString);
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
index 2b55253e17f0..45ef5b001ed6 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
@@ -58,7 +58,7 @@ public class InlineMethodDialog extends InlineOptionsWithSearchSettingsDialog {
 
   @Override
   protected String getNameLabelText() {
-    final String occurrencesString = myOccurrencesNumber > -1 ? " (" + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? ")" : "s)") : "";
+    final String occurrencesString = myOccurrencesNumber > -1 ? " - " + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? "" : "s") : "";
     String methodText = PsiFormatUtil.formatMethod(myMethod,
                                                    PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS,
                                                    PsiFormatUtilBase.SHOW_TYPE);
diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
index f9793d787263..ff4b608baf0f 100644
--- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties
+++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
@@ -436,11 +436,11 @@ inline.field.command=Inline field {0}
 0.will.not.be.accessible.from.1.after.inlining={0} will not be accessible from {1} after inlining
 inline.field.field.name.label=Field {0} {1}
 inline.field.border.title=Inline
-all.references.and.remove.the.field=Inline &all references and remove the field
-all.references.keep.field=Inline all references and k&eep the field
+all.references.and.remove.the.field=Inline &all and remove the field
+all.references.keep.field=Inline all and k&eep the field
 all.references.and.remove.the.local=Inline &all references and remove the variable
 this.reference.only.and.keep.the.variable=Inline this reference only and &keep the variable
-this.reference.only.and.keep.the.field=Inline this reference only and &keep the field
+this.reference.only.and.keep.the.field=Inline this only and &keep the field
 all.references.and.remove.super.class=Inline &all references and remove the class
 this.reference.only.and.keep.super.class=Inline this reference only and &keep the super class
 inline.variable.title=Inline Variable
@@ -454,10 +454,10 @@ occurrences.string=({0,choice,1#1 occurrence|2#{0,number} occurrences})
 inline.method.title=Inline Method
 inline.method.method.label=Method {0} {1}
 inline.method.border.title=Inline
-all.invocations.and.remove.the.method=Inline &all invocations and remove the method
-all.invocations.keep.the.method=Inline all invocations and k&eep the method
+all.invocations.and.remove.the.method=Inline &all and remove the method
+all.invocations.keep.the.method=Inline all and k&eep the method
 all.invocations.in.project=&All invocations in project
-this.invocation.only.and.keep.the.method=Inline this invocation only and &keep the method
+this.invocation.only.and.keep.the.method=Inline this only and &keep the method
 refactoring.cannot.be.applied.to.abstract.methods={0} refactoring cannot be applied to abstract methods
 refactoring.cannot.be.applied.no.sources.attached={0} refactoring cannot be applied: no sources attached
 refactoring.is.not.supported.when.return.statement.interrupts.the.execution.flow={0} refactoring is not supported when return statement interrupts the execution flow