git-gui: Changed term 'check-in' to 'include'.
At least one user was confused by the term 'check-in'; he thought that clicking that button would commit just that one file, but he wanted to include all modified files into his next commit. Since git doesn't really have a check-in concept this really was poor language to use. Git does have an update-index concept but that is a little too low level to show to the user. So instead we now talk about including files in a commit. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Nov 8, 2006 at 22:48 UTC
7fe7e733fafbab0373ee0d8fc35b9e284a598ee4
1 file changed
+19
-19
git-gui
+19
-19
@@ -14,7 +14,7 @@ exec wish "$0" -- "$@"
14
set single_commit 0
15
set status_active 0
16
set diff_active 0
17
-set checkin_active 0
17
+set update_active 0
18
set commit_active 0
19
set update_index_fd {}
20
@@ -469,7 +469,7 @@ before committing.
469
error_popup "Unmerged files cannot be committed.
470
471
File $path has merge conflicts.
472
-You must resolve them and check the file in before committing.
472
+You must resolve them and include the file before committing.
473
"
474
unlock_index
475
return
@@ -483,9 +483,9 @@ File $path cannot be committed by this program.
483
}
484
}
485
if {!$files_ready} {
486
- error_popup {No checked-in files to commit.
486
+ error_popup {No included files to commit.
487
488
-You must check-in at least 1 file before you can commit.
488
+You must include at least 1 file before you can commit.
489
}
490
unlock_index
491
return
@@ -1088,7 +1088,7 @@ foreach i {
1088
{__ i plain "Unmodified"}
1089
{_M i mod "Modified"}
1090
{M_ i fulltick "Checked in"}
1091
- {MM i parttick "Partially checked in"}
1091
+ {MM i parttick "Partially included"}
1092
1093
{_O o plain "Untracked"}
1094
{A_ o fulltick "Added"}
@@ -1373,13 +1373,13 @@ proc do_rescan {} {
1373
update_status
1374
}
1375
1376
-proc do_checkin_all {} {
1377
- global checkin_active ui_status_value
1376
+proc do_include_all {} {
1377
+ global update_active ui_status_value
1378
1379
- if {$checkin_active || ![lock_index begin-update]} return
1379
+ if {$update_active || ![lock_index begin-update]} return
1380
1381
- set checkin_active 1
1382
- set ui_status_value {Checking in all files...}
1381
+ set update_active 1
1382
+ set ui_status_value {Including all modified files...}
1383
after 1 {
1384
with_update_index {
1385
foreach path [array names file_states] {
@@ -1393,7 +1393,7 @@ proc do_checkin_all {} {
1393
}
1394
}
1395
}
1396
- set checkin_active 0
1396
+ set update_active 0
1397
set ui_status_value {Ready.}
1398
}
1399
}
@@ -1503,8 +1503,8 @@ lappend disable_on_lock \
1503
-font $mainfont
1504
lappend disable_on_lock \
1505
[list .mbar.commit entryconf [.mbar.commit index last] -state]
1506
-.mbar.commit add command -label {Check-in All Files} \
1507
- -command do_checkin_all \
1506
+.mbar.commit add command -label {Include All Files} \
1507
+ -command do_include_all \
1508
-accelerator $M1T-U \
1509
-font $mainfont
1510
lappend disable_on_lock \
@@ -1608,11 +1608,11 @@ button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
1608
pack .vpane.lower.commarea.buttons.amend -side top -fill x
1609
lappend disable_on_lock {.vpane.lower.commarea.buttons.amend conf -state}
1610
1611
-button .vpane.lower.commarea.buttons.ciall -text {Check-in All} \
1612
- -command do_checkin_all \
1611
+button .vpane.lower.commarea.buttons.incall -text {Include All} \
1612
+ -command do_include_all \
1613
-font $mainfont
1614
-pack .vpane.lower.commarea.buttons.ciall -side top -fill x
1615
-lappend disable_on_lock {.vpane.lower.commarea.buttons.ciall conf -state}
1614
+pack .vpane.lower.commarea.buttons.incall -side top -fill x
1615
+lappend disable_on_lock {.vpane.lower.commarea.buttons.incall conf -state}
1616
1617
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1618
-command do_signoff \
@@ -1723,8 +1723,8 @@ bind all <$M1B-Key-r> do_rescan
1723
bind all <$M1B-Key-R> do_rescan
1724
bind . <$M1B-Key-s> do_signoff
1725
bind . <$M1B-Key-S> do_signoff
1726
-bind . <$M1B-Key-u> do_checkin_all
1727
-bind . <$M1B-Key-U> do_checkin_all
1726
+bind . <$M1B-Key-u> do_include_all
1727
+bind . <$M1B-Key-U> do_include_all
1728
bind . <$M1B-Key-Return> do_commit
1729
bind all <$M1B-Key-q> do_quit
1730
bind all <$M1B-Key-Q> do_quit