update-po

update-po

[Johannes Schindelin]

Hi,

I just ran "update-po", and got 4 new messages...

msgid "Current Branch:"
msgstr ""

msgid "Staged Changes (Will Be Committed)"
msgstr ""

msgid "Unstaged Changes (Will Not Be Committed)"
msgstr ""

msgid "Add Existing"
msgstr ""

Actually, the 1st and the fourth copied the translation from somewhere 
else for ja and zh_cn.

Could you please pull from repo.or.cz and fill in these translations?

Thanks,
Dscho

Re: update-po

[しらいしななこ]

Quoting Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> msgid "Add Existing"
> msgstr ""
>
> Actually, the 1st and the fourth copied the translation from somewhere 
> else for ja and zh_cn.

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.

It makes me wonder if there is a corresponding "Add unexisting" command
somewhere else, but adding something that does not exist makes no sense to
me.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Finally - A spam blocker that actually works.
http://www.bluebottle.com/tag/4

Re: update-po

[Junio C Hamano]

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

> Quoting Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>> msgid "Add Existing"
>> msgstr ""
>>
>> Actually, the 1st and the fourth copied the translation from somewhere 
>> else for ja and zh_cn.
>
> 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.
>
> It makes me wonder if there is a corresponding "Add unexisting" command
> somewhere else, but adding something that does not exist makes no sense to
> me.

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

diff --git a/po/ja.po b/po/ja.po
index 2643acf..2f21e84 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -142,7 +142,7 @@ msgstr "コミットに追加"
 
 #: git-gui.sh:1831
 msgid "Add Existing To Commit"
-msgstr "コミットに存在するのを追加"
+msgstr "全ての変更をコミットに追加"
 
 #: git-gui.sh:1837
 msgid "Unstage From Commit"
@@ -191,19 +191,19 @@ msgstr "オンライン・ドキュメント"
 
 #: git-gui.sh:2094
 msgid "Current Branch:"
-msgstr ""
+msgstr "現在のブランチ"
 
 #: git-gui.sh:2115
 msgid "Staged Changes (Will Be Committed)"
-msgstr ""
+msgstr "ステージングされた（コミットされる）変更"
 
 #: git-gui.sh:2135
 msgid "Unstaged Changes (Will Not Be Committed)"
-msgstr ""
+msgstr "ステージングされていない（コミットされない）変更"
 
 #: git-gui.sh:2182
 msgid "Add Existing"
-msgstr ""
+msgstr "全ての変更を追加"
 
 #: git-gui.sh:2228
 msgid "Initial Commit Message:"

Re: update-po

[Shawn O. Pearce]

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.

Re: update-po

[しらいしななこ]

Quoting Junio C Hamano <gitster@pobox.com>:

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

I think the translation is good.
Thank you very much.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Get a free email account with anti spam protection.
http://www.bluebottle.com/tag/2

Re: update-po

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 679 bytes --]

Hi,

On Tue, 24 Jul 2007, しらいしななこ wrote:

> Quoting Junio C Hamano <gitster@pobox.com>:
> 
> > 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>
> > ---
> 
> I think the translation is good.
> Thank you very much.

Thanks, both.

Ciao,
Dscho