Re: update-po

しらいしななこ  <nanako3@bluebottle.com> writes:

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".

"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".

        Side note: I realize that "track" does not translate
        well to Japanese.  The literal translation E-to-J
        dictionaries give us is "追跡", but looking at that word
        alone gives us connotations associated with crime-drama
        words, "chase" or "pursue", which is misleading.  In the
        context of revision control, "track" simply means "place
        under version control", so probably "版管理下に置く"
        (place under source control) would be the corresponding
        Japanese for word "to track", but it is rather long.

We often call untracked files "files unknown to git", so the opposite of that, "tracked file" are "files known to git". Because we would want short-and-sweet expressions in the UI, perhaps in Japanese translation, we can say:

	"Add Existing" => "既知のファイルを再登録"

(that roughly reads "Re-Register Known Files").

Hmph, that is still too long. Maybe paraphrasing it as "Add All Modified" would be shorter? "全ての変更を追加" I think I like that better.

Also "staged" and "unstaged" are hard to translate words. Googling of Japanese sites suggests that "ステージングする" (roughly, "to perform staging") is already accepted as a verb, so "Staged Changes (Will Be Committted)" would be "ステージング された（コミットされる）変更" (roughly, "Changes that have been performed <<staging>>"). Yuck.

How about this patch?

-- >8 -- [PATCH] git-gui Japanese messages: translate Add Existing, Staged and Unstaged.

Add "Existing" is probably a misnomer, so paraphrase it as "all modifications". "To Stage" is hard to translate but "Staging" has become Japanese word so use that word to translate "Staged" and "Unstaged" as (roughly) "Have been (Not have been) performed <<Staging>>".

Signed-off-by: Junio C Hamano <gitster@cox.net>
---