From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 8 May 2007 14:42:16 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.7.0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0bc498ec17eeb046c3494126e2ff12339abde77;p=git.git

Merge branch 'maint'

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

f0bc498ec17eeb046c3494126e2ff12339abde77
diff --cc git-gui.sh
index 46358258b,4cf340dfe..84a3b6201
--- a/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 \