Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
My patch is not listed. When is it merged? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 3/3] Update po/ja.po
Is free translation impossible? I want to give priority to ease of use. Does Mr. Hamano know that it is said that Japanese translation of Git-gui is very unclear? It is wonderful that my translation is severely examined so far by me compared with a former translator. Compiled .msg file so that it can try easily was uploaded. https://docs.google.com/file/d/0B7h5NcRw8uVCSHMyVnFzQzJaZFU/edit?usp=sharing 2013/7/23 Junio C Hamano gits...@pobox.com: Yamada Saburo devil.tamac...@gmail.com writes: -#: git-gui.sh:2893 +#: git-gui.sh:2983 git-gui.sh:3115 +msgid Usage +msgstr 使用状況 Is this correct? I am not familiar with the context this string appears, but shouldn't it be 使い方? -#: lib/choose_repository.tcl:479 +#: lib/choose_repository.tcl:480 msgid Source Location: msgstr ソースの位置 -#: lib/choose_repository.tcl:490 +#: lib/choose_repository.tcl:489 msgid Target Directory: -msgstr 先ディレクトリ: +msgstr 保存ディレクトリ: I think this is better translation than the original (the Target is about where the new clone appears), but a few lines above we see Source Location, which may want to be reworded. Perhaps クローン元リポジトリ クローン先リポジトリ ??? -#: lib/commit.tcl:272 +#: lib/commit.tcl:269 +msgid +You are about to commit on a detached head. This is a potentially dangerous +thing to do because if you switch to another branch you will lose your +changes and it can be difficult to retrieve them later from the reflog. You +should probably cancel this commit and create a new branch to continue.\n + \n + Do you really want to proceed with your Commit? +msgstr +あなたはdetached +head状態でコミットしようとしています。これは危険な操作です。もし続行すれば、他ブランチへ切り替えた際に変更を失ったり、reflogで変更を復元することが困難になります。あなたは次の操作をするべきです。1. The line wrapping of this look somewhat fishy. It technically is correct, but ending the line with an explicit \n and closing dq, i.e. あなたはdetached head状態...べきです。\n would be more natural and less error prone. Also, the original says potentially dangerous, but potentially is lost in translation. I am not sure if the difference matters very much, but since I noticed it +このコミットをキャンセルする。2. 新しいブランチを作り、コミットし直す。\n Also, the original doesn't say 1. cancel this commit. 2. Create a new branch to recommit, and it is better without 1./2., which may be mistaken as if the user can do one of two things. +\n +本当にこの危険なコミットを実行しますか？ The last sentence in the original only says your Commit, without saying Dangerous. In short, the translated text is far more alarming than the original phrasing. -#: lib/option.tcl:132 +#: lib/option.tcl:134 msgid Global (All Repositories) -msgstr 大域（全てのリポジトリ） +msgstr 標準設定（全てのリポジトリ） The translation reads Standard, not Global. 「全体設定」, perhaps? -#: lib/option.tcl:142 +#: lib/option.tcl:144 msgid Merge Verbosity -msgstr マージの冗長度 +msgstr マージのエラー出力レベル (0-5, 標準2、最高5)(merge.verbosity) The original does not have 0-5, 2, nor 5. Translation shouldn't add one. If it will help the users to add these, please first add them to the original so that users of all languages would benefit and then translate the result. -#: lib/option.tcl:143 +#: lib/option.tcl:145 msgid Show Diffstat After Merge -msgstr マージ後に diffstat を表示 +msgstr マージ後に変更量のグラフを表示 (git diff --stat) Ditto. -#: lib/option.tcl:150 +#: lib/option.tcl:153 msgid Minimum Letters To Blame Copy On -msgstr コピーを検知する最少文字数 +msgstr 他ファイルから移動/コピーを検知する最少文字数 (標準値40) Ditto. Pat, this patch is not quite ready. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/3] git-gui translation update
lib/option.tcl |2 +- po/git-gui.pot | 1056 +++ po/ja.po | 1143 ++-- 3 files changed, 1195 insertions(+), 1006 deletions(-) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/3] Add translation (yes,no,ask)
Signed-off-by: Yamada Saburo devil.tamac...@gmail.com
---
lib/option.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/option.tcl b/lib/option.tcl
index 0cf1da1..7af858c 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -158,7 +158,7 @@ proc do_options {} {
{t gui.newbranchtemplate {mc New Branch Name Template}}
{c gui.encoding {mc Default File Contents Encoding}}
{b gui.warndetachedcommit {mc Warn before committing to a
detached head}}
- {s gui.stageuntracked {mc Staging of untracked files} {list
yes
no ask}}
+ {s gui.stageuntracked {mc Staging of untracked files} {list
[mc
yes] [mc no] [mc ask]}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
--
1.8.1.msysgit.1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] Update po/git-gui.pot
Signed-off-by: Yamada Saburo devil.tamac...@gmail.com --- po/git-gui.pot | 1056 +++- 1 file changed, 578 insertions(+), 478 deletions(-) diff --git a/po/git-gui.pot b/po/git-gui.pot index 0c94f9c..97ed37a 100644 --- a/po/git-gui.pot +++ b/po/git-gui.pot @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-26 15:47-0800\n +POT-Creation-Date: 2013-07-10 03:27+0900\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME EMAIL@ADDRESS\n Language-Team: LANGUAGE l...@li.org\n @@ -16,33 +16,33 @@ msgstr Content-Type: text/plain; charset=CHARSET\n Content-Transfer-Encoding: 8bit\n -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid git-gui: fatal error -msgstr - -#: git-gui.sh:743 +#: git-gui.sh:859 #, tcl-format msgid Invalid font specified in %s: msgstr -#: git-gui.sh:779 +#: git-gui.sh:911 msgid Main Font msgstr -#: git-gui.sh:780 +#: git-gui.sh:912 msgid Diff/Console Font msgstr -#: git-gui.sh:794 +#: git-gui.sh:926 git-gui.sh:940 git-gui.sh:953 git-gui.sh:1043 +#: git-gui.sh:1062 git-gui.sh:3094 +msgid git-gui: fatal error +msgstr + +#: git-gui.sh:927 msgid Cannot find git in PATH. msgstr -#: git-gui.sh:821 +#: git-gui.sh:954 msgid Cannot parse Git version string: msgstr -#: git-gui.sh:839 +#: git-gui.sh:979 #, tcl-format msgid Git version cannot be determined.\n @@ -54,473 +54,493 @@ msgid Assume '%s' is version 1.5.0?\n msgstr -#: git-gui.sh:1128 +#: git-gui.sh:1276 msgid Git directory not found: msgstr -#: git-gui.sh:1146 +#: git-gui.sh:1306 msgid Cannot move to top of working directory: msgstr -#: git-gui.sh:1154 +#: git-gui.sh:1314 msgid Cannot use bare repository: msgstr -#: git-gui.sh:1162 +#: git-gui.sh:1322 msgid No working directory msgstr -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1494 lib/checkout_op.tcl:306 msgid Refreshing file status... msgstr -#: git-gui.sh:1390 +#: git-gui.sh:1554 msgid Scanning for modified files ... msgstr -#: git-gui.sh:1454 +#: git-gui.sh:1621 msgid Calling prepare-commit-msg hook... msgstr -#: git-gui.sh:1471 +#: git-gui.sh:1638 msgid Commit declined by prepare-commit-msg hook. msgstr -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1796 lib/browser.tcl:252 msgid Ready. msgstr -#: git-gui.sh:1787 +#: git-gui.sh:1954 #, tcl-format msgid Displaying only %s of %s files. msgstr -#: git-gui.sh:1913 +#: git-gui.sh:2080 msgid Unmodified msgstr -#: git-gui.sh:1915 +#: git-gui.sh:2082 msgid Modified, not staged msgstr -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2083 git-gui.sh:2095 msgid Staged for commit msgstr -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2084 git-gui.sh:2096 msgid Portions staged for commit msgstr -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2085 git-gui.sh:2097 msgid Staged for commit, missing msgstr -#: git-gui.sh:1920 +#: git-gui.sh:2087 msgid File type changed, not staged msgstr -#: git-gui.sh:1921 +#: git-gui.sh:2088 git-gui.sh:2089 +msgid File type changed, old type staged for commit +msgstr + +#: git-gui.sh:2090 msgid File type changed, staged msgstr -#: git-gui.sh:1923 +#: git-gui.sh:2091 +msgid File type change staged, modification not staged +msgstr + +#: git-gui.sh:2092 +msgid File type change staged, file missing +msgstr + +#: git-gui.sh:2094 msgid Untracked, not staged msgstr -#: git-gui.sh:1928 +#: git-gui.sh:2099 msgid Missing msgstr -#: git-gui.sh:1929 +#: git-gui.sh:2100 msgid Staged for removal msgstr -#: git-gui.sh:1930 +#: git-gui.sh:2101 msgid Staged for removal, still present msgstr -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2103 git-gui.sh:2104 git-gui.sh:2105 git-gui.sh:2106 +#: git-gui.sh:2107 git-gui.sh:2108 msgid Requires merge resolution msgstr -#: git-gui.sh:1972 +#: git-gui.sh:2143 msgid Starting gitk... please wait... msgstr -#: git-gui.sh:1984 +#: git-gui.sh:2155 msgid Couldn't find gitk in PATH msgstr -#: git-gui.sh:2043 +#: git-gui.sh:2214 msgid Couldn't find git gui in PATH msgstr -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2633 lib/choose_repository.tcl:36 msgid Repository msgstr -#: git-gui.sh:2456 +#: git-gui.sh:2634 msgid Edit msgstr -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2636 lib/choose_rev.tcl:567 msgid Branch msgstr -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2639 lib/choose_rev.tcl:554 msgid Commit@@noun msgstr -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2642 lib/merge.tcl:123 lib/merge.tcl:152 lib/merge.tcl:170 msgid Merge msgstr -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2643 lib/choose_rev.tcl:563 msgid Remote msgstr -#: git-gui.sh
Fwd: [PATCH 4/4] Update Japanese translation (Git-gui)
-- Forwarded message -- From: Yamada Saburo devil.tamac...@gmail.com Date: 2013/7/19 Subject: Re: [PATCH 4/4] Update Japanese translation (Git-gui) To: Junio C Hamano gits...@pobox.com 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 gits...@pobox.com: 悪魔野玉茶無 devil.tamac...@gmail.com 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Fwd: [PATCH 2/4] Update git-gui/po/ja.po (Git-gui Japanese)
-- Forwarded message -- From: Yamada Saburo devil.tamac...@gmail.com Date: 2013/7/19 Subject: Re: [PATCH 2/4] Update git-gui/po/ja.po (Git-gui Japanese) To: Junio C Hamano gits...@pobox.com Hi Hamano, I suspect that is not a name Real name. +Language: \n What is this about I used QT Linguist for Win. This line append by QT Linguist. fuzzy No translation??? x7 translated in Patch4/4. Thanks 2013/7/19 Junio C Hamano gits...@pobox.com: 悪魔野玉茶無 devil.tamac...@gmail.com writes: I suspect that is not a name (and I somehow have suspicion that the S-o-b is not real, either), but if you send patches as somebody that does not match your sign-off, please add From: Yamada Saburo devil.tamac...@gmail.com followed by a blank line at the very beginning of the e-mail body. That will override the e-mail From: line your MUA puts in your message and record the commit as authored by Yamada Saburo. Signed-off-by: Yamada Saburo devil.tamac...@gmail.com --- Thanks. git-gui/po/ja.po | 1066 +- 1 file changed, 583 insertions(+), 483 deletions(-) diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po index 9aff249..0bbe504 100644 --- a/git-gui/po/ja.po +++ b/git-gui/po/ja.po @@ -7,41 +7,42 @@ msgid msgstr Project-Id-Version: git-gui\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-01-26 15:47-0800\n +POT-Creation-Date: 2013-07-10 02:45+0900\n PO-Revision-Date: 2010-02-02 19:03+0900\n Last-Translator: しらいし ななこ nana...@lavabit.com\n 山田三郎 would be the last translater, no? Language-Team: Japanese\n +Language: \n What is this about MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: git-gui.sh:1921 +#: git-gui.sh:2088 git-gui.sh:2089 +#, fuzzy +msgid File type changed, old type staged for commit +msgstr ファイル型変更、コミット未予定 If this is no longer fuzzy, please resolve it by removing #, fuzzy marker. Also, this translation seems to be incomplete. It may be OK for some strings (e.g. RegExp that seems to be a label of a checkbox or something) to be the same as the original, but some others may need a bit more work. I wonder if there is a mechanism in *.po files to differentiate between I looked at this entry and using the original string as the template is fine and I didn't translate this string, but it should be. I think the following entries seem to fall into the latter category. -#: lib/commit.tcl:272 +#: lib/commit.tcl:269 +msgid +You are about to commit on a detached head. This is a potentially dangerous +thing to do because if you switch to another branch you will lose your +changes and it can be difficult to retrieve them later from the reflog. You +should probably cancel this commit and create a new branch to continue.\n + \n + Do you really want to proceed with your Commit? +msgstr No translation??? -#: lib/index.tcl:398 +#: lib/index.tcl:380 +#, tcl-format +msgid Stage %d untracked files? +msgstr No translation??? -#: lib/option.tcl:149 +#: lib/option.tcl:151 +msgid Use Textconv For Diffs and Blames +msgstr No translation??? -#: lib/option.tcl:153 +#: lib/option.tcl:156 +msgid Additional Diff Parameters +msgstr No translation??? +#: lib/option.tcl:160 +msgid Warn before committing to a detached head +msgstr No translation??? +#: lib/option.tcl:161 +msgid Staging of untracked files +msgstr No translation??? +#: lib/transport.tcl:25 +msgid fetch all remotes +msgstr No translation??? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
