Christian StimmingUnifiy wording to say "to stage" instead of "to add" always.
Currently, there is a mixup of saying "staged changes" vs. "added changes" in the git-gui program. You obviously decided to say "staging area" instead of "index", hence "add to staging area"/"stage" instead of "add to index". I think this change is very good. Talking about the "staging area" explains the nature of this thingy much better and much more unambiguous than "index". Actually only after reading the wording "staging area" I eventually understood what this "index" thing is about... (Also, your chosen wording helps for creating a nice and consistent translation of that, but that's only an added bonus.)
With this patch I'd propose to talk every only about "stage" instead of "add". IMHO that's just the logical conclusion of the above wording decision. What do you think?
--- git-gui.sh | 6 +++--- lib/checkout_op.tcl | 2 +- lib/commit.tcl | 4 ++-- lib/index.tcl | 2 +- lib/merge.tcl | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
Show changes to 5 files +8 −8
git-gui.sh, lib/checkout_op.tcl, lib/commit.tcl, lib/index.tcl, lib/merge.tcl
diff --git a/git-gui.sh b/git-gui.sh index 3536d38..fd8b4b4 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1824,12 +1824,12 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { lappend disable_on_lock \ [list .mbar.commit entryconf [.mbar.commit index last] -state] - .mbar.commit add command -label [mc "Add To Commit"] \ + .mbar.commit add command -label [mc "Stage To Commit"] \ -command do_add_selection lappend disable_on_lock \ [list .mbar.commit entryconf [.mbar.commit index last] -state] - .mbar.commit add command -label [mc "Add Existing To Commit"] \ + .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ -command do_add_all \ -accelerator $M1T-I lappend disable_on_lock \ @@ -2180,7 +2180,7 @@ pack .vpane.lower.commarea.buttons.rescan -side top -fill x lappend disable_on_lock \ {.vpane.lower.commarea.buttons.rescan conf -state} -button .vpane.lower.commarea.buttons.incall -text [mc "Add Existing"] \ +button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ -command do_add_all pack .vpane.lower.commarea.buttons.incall -side top -fill x lappend disable_on_lock \ diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index 25bf9cf..a2f2509 100644 --- a/lib/checkout_op.tcl +++ b/lib/checkout_op.tcl @@ -247,7 +247,7 @@ method _checkout {} { if {[lock_index checkout_op]} { after idle [cb _start_checkout] } else { - _error $this [mc "Index is already locked."] + _error $this [mc "Staging area (index) is already locked."] delete_this } } diff --git a/lib/commit.tcl b/lib/commit.tcl index f60b11e..aa9110d 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -153,7 +153,7 @@ The rescan will be automatically started now. U? { error_popup [mc "Unmerged files cannot be committed. -File %s has merge conflicts. You must resolve them and add the file before committing. +File %s has merge conflicts. You must resolve them and stage the file before committing. " [short_path $path]] unlock_index return @@ -169,7 +169,7 @@ File %s cannot be committed by this program. if {!$files_ready && ![string match *merge $curType]} { info_popup [mc "No changes to commit. -You must add at least 1 file before you can commit. +You must stage at least 1 file before you can commit. "] unlock_index return diff --git a/lib/index.tcl b/lib/index.tcl index 38aa6ee..e91b864 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -367,7 +367,7 @@ proc revert_helper {txt paths} { "[appname] ([reponame])" \ [mc "%s -Any unadded changes will be permanently lost by the revert." $query] \ +Any unstaged changes will be permanently lost by the revert." $query] \ question \ 1 \ [mc "Do Nothing"] \ diff --git a/lib/merge.tcl b/lib/merge.tcl index 40e82a9..a6e8cc9 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -46,7 +46,7 @@ The rescan will be automatically started now. File %s has merge conflicts. -You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge. +You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge. " [short_path $path]] unlock_index return 0
-- 1.5.3.rc2.12.gbc280
