---------- Forwarded message ---------- From: Yamada Saburo <devil.tamachan@xxxxxxxxx> Date: 2013/7/19 Subject: Re: [PATCH 4/4] Update Japanese translation (Git-gui) To: Junio C Hamano <gitster@xxxxxxxxx> Hi Hamano, > dubious ones like this (there is no change to the string, just the > way msgstr is formatted to make them all overlong single strings). changed by QT Linguist for Win. > Perhaps "元のファイルタイプでの変更をコミット予定済", or something? Your translation looks right. New mail is due to be thrown later here. Thanks 2013/7/19 Junio C Hamano <gitster@xxxxxxxxx>: > 悪魔野玉茶無 <devil.tamachan@xxxxxxxxx> writes: > >> @@ -124,26 +127,23 @@ msgstr "コミット予定済、ファイル無し" >> >> #: git-gui.sh:2087 >> msgid "File type changed, not staged" >> -msgstr "ファイル型変更、コミット未予定" >> +msgstr "ファイルタイプ変更、コミット未予定" > > There are good changes like this in this patch, and ... > >> #: git-gui.sh:3095 >> #, tcl-format >> msgid "fatal: cannot stat path %s: No such file or directory" >> -msgstr "" >> -"致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま" >> -"せん" >> +msgstr "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありません" > > dubious ones like this (there is no change to the string, just the > way msgstr is formatted to make them all overlong single strings). > >> #: git-gui.sh:2088 git-gui.sh:2089 >> -#, fuzzy >> msgid "File type changed, old type staged for commit" >> -msgstr "ファイル型変更、コミット未予定" >> +msgstr "ファイルタイプ変更、コミット予定の形式が古い" > > Is this correct? I do not personally use git-gui, but I _think_ > this message is given when you did something like this: > > edit file ;# "file" is a regular file > git add file > rm file > ln -s something file ;# "file" is now a symbolic link > > at this point, "git status" would say "MT file". The latter half of > the translated Japanese reads "format planned to commit is ancient". > > Perhaps "元のファイルタイプでの変更をコミット予定済", or something? > > In any case, I think the organization of the series should be > > [PATCH 1/3] git-gui: mark yes/no/ask for translation > > which is your 3/4, and then > > [PATCH 2/3] git-gui: update git-gui/po/git-gui.pot > > which is your 1/4, and then > > [PATCH 3/3] git-gui: update Japanese translation > > which is all the changes to git-gui/po/ja.po in your 2/4 and 4/4. > > Also I forgot to notice when I was reading the earlier patches, but > git-gui has a separate root commit, so please base your work on > Pat Thoyts's tree at: > > git://repo.or.cz/git-gui > > Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html