git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: しらいしななこ <nanako3@bluebottle.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Xudong Guan" <xudong.guan@gmail.com>,
	git@vger.kernel.org
Subject: Re: update-po
Date: Sun, 22 Jul 2007 23:48:30 -0400	[thread overview]
Message-ID: <20070723034830.GA32566@spearce.org> (raw)
In-Reply-To: <7v644cosmu.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <gitster@pobox.com> wrote:
> しらいしななこ  <nanako3@bluebottle.com> writes:
> 
> > Quoting Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >
> >> msgid "Add Existing"
> >> msgstr ""
> >>
> >
> > I had problem when translating this word "Existing" in my old translation.
> > I did not understand what that expression meaned.  My old translation for
> > "Add Existing To Commit" said, because I did not understand what it meant,
> > "Add Some Existing THING To Commit", and it felt very wrong, but I could
> > not come up with anything better.
> 
> I did not quite understand the "Existing" either (I do not
> use git-gui myself---I just launch it from time to time to make
> sure it does not barf on simple operations as part of the last
> minite tests before pushing changes to git.git out), and had a
> discussion on #git channel with a few people.
> 
> My reading of git-gui code suggests that "Add Existing To
> Commit" is used in an item in "Commit" menu, while "Add
> Existing" is a label on the button, and they do exactly the same
> operation.  It updates the index with the current contents of
> the tracked files.  That is, deleted files are discarded from
> the index, and modified files are updated.  IOW, "git add -u".

Yes, that's exactly correct.

> "Existing" is probably a misnomer even in the original English
> UI --- it is more about "Tracked".  I think your confusion about
> "Add unexisting" is justified, because "Add Existing" operation
> is not about "existing" but "all tracked files without having me
> pick and select all of them", and the other variant, "Add To
> Commit", lets you add selected files, be they "tracked" or
> "untracked".

I agree.  I'm going to change the base English version to say
"Tracked" here instead of "Existing".  Its the correct term,
at least with regards to Git.

Thanks for the sanity check.

-- 
Shawn.

  reply	other threads:[~2007-07-23  3:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-22 13:05 update-po Johannes Schindelin
2007-07-22 23:18 ` update-po しらいしななこ
2007-07-23  0:44   ` update-po Junio C Hamano
2007-07-23  3:48     ` Shawn O. Pearce [this message]
2007-07-23 23:14     ` update-po しらいしななこ
     [not found] <200707232314.l6NNEWMj026186@mi1.bluebottle.com>
2007-07-23 23:44 ` update-po Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070723034830.GA32566@spearce.org \
    --to=spearce@spearce.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nanako3@bluebottle.com \
    --cc=xudong.guan@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).