Merge branch 'maint'

* maint:
  git-gui: Call changes "Staged" and "Unstaged" in file list titles.

diff --cc git-gui.sh
index 46358258bb65ceba68441c51fd69f212e9f817d3,4cf340dfe7e5fbcf85622cba6d8ec0d78e009d03..84a3b6201156f0d7198334c9ba076022db76b69d
--- 1/git-gui.sh
--- 2/git-gui.sh
+++ b/git-gui.sh
@@@ -1638,8 -5496,9 +1638,8 @@@ pack .vpane -anchor n -side top -fill b
  # -- Index File List
  #
  frame .vpane.files.index -height 100 -width 200
- label .vpane.files.index.title -text {Changes To Be Committed} \
+ label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
 -      -background green \
 -      -font font_ui
 +      -background green
  text $ui_index -background white -borderwidth 0 \
        -width 20 -height 10 \
        -wrap none \
@@@ -1658,8 -5518,9 +1658,8 @@@ pack $ui_index -side left -fill both -e
  # -- Working Directory File List
  #
  frame .vpane.files.workdir -height 100 -width 200
- label .vpane.files.workdir.title -text {Changed But Not Updated} \
+ label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
 -      -background red \
 -      -font font_ui
 +      -background red
  text $ui_workdir -background white -borderwidth 0 \
        -width 20 -height 10 \
        -wrap none \