From: Shawn O. Pearce Date: Sun, 29 Jul 2007 07:08:20 GMT Subject: Re: [PATCH] git-gui.git: Wording suggestions, 2nd try Message-ID: <20070729070820.GK20052@spearce.org> In-Reply-To: <200707282217.10772.stimming@tuhh.de> Christian Stimming wrote: > Unify wording to say "to stage" instead of "to add" always. > > Also, the warning message when clicking "Reset" is adapted to > the wording "Reset" rather than a confusion "Cancel commit?". > > Signed-off-by: Christian Stimming > --- > This time, this patch is actually based on git-gui.git's master. If > you want to, you can directly apply this regardless of i18n work that > was deferred until later. The last hunk in lib/merge.tcl looks a > bit confusing; in preparation of i18n work, the previous message > that inserted a single word into the long english sentence was > already replaced by the i18n'able form of two completely different > messages. But nevertheless the main point is that when clicking > "Reset", the upcoming question should use the wording "reset", > which it will do after this patch. Thanks, I'm including this in 0.8.0 as I think it makes things a lot clearer, at least for English speakers. ;-) As soon as git 1.5.3 ships I'll start work on 0.9.0, and I'm looking to bringing the i18n work in as the first series of changes for the 0.9.x series... -- Shawn.