Merge branch 'stable-2.16'

* stable-2.16:
  Fix hardcoded title message for mark/unmark review

Change-Id: I3f20c831ba99119a8ac2c87a6fbcb774bef019be

polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html

@@ -364,7 +364,7 @@ limitations under the License.
               <span class$="reviewedLabel [[_computeReviewedClass(file.isReviewed)]]">Reviewed</span>
               <label>
                 <input class="reviewed" type="checkbox" checked="[[file.isReviewed]]">
-                <span class="markReviewed" title="Mark as reviewed (shortcut: r)">[[_computeReviewedText(file.isReviewed)]]</span>
+                <span class="markReviewed" title$="[[_reviewedTitle(file.isReviewed)]]">[[_computeReviewedText(file.isReviewed)]]</span>
               </label>
             </div>
             <div class="editFileControls showOnEdit">

polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js

@@ -1247,5 +1247,13 @@
       }
       return '';
     },
+
+    _reviewedTitle(reviewed) {
+      if (reviewed) {
+        return 'Mark as not reviewed (shortcut: r)';
+      }
+
+      return 'Mark as reviewed (shortcut: r)';
+    },
   });
 })();

polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.html

@@ -552,6 +552,14 @@ limitations under the License.
               'unresolved.file', 'comment'), '3 comments (1 unresolved)');
     });
 
+    test('_reviewedTitle', () => {
+      assert.equal(
+          element._reviewedTitle(true), 'Mark as not reviewed (shortcut: r)');
+
+      assert.equal(
+          element._reviewedTitle(false), 'Mark as reviewed (shortcut: r)');
+    });
+
     suite('keyboard shortcuts', () => {
       setup(() => {
         element._filesByPath = {