git-gui: Correct language for M_/A_ status codes.

diff --git a/git-gui b/git-gui
index 7e28328cf0d5eca0d5c3085954e5bff5c135594f..907db0e9dce005598c256366831558e378120274 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -511,7 +511,7 @@ proc show_diff {path {w {}} {lno {}}} {
        set m [lindex $s 0]
        set diff_3way 0
        set diff_active 1
-       set ui_fname_value [escape_path $path]
+       set ui_fname_value $path
        set ui_fstatus_value [mapdesc $m $path]
        set ui_status_value "Loading diff of [escape_path $path]..."
 
@@ -1385,17 +1385,17 @@ set max_status_desc 0
 foreach i {
                {__ i plain    "Unmodified"}
                {_M i mod      "Modified"}
-               {M_ i fulltick "Checked in"}
+               {M_ i fulltick "Included in commit"}
                {MM i parttick "Partially included"}
 
                {_O o plain    "Untracked"}
-               {A_ o fulltick "Added"}
+               {A_ o fulltick "Added by commit"}
                {AM o parttick "Partially added"}
                {AD o question "Added (but now gone)"}
 
                {_D i question "Missing"}
-               {D_ i removed  "Removed"}
-               {DD i removed  "Removed"}
+               {D_ i removed  "Removed by commit"}
+               {DD i removed  "Removed by commit"}
                {DO i removed  "Removed (still exists)"}
 
                {UM i merge    "Merge conflicts"}
@@ -2284,11 +2284,33 @@ frame .vpane.lower.diff.header -background orange
 label .vpane.lower.diff.header.l1 -text {File:} \
        -background orange \
        -font font_ui
-label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
+set ui_fname .vpane.lower.diff.header.l2
+text $ui_fname \
        -background orange \
-       -anchor w \
-       -justify left \
+       -height 1 \
+       -relief flat \
+       -state disabled \
        -font font_ui
+menu $ui_fname.ctxm -tearoff 0
+$ui_fname.ctxm add command -label "Copy Only Selection" \
+       -font font_ui \
+       -command "tk_textCopy $ui_fname"
+$ui_fname.ctxm add command -label "Copy Complete Name" \
+       -font font_ui \
+       -command "
+               $ui_fname tag add sel 0.0 {end -1c}
+               tk_textCopy $ui_fname
+               $ui_fname tag remove sel 0.0 end
+       "
+bind_button3 $ui_fname "tk_popup $ui_fname.ctxm %X %Y"
+trace add variable ui_fname_value write $ui_fname.update
+proc $ui_fname.update {varname args} {
+       global ui_fname ui_fname_value
+       $ui_fname configure -state normal
+       $ui_fname delete 0.0 end
+       $ui_fname insert end [escape_path $ui_fname_value]
+       $ui_fname configure -state disabled
+}
 label .vpane.lower.diff.header.l3 -text {Status:} \
        -background orange \
        -font font_ui