* [PATCH 1/6] git-gui: The term unified for remote in Japanese @ 2016-09-03 14:43 Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 2/6] git-gui: The term unified for blame " Satoshi Yasushima ` (6 more replies) 0 siblings, 7 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-03 14:43 UTC (permalink / raw) To: git; +Cc: Pat Thoyts, Satothi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9aff249..8a2c16f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -765,7 +765,8 @@ msgstr "トラッキング・ブランチを選択して下さい。" #: lib/branch_create.tcl:140 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" +msgstr "" +"トラッキング・ブランチ %s はリモートリポジトリのブランチではありません。" #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 msgid "Please supply a branch name." @@ -2192,7 +2193,7 @@ msgstr "%2$s にある %1$s をセットアップします" #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Branch Remotely" -msgstr "遠隔でブランチ削除" +msgstr "リモートブランチ削除" #: lib/remote_branch_delete.tcl:47 msgid "From Repository" @@ -2504,7 +2505,7 @@ msgstr "%s から新しい変更をフェッチしています" #: lib/transport.tcl:18 #, tcl-format msgid "remote prune %s" -msgstr "遠隔刈込 %s" +msgstr "リモート刈込 %s" #: lib/transport.tcl:19 #, tcl-format -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 2/6] git-gui: The term unified for blame in Japanese 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima @ 2016-09-03 14:43 ` Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 4/6] git-gui: Add Japanese language code Satoshi Yasushima ` (5 subsequent siblings) 6 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-03 14:43 UTC (permalink / raw) To: git; +Cc: Pat Thoyts, Satothi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8a2c16f..b692b5c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -598,7 +598,7 @@ msgstr "文脈を見せる" #: lib/blame.tcl:291 msgid "Blame Parent Commit" -msgstr "親コミットを註釈" +msgstr "親コミットを注釈" #: lib/blame.tcl:450 #, tcl-format @@ -2052,7 +2052,7 @@ msgstr "コピーを検知する最少文字数" #: lib/option.tcl:151 msgid "Blame History Context Radius (days)" -msgstr "註釈する履歴半径(日数)" +msgstr "注釈する履歴半径(日数)" #: lib/option.tcl:152 msgid "Number of Diff Context Lines" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 4/6] git-gui: Add Japanese language code 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 2/6] git-gui: The term unified for blame " Satoshi Yasushima @ 2016-09-03 14:43 ` Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 5/6] git-gui: Update Japanese translation Satoshi Yasushima ` (4 subsequent siblings) 6 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-03 14:43 UTC (permalink / raw) To: git; +Cc: Pat Thoyts, Satothi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index b140e8b..23974cc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-02-02 19:03+0900\n" "Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n" "Language-Team: Japanese\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 5/6] git-gui: Update Japanese translation 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 2/6] git-gui: The term unified for blame " Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 4/6] git-gui: Add Japanese language code Satoshi Yasushima @ 2016-09-03 14:43 ` Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 6/6] git-gui: Update Japanese information Satoshi Yasushima ` (3 subsequent siblings) 6 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-03 14:43 UTC (permalink / raw) To: git; +Cc: Pat Thoyts, Satothi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 77 +++++++++++++++++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23974cc..deaf8e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -102,6 +102,8 @@ msgstr "準備完了" msgid "" "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." msgstr "" +"表示可能な限界 (gui.maxfilesdisplayed = %s) に達しため、全体で%s個のファイル" +"を表示できません" #: git-gui.sh:2101 msgid "Unmodified" @@ -128,23 +130,20 @@ msgid "File type changed, not staged" msgstr "ファイル型変更、コミット未予定" #: git-gui.sh:2109 git-gui.sh:2110 -#, fuzzy msgid "File type changed, old type staged for commit" -msgstr "ファイル型変更、コミット未予定" +msgstr "ファイル型変更、旧型コミット予定済" #: git-gui.sh:2111 msgid "File type changed, staged" msgstr "ファイル型変更、コミット予定済" #: git-gui.sh:2112 -#, fuzzy msgid "File type change staged, modification not staged" -msgstr "ファイル型変更、コミット未予定" +msgstr "ファイル型変更コミット予定済、変更コミット未予定" #: git-gui.sh:2113 -#, fuzzy msgid "File type change staged, file missing" -msgstr "ファイル型変更、コミット予定済" +msgstr "ファイル型変更コミット予定済、ファイル無し" #: git-gui.sh:2115 msgid "Untracked, not staged" @@ -408,10 +407,9 @@ msgstr "SSH キーを表示" #: git-gui.sh:3014 git-gui.sh:3146 msgid "Usage" -msgstr "" +msgstr "使い方" #: git-gui.sh:3095 lib/blame.tcl:573 -#, fuzzy msgid "Error" msgstr "エラー" @@ -1112,9 +1110,8 @@ msgid "Find Text..." msgstr "テキストを検索" #: lib/blame.tcl:288 -#, fuzzy msgid "Goto Line..." -msgstr "複製…" +msgstr "指定行に移動…" #: lib/blame.tcl:297 msgid "Do Full Copy Detection" @@ -1310,7 +1307,7 @@ msgstr "共有(最高速・非推奨・バックアップ無し)" #: lib/choose_repository.tcl:545 msgid "Recursively clone submodules too" -msgstr "" +msgstr "サブモジュールも再帰的に複製する" #: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 #: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 @@ -1435,12 +1432,11 @@ msgstr "ファイル" #: lib/choose_repository.tcl:981 msgid "Cannot clone submodules." -msgstr "" +msgstr "サブモジュールが複製できません。" #: lib/choose_repository.tcl:990 -#, fuzzy msgid "Cloning submodules" -msgstr "%s から複製しています" +msgstr "サブモジュールを複製しています" #: lib/choose_repository.tcl:1015 msgid "Initial file checkout failed." @@ -1515,11 +1511,11 @@ msgstr "前" #: lib/search.tcl:52 msgid "RegExp" -msgstr "" +msgstr "正規表現" #: lib/search.tcl:54 msgid "Case" -msgstr "" +msgstr "大文字小文字を区別" #: lib/status_bar.tcl:87 #, tcl-format @@ -1635,9 +1631,9 @@ msgid "Running %s requires a selected file." msgstr "ファイルを選択してから %s を起動してください。" #: lib/tools.tcl:91 -#, fuzzy, tcl-format +#, tcl-format msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "本当に %s を起動しますか?" +msgstr "本当にファイル \"%2$s\"で %1$s を起動しますか?" #: lib/tools.tcl:95 #, tcl-format @@ -1817,16 +1813,15 @@ msgstr "トラッキングブランチを合わせる" #: lib/option.tcl:151 msgid "Use Textconv For Diffs and Blames" -msgstr "" +msgstr "diff と注釈に textconv を使う" #: lib/option.tcl:152 msgid "Blame Copy Only On Changed Files" msgstr "変更されたファイルのみコピー検知を行なう" #: lib/option.tcl:153 -#, fuzzy msgid "Maximum Length of Recent Repositories List" -msgstr "最近使ったリポジトリ" +msgstr "最近使ったリポジトリ一覧の上限" #: lib/option.tcl:154 msgid "Minimum Letters To Blame Copy On" @@ -1842,7 +1837,7 @@ msgstr "diff の文脈行数" #: lib/option.tcl:157 msgid "Additional Diff Parameters" -msgstr "" +msgstr "diff の追加引数" #: lib/option.tcl:158 msgid "Commit Message Text Width" @@ -1858,19 +1853,19 @@ msgstr "ファイル内容のデフォールトエンコーディング" #: lib/option.tcl:161 msgid "Warn before committing to a detached head" -msgstr "" +msgstr "分離 HEAD のコミット前に警告する" #: lib/option.tcl:162 msgid "Staging of untracked files" -msgstr "" +msgstr "管理外のファイルをコミット予定する" #: lib/option.tcl:163 msgid "Show untracked files" -msgstr "" +msgstr "管理外のファイルを表示する" #: lib/option.tcl:164 msgid "Tab spacing" -msgstr "" +msgstr "タブ幅" #: lib/option.tcl:210 msgid "Change" @@ -1979,22 +1974,19 @@ msgstr "%s から削除されたトラッキング・ブランチを刈ってい #: lib/transport.tcl:25 msgid "fetch all remotes" -msgstr "" +msgstr "すべてのリモートを取得" #: lib/transport.tcl:26 -#, fuzzy msgid "Fetching new changes from all remotes" -msgstr "%s から新しい変更をフェッチしています" +msgstr "すべてのリモートから新しい変更をフェッチしています" #: lib/transport.tcl:40 -#, fuzzy msgid "remote prune all remotes" -msgstr "リモート刈込 %s" +msgstr "リモート刈込 すべてのリモート" #: lib/transport.tcl:41 -#, fuzzy msgid "Pruning tracking branches deleted from all remotes" -msgstr "%s から削除されたトラッキング・ブランチを刈っています" +msgstr "すべてのリモートから削除されたトラッキング・ブランチを刈っています" #: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 #: lib/remote_add.tcl:162 @@ -2247,7 +2239,7 @@ msgstr "コミットに %s を加えています" #: lib/index.tcl:380 #, tcl-format msgid "Stage %d untracked files?" -msgstr "" +msgstr "管理外の %d ファイルをコミット予定としますか?" #: lib/index.tcl:428 #, tcl-format @@ -2452,6 +2444,13 @@ msgid "" " \n" " Do you really want to proceed with your Commit?" msgstr "" +"分離 HEAD での変更をコミットしようとしています。" +"これは潜在的に危険な行為で、理由は別のブランチへの切り替えで" +"変更が消失し、reflog からの事後復旧も困難となるためです。" +"おそらくこのコミットはキャンセルし新しく作成したブランチで" +"行うべきです。\n" +"\n" +" 本当にコミットを続行しますか?" #: lib/commit.tcl:290 msgid "Calling commit-msg hook..." @@ -2593,11 +2592,11 @@ msgstr "%2$s にある %1$s をセットアップします" #: lib/line.tcl:17 msgid "Goto Line:" -msgstr "" +msgstr "行番号" #: lib/line.tcl:23 msgid "Go" -msgstr "" +msgstr "移動" #: lib/branch_create.tcl:23 msgid "Create Branch" @@ -2681,9 +2680,3 @@ msgstr "スペルチェッカーが予想外の EOF を返しました" #: lib/spellcheck.tcl:392 msgid "Spell Checker Failed" msgstr "スペルチェック失敗" - -#~ msgid "Displaying only %s of %s files." -#~ msgstr "全体で%s個の内の%sファイルだけ表示しています" - -#~ msgid "Case-Sensitive" -#~ msgstr "大文字小文字を区別" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 6/6] git-gui: Update Japanese information 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima ` (2 preceding siblings ...) 2016-09-03 14:43 ` [PATCH 5/6] git-gui: Update Japanese translation Satoshi Yasushima @ 2016-09-03 14:43 ` Satoshi Yasushima 2016-09-04 6:54 ` [PATCH 1/6] git-gui: The term unified for remote in Japanese Junio C Hamano ` (2 subsequent siblings) 6 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-03 14:43 UTC (permalink / raw) To: git; +Cc: Pat Thoyts, Satothi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index deaf8e3..208651c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,15 +1,17 @@ # Translation of git-gui to Japanese # Copyright (C) 2007 Shawn Pearce # This file is distributed under the same license as the git-gui package. +# # しらいし ななこ <nanako3@bluebottle.com>, 2007. +# Satoshi Yasushima <s.yasushima@gmail.com>, 2016. # msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-27 17:52+0900\n" -"PO-Revision-Date: 2010-02-02 19:03+0900\n" -"Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n" +"PO-Revision-Date: 2016-06-22 12:50+0900\n" +"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" "MIME-Version: 1.0\n" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH 1/6] git-gui: The term unified for remote in Japanese 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima ` (3 preceding siblings ...) 2016-09-03 14:43 ` [PATCH 6/6] git-gui: Update Japanese information Satoshi Yasushima @ 2016-09-04 6:54 ` Junio C Hamano 2016-09-05 16:32 ` Satoshi Yasushima 2016-09-04 12:10 ` Jakub Narębski 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima 6 siblings, 1 reply; 28+ messages in thread From: Junio C Hamano @ 2016-09-04 6:54 UTC (permalink / raw) To: Satoshi Yasushima; +Cc: git, Pat Thoyts Satoshi Yasushima <s.yasushima@gmail.com> writes: > Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> > --- I couldn't quite read/parse the title, but luckily I read Japanese ;-) You saw different Japanese words used to translate the same original word "remote" in different message strings, and you chose one of them and use it everywhere. And you did the same for "blame" in your patch 2/6. I would have described them like so: Subject: git-gui: consistently use the same word for "remote" in Japanese Subject: git-gui: consistently use the same word for "blame" in Japanese Thanks. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/6] git-gui: The term unified for remote in Japanese 2016-09-04 6:54 ` [PATCH 1/6] git-gui: The term unified for remote in Japanese Junio C Hamano @ 2016-09-05 16:32 ` Satoshi Yasushima 0 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-05 16:32 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Pat Thoyts On Sat, 03 Sep 2016 23:54:36 -0700 Junio C Hamano wrote: > I couldn't quite read/parse the title, but luckily I read Japanese ;-) > > You saw different Japanese words used to translate the same original > word "remote" in different message strings, and you chose one of > them and use it everywhere. And you did the same for "blame" in > your patch 2/6. > > I would have described them like so: > > Subject: git-gui: consistently use the same word for "remote" in Japanese > Subject: git-gui: consistently use the same word for "blame" in Japanese Thank you for your title patch. My English is so poor as with many of Japanese. Resend patches in a little while. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/6] git-gui: The term unified for remote in Japanese 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima ` (4 preceding siblings ...) 2016-09-04 6:54 ` [PATCH 1/6] git-gui: The term unified for remote in Japanese Junio C Hamano @ 2016-09-04 12:10 ` Jakub Narębski 2016-09-05 17:16 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima 6 siblings, 1 reply; 28+ messages in thread From: Jakub Narębski @ 2016-09-04 12:10 UTC (permalink / raw) To: Satoshi Yasushima, git; +Cc: Pat Thoyts W dniu 03.09.2016 o 16:43, Satoshi Yasushima pisze: > msgid "Tracking branch %s is not a branch in the remote repository." > -msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" > +msgstr "" What for is the above part of change (empty string)? > +"トラッキング・ブランチ %s はリモートリポジトリのブランチではありません。" -- Jakub Narębski ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/6] git-gui: The term unified for remote in Japanese 2016-09-04 12:10 ` Jakub Narębski @ 2016-09-05 17:16 ` Satoshi Yasushima 2016-09-05 18:03 ` Satoshi Yasushima 0 siblings, 1 reply; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-05 17:16 UTC (permalink / raw) To: Jakub Narębski; +Cc: git, Pat Thoyts On Sun, 4 Sep 2016 14:10:45 +0200 Jakub Narębski wrote: 1>> msgid "Tracking branch %s is not a branch in the remote repository." 2>> -msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" 3>> +msgstr "" 4> 5>What for is the above part of change (empty string)? 6> 7>> +"トラッキング・ブランチ %s はリモートリポジトリのブランチではありません。" I had been changed for "remote" from line 2 to line 7 above. And previously apply msgmerge because I hope this change will not change again finaly apply msgmerge. When July with MSYS2. But now, doesn't make empty string by apply msgmerge this commit. I will remake this patch. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/6] git-gui: The term unified for remote in Japanese 2016-09-05 17:16 ` Satoshi Yasushima @ 2016-09-05 18:03 ` Satoshi Yasushima 0 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-05 18:03 UTC (permalink / raw) To: Jakub Narębski; +Cc: git, Pat Thoyts On Tue, 6 Sep 2016 2:16 +0900 Satoshi Yasushima wrote: >But now, doesn't make empty string by apply msgmerge this commit. Oops. Now, I was a rebase work, msgmerge changed with empty string. Hence I think this commit keeps with empty string. ^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 1/6] git-gui: consistently use the same word for "remote" in Japanese 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima ` (5 preceding siblings ...) 2016-09-04 12:10 ` Jakub Narębski @ 2016-09-06 16:02 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 2/6] git-gui: consistently use the same word for "blame" " Satoshi Yasushima ` (3 more replies) 6 siblings, 4 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-06 16:02 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9aff249..8a2c16f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -765,7 +765,8 @@ msgstr "トラッキング・ブランチを選択して下さい。" #: lib/branch_create.tcl:140 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "トラッキング・ブランチ %s は遠隔リポジトリのブランチではありません。" +msgstr "" +"トラッキング・ブランチ %s はリモートリポジトリのブランチではありません。" #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 msgid "Please supply a branch name." @@ -2192,7 +2193,7 @@ msgstr "%2$s にある %1$s をセットアップします" #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Branch Remotely" -msgstr "遠隔でブランチ削除" +msgstr "リモートブランチ削除" #: lib/remote_branch_delete.tcl:47 msgid "From Repository" @@ -2504,7 +2505,7 @@ msgstr "%s から新しい変更をフェッチしています" #: lib/transport.tcl:18 #, tcl-format msgid "remote prune %s" -msgstr "遠隔刈込 %s" +msgstr "リモート刈込 %s" #: lib/transport.tcl:19 #, tcl-format -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 2/6] git-gui: consistently use the same word for "blame" in Japanese 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima @ 2016-09-06 16:02 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 4/6] git-gui: Add Japanese language code Satoshi Yasushima ` (2 subsequent siblings) 3 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-06 16:02 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8a2c16f..b692b5c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -598,7 +598,7 @@ msgstr "文脈を見せる" #: lib/blame.tcl:291 msgid "Blame Parent Commit" -msgstr "親コミットを註釈" +msgstr "親コミットを注釈" #: lib/blame.tcl:450 #, tcl-format @@ -2052,7 +2052,7 @@ msgstr "コピーを検知する最少文字数" #: lib/option.tcl:151 msgid "Blame History Context Radius (days)" -msgstr "註釈する履歴半径(日数)" +msgstr "注釈する履歴半径(日数)" #: lib/option.tcl:152 msgid "Number of Diff Context Lines" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 4/6] git-gui: Add Japanese language code 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 2/6] git-gui: consistently use the same word for "blame" " Satoshi Yasushima @ 2016-09-06 16:02 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 5/6] git-gui: Update Japanese translation Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 6/6] git-gui: Update Japanese information Satoshi Yasushima 3 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-06 16:02 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index b140e8b..23974cc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-02-02 19:03+0900\n" "Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n" "Language-Team: Japanese\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 5/6] git-gui: Update Japanese translation 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 2/6] git-gui: consistently use the same word for "blame" " Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 4/6] git-gui: Add Japanese language code Satoshi Yasushima @ 2016-09-06 16:02 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 6/6] git-gui: Update Japanese information Satoshi Yasushima 3 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-06 16:02 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 77 +++++++++++++++++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/po/ja.po b/po/ja.po index 23974cc..deaf8e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -102,6 +102,8 @@ msgstr "準備完了" msgid "" "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." msgstr "" +"表示可能な限界 (gui.maxfilesdisplayed = %s) に達しため、全体で%s個のファイル" +"を表示できません" #: git-gui.sh:2101 msgid "Unmodified" @@ -128,23 +130,20 @@ msgid "File type changed, not staged" msgstr "ファイル型変更、コミット未予定" #: git-gui.sh:2109 git-gui.sh:2110 -#, fuzzy msgid "File type changed, old type staged for commit" -msgstr "ファイル型変更、コミット未予定" +msgstr "ファイル型変更、旧型コミット予定済" #: git-gui.sh:2111 msgid "File type changed, staged" msgstr "ファイル型変更、コミット予定済" #: git-gui.sh:2112 -#, fuzzy msgid "File type change staged, modification not staged" -msgstr "ファイル型変更、コミット未予定" +msgstr "ファイル型変更コミット予定済、変更コミット未予定" #: git-gui.sh:2113 -#, fuzzy msgid "File type change staged, file missing" -msgstr "ファイル型変更、コミット予定済" +msgstr "ファイル型変更コミット予定済、ファイル無し" #: git-gui.sh:2115 msgid "Untracked, not staged" @@ -408,10 +407,9 @@ msgstr "SSH キーを表示" #: git-gui.sh:3014 git-gui.sh:3146 msgid "Usage" -msgstr "" +msgstr "使い方" #: git-gui.sh:3095 lib/blame.tcl:573 -#, fuzzy msgid "Error" msgstr "エラー" @@ -1112,9 +1110,8 @@ msgid "Find Text..." msgstr "テキストを検索" #: lib/blame.tcl:288 -#, fuzzy msgid "Goto Line..." -msgstr "複製…" +msgstr "指定行に移動…" #: lib/blame.tcl:297 msgid "Do Full Copy Detection" @@ -1310,7 +1307,7 @@ msgstr "共有(最高速・非推奨・バックアップ無し)" #: lib/choose_repository.tcl:545 msgid "Recursively clone submodules too" -msgstr "" +msgstr "サブモジュールも再帰的に複製する" #: lib/choose_repository.tcl:579 lib/choose_repository.tcl:626 #: lib/choose_repository.tcl:772 lib/choose_repository.tcl:842 @@ -1435,12 +1432,11 @@ msgstr "ファイル" #: lib/choose_repository.tcl:981 msgid "Cannot clone submodules." -msgstr "" +msgstr "サブモジュールが複製できません。" #: lib/choose_repository.tcl:990 -#, fuzzy msgid "Cloning submodules" -msgstr "%s から複製しています" +msgstr "サブモジュールを複製しています" #: lib/choose_repository.tcl:1015 msgid "Initial file checkout failed." @@ -1515,11 +1511,11 @@ msgstr "前" #: lib/search.tcl:52 msgid "RegExp" -msgstr "" +msgstr "正規表現" #: lib/search.tcl:54 msgid "Case" -msgstr "" +msgstr "大文字小文字を区別" #: lib/status_bar.tcl:87 #, tcl-format @@ -1635,9 +1631,9 @@ msgid "Running %s requires a selected file." msgstr "ファイルを選択してから %s を起動してください。" #: lib/tools.tcl:91 -#, fuzzy, tcl-format +#, tcl-format msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "本当に %s を起動しますか?" +msgstr "本当にファイル \"%2$s\"で %1$s を起動しますか?" #: lib/tools.tcl:95 #, tcl-format @@ -1817,16 +1813,15 @@ msgstr "トラッキングブランチを合わせる" #: lib/option.tcl:151 msgid "Use Textconv For Diffs and Blames" -msgstr "" +msgstr "diff と注釈に textconv を使う" #: lib/option.tcl:152 msgid "Blame Copy Only On Changed Files" msgstr "変更されたファイルのみコピー検知を行なう" #: lib/option.tcl:153 -#, fuzzy msgid "Maximum Length of Recent Repositories List" -msgstr "最近使ったリポジトリ" +msgstr "最近使ったリポジトリ一覧の上限" #: lib/option.tcl:154 msgid "Minimum Letters To Blame Copy On" @@ -1842,7 +1837,7 @@ msgstr "diff の文脈行数" #: lib/option.tcl:157 msgid "Additional Diff Parameters" -msgstr "" +msgstr "diff の追加引数" #: lib/option.tcl:158 msgid "Commit Message Text Width" @@ -1858,19 +1853,19 @@ msgstr "ファイル内容のデフォールトエンコーディング" #: lib/option.tcl:161 msgid "Warn before committing to a detached head" -msgstr "" +msgstr "分離 HEAD のコミット前に警告する" #: lib/option.tcl:162 msgid "Staging of untracked files" -msgstr "" +msgstr "管理外のファイルをコミット予定する" #: lib/option.tcl:163 msgid "Show untracked files" -msgstr "" +msgstr "管理外のファイルを表示する" #: lib/option.tcl:164 msgid "Tab spacing" -msgstr "" +msgstr "タブ幅" #: lib/option.tcl:210 msgid "Change" @@ -1979,22 +1974,19 @@ msgstr "%s から削除されたトラッキング・ブランチを刈ってい #: lib/transport.tcl:25 msgid "fetch all remotes" -msgstr "" +msgstr "すべてのリモートを取得" #: lib/transport.tcl:26 -#, fuzzy msgid "Fetching new changes from all remotes" -msgstr "%s から新しい変更をフェッチしています" +msgstr "すべてのリモートから新しい変更をフェッチしています" #: lib/transport.tcl:40 -#, fuzzy msgid "remote prune all remotes" -msgstr "リモート刈込 %s" +msgstr "リモート刈込 すべてのリモート" #: lib/transport.tcl:41 -#, fuzzy msgid "Pruning tracking branches deleted from all remotes" -msgstr "%s から削除されたトラッキング・ブランチを刈っています" +msgstr "すべてのリモートから削除されたトラッキング・ブランチを刈っています" #: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 #: lib/remote_add.tcl:162 @@ -2247,7 +2239,7 @@ msgstr "コミットに %s を加えています" #: lib/index.tcl:380 #, tcl-format msgid "Stage %d untracked files?" -msgstr "" +msgstr "管理外の %d ファイルをコミット予定としますか?" #: lib/index.tcl:428 #, tcl-format @@ -2452,6 +2444,13 @@ msgid "" " \n" " Do you really want to proceed with your Commit?" msgstr "" +"分離 HEAD での変更をコミットしようとしています。" +"これは潜在的に危険な行為で、理由は別のブランチへの切り替えで" +"変更が消失し、reflog からの事後復旧も困難となるためです。" +"おそらくこのコミットはキャンセルし新しく作成したブランチで" +"行うべきです。\n" +"\n" +" 本当にコミットを続行しますか?" #: lib/commit.tcl:290 msgid "Calling commit-msg hook..." @@ -2593,11 +2592,11 @@ msgstr "%2$s にある %1$s をセットアップします" #: lib/line.tcl:17 msgid "Goto Line:" -msgstr "" +msgstr "行番号" #: lib/line.tcl:23 msgid "Go" -msgstr "" +msgstr "移動" #: lib/branch_create.tcl:23 msgid "Create Branch" @@ -2681,9 +2680,3 @@ msgstr "スペルチェッカーが予想外の EOF を返しました" #: lib/spellcheck.tcl:392 msgid "Spell Checker Failed" msgstr "スペルチェック失敗" - -#~ msgid "Displaying only %s of %s files." -#~ msgstr "全体で%s個の内の%sファイルだけ表示しています" - -#~ msgid "Case-Sensitive" -#~ msgstr "大文字小文字を区別" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima ` (2 preceding siblings ...) 2016-09-06 16:02 ` [PATCH v2 5/6] git-gui: Update Japanese translation Satoshi Yasushima @ 2016-09-06 16:02 ` Satoshi Yasushima 2016-09-07 11:47 ` Satoshi Yasushima 3 siblings, 1 reply; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-06 16:02 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> --- po/ja.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index deaf8e3..208651c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,15 +1,17 @@ # Translation of git-gui to Japanese # Copyright (C) 2007 Shawn Pearce # This file is distributed under the same license as the git-gui package. +# # しらいし ななこ <nanako3@bluebottle.com>, 2007. +# Satoshi Yasushima <s.yasushima@gmail.com>, 2016. # msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-27 17:52+0900\n" -"PO-Revision-Date: 2010-02-02 19:03+0900\n" -"Last-Translator: しらいし ななこ <nanako3@lavabit.com>\n" +"PO-Revision-Date: 2016-06-22 12:50+0900\n" +"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" "MIME-Version: 1.0\n" -- 2.8.2.windows.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-06 16:02 ` [PATCH v2 6/6] git-gui: Update Japanese information Satoshi Yasushima @ 2016-09-07 11:47 ` Satoshi Yasushima 2016-09-07 17:35 ` Junio C Hamano 0 siblings, 1 reply; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-07 11:47 UTC (permalink / raw) To: git; +Cc: Junio C Hamano, Jakub Narębski, Pat Thoyts, Satoshi Yasushima Hmmm. Although I noticed now become PATCH 3/6 has lost. There seems to be a cause in the following taboo. Sure, PATCH 3/6 is little too great. http://vger.kernel.org/majordomo-info.html#taboo >Taboo things to be done when discussing at VGER lists : (abbr.) > * Message size exceeding 100 000 characters causes blocking. To somehow. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-07 11:47 ` Satoshi Yasushima @ 2016-09-07 17:35 ` Junio C Hamano 2016-09-08 6:59 ` git-gui, was " Johannes Schindelin ` (2 more replies) 0 siblings, 3 replies; 28+ messages in thread From: Junio C Hamano @ 2016-09-07 17:35 UTC (permalink / raw) To: Satoshi Yasushima, Pat Thoyts; +Cc: git, Jakub Narębski "Satoshi Yasushima" <s.yasushima@gmail.com> writes: > There seems to be a cause in the following taboo. > Sure, PATCH 3/6 is little too great. > http://vger.kernel.org/majordomo-info.html#taboo > >Taboo things to be done when discussing at VGER lists > : (abbr.) > > * Message size exceeding 100 000 characters causes blocking. > > To somehow. Since I received the patch directly bypassing vger, I queued it on gitgui-0.20.0 from Pat and tentatively merged it to my 'pu'. Pat, we haven't heard from you for a long time. How would you want to proceed? If you fetch from me and merge 52285c83 ("git-gui: update Japanese information", 2016-09-07), you'd get these six commits for po/ja.po and then we'd be in sync next time I pull from you. That is, if that ever happens--is git-gui pretty much in deep maintenance mode without anything more to do from your point of view? Thanks. ^ permalink raw reply [flat|nested] 28+ messages in thread
* git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-07 17:35 ` Junio C Hamano @ 2016-09-08 6:59 ` Johannes Schindelin 2016-09-08 16:48 ` Junio C Hamano 2016-09-08 12:55 ` Satoshi Yasushima 2016-10-03 8:45 ` Pat Thoyts 2 siblings, 1 reply; 28+ messages in thread From: Johannes Schindelin @ 2016-09-08 6:59 UTC (permalink / raw) To: Junio C Hamano; +Cc: Satoshi Yasushima, Pat Thoyts, git, Jakub Narębski Hi Junio, On Wed, 7 Sep 2016, Junio C Hamano wrote: > Pat, we haven't heard from you for a long time. Indeed. There are a couple of git-gui patches in Git for Windows that have been contributed a long time ago and not been picked up. Maybe it is time to just accept git-gui patches directly into Git, after some other Tcl/Tk savvy people ACKed them? Ciao, Dscho ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-08 6:59 ` git-gui, was " Johannes Schindelin @ 2016-09-08 16:48 ` Junio C Hamano 2016-09-20 13:37 ` Vasco Almeida 0 siblings, 1 reply; 28+ messages in thread From: Junio C Hamano @ 2016-09-08 16:48 UTC (permalink / raw) To: Johannes Schindelin Cc: Satoshi Yasushima, Pat Thoyts, git, Jakub Narębski Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > On Wed, 7 Sep 2016, Junio C Hamano wrote: > >> Pat, we haven't heard from you for a long time. > > Indeed. There are a couple of git-gui patches in Git for Windows that have > been contributed a long time ago and not been picked up. > > Maybe it is time to just accept git-gui patches directly into Git, after > some other Tcl/Tk savvy people ACKed them? Yes, that was my thinking, though I'd prefer to see somebodyto be acting as a central point of contact so that I do not have to pay any attention to the part of the system other than responding to a pull request. The subsystem maintainer does not have to forever be Pat, of course, and can be handed over to somebody else, but if that is what is going to happen, I'd prefer to see a volunteer or two to step up and Pat to bless them. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-08 16:48 ` Junio C Hamano @ 2016-09-20 13:37 ` Vasco Almeida 2016-09-21 18:16 ` Junio C Hamano 0 siblings, 1 reply; 28+ messages in thread From: Vasco Almeida @ 2016-09-20 13:37 UTC (permalink / raw) To: Junio C Hamano; +Cc: git Hi Junio Hamano, I have sent some git-gui patches on May this year and I think it will add value to accepted them at some point: git-gui: i18n stuff and small fixes <1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg92780.html git-gui: l10n: add Portuguese translation <1462550802-20601-1-git-send-email-vascomalmeida@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg92611.html There is the gitk Portuguese translation also, but that is out of the topic. For reference: gitk: Makefile: create install bin directory <1462470392-19991-1-git-send-email-vascomalmeida@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg92474.html gitk: Add Portuguese translation <1462996893-24341-1-git-send-email-vascomalmeida@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg93176.html Thank you. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-20 13:37 ` Vasco Almeida @ 2016-09-21 18:16 ` Junio C Hamano 2016-09-26 14:21 ` Junio C Hamano 0 siblings, 1 reply; 28+ messages in thread From: Junio C Hamano @ 2016-09-21 18:16 UTC (permalink / raw) To: Vasco Almeida; +Cc: git, Pat Thoyts Vasco Almeida <vascomalmeida@sapo.pt> writes: > I have sent some git-gui patches on May this year and I think it will > add value to accepted them at some point: Yeah, they may be of value, but the thing is, I am not really in the position to review or apply them (I don't do git-gui). If Pat is not going to return, we would need to find volunteers to be maintainers of "git-gui" first. Thanks. I may get to these patches when/if I find time, but it is not likely to happen very soon. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-21 18:16 ` Junio C Hamano @ 2016-09-26 14:21 ` Junio C Hamano 0 siblings, 0 replies; 28+ messages in thread From: Junio C Hamano @ 2016-09-26 14:21 UTC (permalink / raw) To: Vasco Almeida; +Cc: git, Pat Thoyts Junio C Hamano <gitster@pobox.com> writes: > Vasco Almeida <vascomalmeida@sapo.pt> writes: > >> I have sent some git-gui patches on May this year and I think it will >> add value to accepted them at some point: > > Yeah, they may be of value, but the thing is, I am not really in the > position to review or apply them (I don't do git-gui). > > If Pat is not going to return, we would need to find volunteers to > be maintainers of "git-gui" first. > > Thanks. I may get to these patches when/if I find time, but it is > not likely to happen very soon. This I just did (haven't pushed out the results, which will happen after today's regular integration cycle in the afternoon US/Pacific time). Thanks. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-07 17:35 ` Junio C Hamano 2016-09-08 6:59 ` git-gui, was " Johannes Schindelin @ 2016-09-08 12:55 ` Satoshi Yasushima 2016-10-03 8:45 ` Pat Thoyts 2 siblings, 0 replies; 28+ messages in thread From: Satoshi Yasushima @ 2016-09-08 12:55 UTC (permalink / raw) To: Junio C Hamano; +Cc: git, Pat Thoyts, JakubNar?bski, Satoshi Yasushima On Wed, 07 Sep 2016 10:35:22 -0700 Junio C Hamano wrote: >Since I received the patch directly bypassing vger, I queued it on >gitgui-0.20.0 from Pat and tentatively merged it to my 'pu'. wow, thanks so much. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-09-07 17:35 ` Junio C Hamano 2016-09-08 6:59 ` git-gui, was " Johannes Schindelin 2016-09-08 12:55 ` Satoshi Yasushima @ 2016-10-03 8:45 ` Pat Thoyts 2016-10-03 16:18 ` Junio C Hamano 2 siblings, 1 reply; 28+ messages in thread From: Pat Thoyts @ 2016-10-03 8:45 UTC (permalink / raw) To: Junio C Hamano; +Cc: Satoshi Yasushima, git, Jakub Narębski Junio C Hamano <gitster@pobox.com> writes: >"Satoshi Yasushima" <s.yasushima@gmail.com> writes: > >> There seems to be a cause in the following taboo. >> Sure, PATCH 3/6 is little too great. >> http://vger.kernel.org/majordomo-info.html#taboo >> >Taboo things to be done when discussing at VGER lists >> : (abbr.) >> > * Message size exceeding 100 000 characters causes blocking. >> >> To somehow. > >Since I received the patch directly bypassing vger, I queued it on >gitgui-0.20.0 from Pat and tentatively merged it to my 'pu'. > >Pat, we haven't heard from you for a long time. How would you want >to proceed? If you fetch from me and merge 52285c83 ("git-gui: >update Japanese information", 2016-09-07), you'd get these six >commits for po/ja.po and then we'd be in sync next time I pull from >you. > >That is, if that ever happens--is git-gui pretty much in deep >maintenance mode without anything more to do from your point of >view? > >Thanks. > I'm just starting to catch up once again. hopefully I can be a bit more reactive than recently. Merging 52285c83 looks fine. I'll stick that onto the 0.20.0 head and see what else I can pick up on top. There are a few from the git for windows set among others. -- Pat Thoyts http://www.patthoyts.tk/ PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-10-03 8:45 ` Pat Thoyts @ 2016-10-03 16:18 ` Junio C Hamano 2016-10-03 19:31 ` Junio C Hamano 0 siblings, 1 reply; 28+ messages in thread From: Junio C Hamano @ 2016-10-03 16:18 UTC (permalink / raw) To: Pat Thoyts; +Cc: Satoshi Yasushima, git, Jakub Narębski Pat Thoyts <patthoyts@users.sourceforge.net> writes: > I'm just starting to catch up once again. hopefully I can be > a bit more reactive than recently. Merging 52285c83 looks fine. I'll > stick that onto the 0.20.0 head and see what else I can pick up on top. > There are a few from the git for windows set among others. Nice to hear from you again. I think I have a few topics I merged to my tree bypassing you in the meantime. Let me get back to you with a list of topic tips to bring your tree in sync with what I have later. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-10-03 16:18 ` Junio C Hamano @ 2016-10-03 19:31 ` Junio C Hamano 2016-10-03 23:07 ` Pat Thoyts 0 siblings, 1 reply; 28+ messages in thread From: Junio C Hamano @ 2016-10-03 19:31 UTC (permalink / raw) To: Pat Thoyts; +Cc: Satoshi Yasushima, git, Jakub Narębski Junio C Hamano <gitster@pobox.com> writes: > Pat Thoyts <patthoyts@users.sourceforge.net> writes: > >> I'm just starting to catch up once again. hopefully I can be >> a bit more reactive than recently. Merging 52285c83 looks fine. I'll >> stick that onto the 0.20.0 head and see what else I can pick up on top. >> There are a few from the git for windows set among others. > > Nice to hear from you again. I think I have a few topics I merged > to my tree bypassing you in the meantime. Let me get back to you > with a list of topic tips to bring your tree in sync with what I > have later. I think the following lists everything that has been done bypassing your tree: 66fe3e061a ("git-gui: l10n: add Portuguese translation", 2016-05-06) 52285c8312 ("git-gui: update Japanese information", 2016-09-07) 2afe6b733e ("git-gui: respect commit.gpgsign again", 2016-09-09) b5f325cb4a ("git-gui: stop using deprecated merge syntax", 2016-09-24) 52285c8312 and 2afe6b733e are already in my 'master'; the other two are already cooking in 'next'. So if you fetch from me and merge the above, you'd be in sync with me (I won't be in sync with you, as you would have more than I have from other places like Git for Windows set). Thanks. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-10-03 19:31 ` Junio C Hamano @ 2016-10-03 23:07 ` Pat Thoyts 2016-10-04 1:20 ` Junio C Hamano 0 siblings, 1 reply; 28+ messages in thread From: Pat Thoyts @ 2016-10-03 23:07 UTC (permalink / raw) To: Junio C Hamano; +Cc: git Junio C Hamano <gitster@pobox.com> writes: >Junio C Hamano <gitster@pobox.com> writes: > >> Pat Thoyts <patthoyts@users.sourceforge.net> writes: >> >>> I'm just starting to catch up once again. hopefully I can be >>> a bit more reactive than recently. Merging 52285c83 looks fine. I'll >>> stick that onto the 0.20.0 head and see what else I can pick up on top. >>> There are a few from the git for windows set among others. >> >> Nice to hear from you again. I think I have a few topics I merged >> to my tree bypassing you in the meantime. Let me get back to you >> with a list of topic tips to bring your tree in sync with what I >> have later. > >I think the following lists everything that has been done bypassing >your tree: > >66fe3e061a ("git-gui: l10n: add Portuguese translation", 2016-05-06) >52285c8312 ("git-gui: update Japanese information", 2016-09-07) >2afe6b733e ("git-gui: respect commit.gpgsign again", 2016-09-09) >b5f325cb4a ("git-gui: stop using deprecated merge syntax", 2016-09-24) > >52285c8312 and 2afe6b733e are already in my 'master'; the other two >are already cooking in 'next'. > >So if you fetch from me and merge the above, you'd be in sync with >me (I won't be in sync with you, as you would have more than I have >from other places like Git for Windows set). > >Thanks. > I've tried to merge in these branches as they appear in your version although I already had one patch on top of 0.20.0 for some time. I've tentatively pushed this up to http://github.com/patthoyts/git-gui as branch 'pu' with additional stuff on top of the patches you already have. If this looks ok to you I'll merge this to my master and send you a merge request to get it all synchronized. -- Pat Thoyts http://www.patthoyts.tk/ ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 6/6] git-gui: Update Japanese information 2016-10-03 23:07 ` Pat Thoyts @ 2016-10-04 1:20 ` Junio C Hamano 0 siblings, 0 replies; 28+ messages in thread From: Junio C Hamano @ 2016-10-04 1:20 UTC (permalink / raw) To: Pat Thoyts; +Cc: git Pat Thoyts <patthoyts@users.sourceforge.net> writes: > I've tried to merge in these branches as they appear in your version > although I already had one patch on top of 0.20.0 for some time. I've > tentatively pushed this up to http://github.com/patthoyts/git-gui as > branch 'pu' with additional stuff on top of the patches you already > have. If this looks ok to you I'll merge this to my master and send you > a merge request to get it all synchronized. Your 64c6b4c507 matches what I expected to see as the result of merging the above four topics on top of your 'master'. I have no opinion on the other topics that appear on top of it on the branch you pushed out, other than that I trust the maintainer of the subsystem and I'm fine to blindly pull them from you ;-) I am not sure if f64a1a9311 ("git-gui: maintain backwards compatibility for merge syntax", 2016-10-04) makes any practical difference in the real world, though. You'd need to find somebody who grabs the newer version of git-gui that includes b5f325cb4a ("git-gui: stop using deprecated merge syntax", 2016-09-24), without having updated their copy of git-core for more than a year, given that 2.5.0 is from July last year. It would not hurt, but I am not sure if an extra invocation of "git version" is really worth it. Thanks. ^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2016-10-04 1:20 UTC | newest] Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-09-03 14:43 [PATCH 1/6] git-gui: The term unified for remote in Japanese Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 2/6] git-gui: The term unified for blame " Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 4/6] git-gui: Add Japanese language code Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 5/6] git-gui: Update Japanese translation Satoshi Yasushima 2016-09-03 14:43 ` [PATCH 6/6] git-gui: Update Japanese information Satoshi Yasushima 2016-09-04 6:54 ` [PATCH 1/6] git-gui: The term unified for remote in Japanese Junio C Hamano 2016-09-05 16:32 ` Satoshi Yasushima 2016-09-04 12:10 ` Jakub Narębski 2016-09-05 17:16 ` Satoshi Yasushima 2016-09-05 18:03 ` Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 1/6] git-gui: consistently use the same word for "remote" " Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 2/6] git-gui: consistently use the same word for "blame" " Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 4/6] git-gui: Add Japanese language code Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 5/6] git-gui: Update Japanese translation Satoshi Yasushima 2016-09-06 16:02 ` [PATCH v2 6/6] git-gui: Update Japanese information Satoshi Yasushima 2016-09-07 11:47 ` Satoshi Yasushima 2016-09-07 17:35 ` Junio C Hamano 2016-09-08 6:59 ` git-gui, was " Johannes Schindelin 2016-09-08 16:48 ` Junio C Hamano 2016-09-20 13:37 ` Vasco Almeida 2016-09-21 18:16 ` Junio C Hamano 2016-09-26 14:21 ` Junio C Hamano 2016-09-08 12:55 ` Satoshi Yasushima 2016-10-03 8:45 ` Pat Thoyts 2016-10-03 16:18 ` Junio C Hamano 2016-10-03 19:31 ` Junio C Hamano 2016-10-03 23:07 ` Pat Thoyts 2016-10-04 1:20 ` Junio C Hamano
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.