diff options
| author | Christian Stimming <stimming@tuhh.de> | 2007-07-28 22:17:10 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-29 03:09:07 -0400 |
| commit | 360cc106e76ea2a4ba424905c4924e9ed6a4165d (patch) | |
| tree | 5136c6179658076d4e46d185718982cd68dec8dd /lib/commit.tcl | |
| parent | 1e0a92fdf74caa0bf850f73e284818473c8f76e0 (diff) | |
git-gui: Unify wording to say "to stage" instead of "to add"
Also, the warning message when clicking "Reset" is adapted to
the wording "Reset" rather than a confusion "Cancel commit?".
Signed-off-by: Christian Stimming <stimming@tuhh.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/commit.tcl')
| -rw-r--r-- | lib/commit.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 1f5c2c3d44..f857a2ff5b 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -153,7 +153,7 @@ The rescan will be automatically started now. U? { error_popup "Unmerged files cannot be committed. -File [short_path $path] has merge conflicts. You must resolve them and add the file before committing. +File [short_path $path] has merge conflicts. You must resolve them and stage the file before committing. " unlock_index return @@ -169,7 +169,7 @@ File [short_path $path] cannot be committed by this program. if {!$files_ready && ![string match *merge $curType]} { info_popup {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 |