Merge branch 'stable-2.15'

* stable-2.15:
  Change "WorkInProgress" to "Work in Progress"
  ChangeTable: Show "Work in Progress" in status column
  ChangeScreen: Don't show "Merge Conflict" for submittable WIP change

Change-Id: I17aebee341f16b25167620a526f6daa3653a23d4

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java

@@ -1259,7 +1259,7 @@ public class ChangeScreen extends Screen {
   }
 
   private void renderSubmitType(Change.Status status, boolean canSubmit, SubmitType submitType) {
-    if (canSubmit && status == Change.Status.NEW) {
+    if (canSubmit && status == Change.Status.NEW && !changeInfo.isWorkInProgress()) {
       statusText.setInnerText(
           changeInfo.mergeable() ? Util.C.readyToSubmit() : Util.C.mergeConflict());
     }

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties

@@ -8,7 +8,7 @@ mergeConflict = Merge Conflict
 notCurrent = Not Current
 changeEdit = Change Edit
 isPrivate = (Private)
-isWorkInProgress = (WorkInProgress)
+isWorkInProgress = (Work in Progress)
 
 myDashboardTitle = My Reviews
 unknownDashboardTitle = Code Review Dashboard

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java

@@ -240,6 +240,11 @@ public class ChangeTable extends NavigationTable<ChangeInfo> {
           row,
           C_STATUS,
           Util.toLongString(status) + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
+    } else if (c.isWorkInProgress()) {
+      table.setText(
+          row,
+          C_STATUS,
+          Util.C.workInProgress() + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
     } else if (!c.mergeable()) {
       table.setText(
           row,