Merge "Change edit shortcut from 'm' to 'e'" into stable-2.11

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
index 9566a0b..d06b59e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
@@ -371,7 +371,7 @@
         .on("O", commentManager.toggleOpenBox(cm))
         .on("Enter", commentManager.toggleOpenBox(cm))
         .on("N", maybeNextVimSearch(cm))
-        .on("M", modifyInEditScreen(cm))
+        .on("E", openEditScreen(cm))
         .on("P", chunkManager.diffChunkNav(cm, Direction.PREV))
         .on("Shift-A", diffTable.toggleA())
         .on("Shift-M", header.reviewedAndNext())
@@ -486,9 +486,9 @@
         new NoOpKeyCommand(KeyCommand.M_SHIFT, 'p', PatchUtil.C.commentPrev()));
     keysNavigation.add(
         new NoOpKeyCommand(KeyCommand.M_CTRL, 'f', Gerrit.C.keySearch()));
-    keysNavigation.add(
-        new NoOpKeyCommand(0, 'm', PatchUtil.C.modifyInEditScreen()));
+
     keysAction = new KeyCommandSet(Gerrit.C.sectionActions());
+    keysAction.add(new NoOpKeyCommand(0, 'e', PatchUtil.C.openEditScreen()));
     keysAction.add(new NoOpKeyCommand(0, KeyCodes.KEY_ENTER,
         PatchUtil.C.expandComment()));
     keysAction.add(new NoOpKeyCommand(0, 'o', PatchUtil.C.expandComment()));
@@ -938,7 +938,7 @@
     }
   }
 
-  private Runnable modifyInEditScreen(final CodeMirror cm) {
+  private Runnable openEditScreen(final CodeMirror cm) {
     return new Runnable() {
       @Override
       public void run() {

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
index 239d2d5..39aadc3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
@@ -58,7 +58,7 @@
   String toggleIntraline();
   String showPreferences();
 
-  String modifyInEditScreen();
+  String openEditScreen();
 
   String toggleReviewed();
   String markAsReviewedAndGoToNext();

gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
index 8f026be..2f68822 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
@@ -40,8 +40,7 @@
 toggleIntraline = Toggle intraline difference
 showPreferences = Show diff preferences
 
-modifyInEditScreen = Modify in edit screen
-
+openEditScreen = Edit file in browser
 toggleReviewed = Toggle the reviewed flag
 markAsReviewedAndGoToNext = Mark patch as reviewed and go to next unreviewed patch