{"thread":{"id":"40715","subject":"[PATCH] Update japanese translation","startedAt":"2015-11-03T12:47:40Z","lastAt":"2015-11-06T14:36:19Z","messageCount":3,"participants":["miurahr@linux.com","Junio C Hamano","Hiroshi Miura"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"272829","messageId":"1446554860-2539-1-git-send-email-miurahr@linux.com","threadId":"40715","inReplyTo":null,"subject":"[PATCH] Update japanese translation","fromName":"","fromEmail":"miurahr@linux.com","sentAt":"2015-11-03T12:47:40Z","receivedAt":"2015-11-03T12:47:40Z","isPatch":true,"sender":{"key":"miurahr@linux.com","avatar":"https://gravatar.com/avatar/fdd13c316e73212ccfcd64adf4c7156a8dce9bddaa59d9e9929262ed25020888?d=mp&s=160"},"body":"From: Hiroshi Miura \n\n- Update untranslated terms\n\nSigned-off-by: Hiroshi Miura \n---\n gitk-git/po/ja.po | 97 ++++++++++++++++++++++++-------------------------------\n 1 file changed, 42 insertions(+), 55 deletions(-)\n\ndiff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po\nindex 59e42a8..cb55909 100644\n--- a/gitk-git/po/ja.po\n+++ b/gitk-git/po/ja.po\n@@ -9,14 +9,15 @@ msgstr \"\"\n \"Project-Id-Version: gitk\\n\"\n \"Report-Msgid-Bugs-To: \\n\"\n \"POT-Creation-Date: 2015-05-17 14:32+1000\\n\"\n-\"PO-Revision-Date: 2009-11-06 01:45+0900\\n\"\n-\"Last-Translator: Mizar \\n\"\n+\"PO-Revision-Date: 2015-11-03 16:38+0900\\n\"\n+\"Last-Translator: Hiroshi Miura \\n\"\n \"Language-Team: Japanese\\n\"\n-\"Language: \\n\"\n \"MIME-Version: 1.0\\n\"\n \"Content-Type: text/plain; charset=UTF-8\\n\"\n \"Content-Transfer-Encoding: 8bit\\n\"\n \"Plural-Forms: nplurals=1; plural=0;\\n\"\n+\"X-Generator: Poedit 1.5.4\\n\"\n+\"Language: ja\\n\"\n \n #: gitk:140\n msgid \"Couldn't get list of unmerged files:\"\n@@ -24,11 +25,11 @@ msgstr \"マージされていないファイルのリストを取得できませ\n \n #: gitk:212 gitk:2381\n msgid \"Color words\"\n-msgstr \"\"\n+msgstr \"単語に色を付ける\"\n \n #: gitk:217 gitk:2381 gitk:8220 gitk:8253\n msgid \"Markup words\"\n-msgstr \"\"\n+msgstr \"単語をマークする\"\n \n #: gitk:324\n msgid \"Error parsing revisions:\"\n@@ -308,19 +309,16 @@ msgid \"Compare with marked commit\"\n msgstr \"マークを付けたコミットと比較する\"\n \n #: gitk:2629 gitk:2640\n-#, fuzzy\n msgid \"Diff this -> marked commit\"\n-msgstr \"これと選択したコミットのdiffを見る\"\n+msgstr \"これ->選択したコミットのdiff\"\n \n #: gitk:2630 gitk:2641\n-#, fuzzy\n msgid \"Diff marked commit -> this\"\n-msgstr \"選択したコミットとこれのdiffを見る\"\n+msgstr \"選択したコミット->これのdiff\"\n \n #: gitk:2631\n-#, fuzzy\n msgid \"Revert this commit\"\n-msgstr \"このコミットにマークをつける\"\n+msgstr \"このコミットをリバート\"\n \n #: gitk:2647\n msgid \"Check out this branch\"\n@@ -332,7 +330,7 @@ msgstr \"このブランチを除去する\"\n \n #: gitk:2649\n msgid \"Copy branch name\"\n-msgstr \"\"\n+msgstr \"ブランチ名をコピー\"\n \n #: gitk:2656\n msgid \"Highlight this too\"\n@@ -352,7 +350,7 @@ msgstr \"親コミットから blame をかける\"\n \n #: gitk:2660\n msgid \"Copy path\"\n-msgstr \"\"\n+msgstr \"パスをコピー\"\n \n #: gitk:2667\n msgid \"Show origin of this line\"\n@@ -363,7 +361,6 @@ msgid \"Run git gui blame on this line\"\n msgstr \"この行に git gui で blame をかける\"\n \n #: gitk:3014\n-#, fuzzy\n msgid \"\"\n \"\\n\"\n \"Gitk - a commit viewer for git\\n\"\n@@ -375,7 +372,7 @@ msgstr \"\"\n \"\\n\"\n \"Gitk - gitコミットビューア\\n\"\n \"\\n\"\n-\"Copyright \\\\u00a9 2005-2010 Paul Mackerras\\n\"\n+\"Copyright © 2005-2014 Paul Mackerras\\n\"\n \"\\n\"\n \"使用および再配布は GNU General Public License に従ってください\"\n \n@@ -397,9 +394,9 @@ msgid \"<%s-Q>\\t\\tQuit\"\n msgstr \"<%s-Q>\\t\\t終了\"\n \n #: gitk:3049\n-#, fuzzy, tcl-format\n+#, tcl-format\n msgid \"<%s-W>\\t\\tClose window\"\n-msgstr \"<%s-F>\\t\\t検索\"\n+msgstr \"<%s-W>\\t\\tウインドウを閉じる\"\n \n #: gitk:3050\n msgid \"\\t\\tMove to first commit\"\n@@ -410,19 +407,16 @@ msgid \"\\t\\tMove to last commit\"\n msgstr \"\\t\\t最後のコミットに移動\"\n \n #: gitk:3052\n-#, fuzzy\n msgid \", p, k\\tMove up one commit\"\n-msgstr \", p, i\\t一つ上のコミットに移動\"\n+msgstr \", p, k\\t一つ上のコミットに移動\"\n \n #: gitk:3053\n-#, fuzzy\n msgid \", n, j\\tMove down one commit\"\n-msgstr \", n, k\\t一つ下のコミットに移動\"\n+msgstr \", n, j\\t一つ下のコミットに移動\"\n \n #: gitk:3054\n-#, fuzzy\n msgid \", z, h\\tGo back in history list\"\n-msgstr \", z, j\\t履歴の前に戻る\"\n+msgstr \", z, h\\t履歴の前に戻る\"\n \n #: gitk:3055\n msgid \", x, l\\tGo forward in history list\"\n@@ -431,7 +425,7 @@ msgstr \", x, l\\t履歴の次へ進む\"\n #: gitk:3056\n #, tcl-format\n msgid \"<%s-n>\\tGo to n-th parent of current commit in history list\"\n-msgstr \"\"\n+msgstr \"<%s-n>\\tヒストリの現在からn番目の親コミットへ移動する\"\n \n #: gitk:3057\n msgid \"\\tMove up one page in commit list\"\n@@ -514,9 +508,8 @@ msgid \"\\tMove to next find hit\"\n msgstr \"\\t次を検索して移動\"\n \n #: gitk:3075\n-#, fuzzy\n msgid \"g\\t\\tGo to commit\"\n-msgstr \"\\t\\t最後のコミットに移動\"\n+msgstr \"g\\t\\tコミットに移動\"\n \n #: gitk:3076\n msgid \"/\\t\\tFocus the search box\"\n@@ -672,9 +665,8 @@ msgid \"Matches all Commit Info criteria\"\n msgstr \"コミット情報の全ての条件に一致\"\n \n #: gitk:4086\n-#, fuzzy\n msgid \"Matches no Commit Info criteria\"\n-msgstr \"コミット情報の全ての条件に一致\"\n+msgstr \"コミット情報に一致しません\"\n \n #: gitk:4087\n msgid \"Changes to Files:\"\n@@ -761,9 +753,8 @@ msgid \"-- criteria for selecting revisions\"\n msgstr \"― リビジョンの選択条件\"\n \n #: gitk:4241\n-#, fuzzy\n msgid \"View Name\"\n-msgstr \"ビュー名:\"\n+msgstr \"ビュー名\"\n \n #: gitk:4316\n msgid \"Apply (F5)\"\n@@ -984,12 +975,11 @@ msgstr \"タグ名:\"\n \n #: gitk:9268\n msgid \"Tag message is optional\"\n-msgstr \"\"\n+msgstr \"タグメッセージは任意です\"\n \n #: gitk:9270\n-#, fuzzy\n msgid \"Tag message:\"\n-msgstr \"タグ名:\"\n+msgstr \"タグメッセージ：\"\n \n #: gitk:9274 gitk:9439\n msgid \"Create\"\n@@ -1066,33 +1056,32 @@ msgid \"No changes committed\"\n msgstr \"何の変更もコミットされていません\"\n \n #: gitk:9593\n-#, fuzzy, tcl-format\n+#, tcl-format\n msgid \"Commit %s is not included in branch %s -- really revert it?\"\n msgstr \"\"\n-\"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？\"\n+\"コミット %s は既にブランチ %s に含まれていません ― 本当にこれをリバートします\"\n+\"か？\"\n \n #: gitk:9598\n-#, fuzzy\n msgid \"Reverting\"\n-msgstr \"リセット中\"\n+msgstr \"リバート中\"\n \n #: gitk:9606\n-#, fuzzy, tcl-format\n+#, tcl-format\n msgid \"\"\n \"Revert failed because of local changes to the following files:%s Please \"\n \"commit, reset or stash your changes and try again.\"\n msgstr \"\"\n-\"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\\n\"\n+\"ファイル '%s' のローカルな変更のためにリバートは失敗しました。\\n\"\n \"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ\"\n \"い。\"\n \n #: gitk:9610\n-#, fuzzy\n msgid \"\"\n \"Revert failed because of merge conflict.\\n\"\n \" Do you wish to run git citool to resolve it?\"\n msgstr \"\"\n-\"マージの衝突によってチェリーピックは失敗しました。\\n\"\n+\"マージの衝突によってリバートは失敗しました。\\n\"\n \"この解決のために git citool を実行したいですか？\"\n \n #: gitk:9653\n@@ -1200,9 +1189,8 @@ msgid \"Show local changes\"\n msgstr \"ローカルな変更を表示\"\n \n #: gitk:11361\n-#, fuzzy\n msgid \"Auto-select SHA1 (length)\"\n-msgstr \"SHA1 の自動選択\"\n+msgstr \"SHA1(l鍵長)の自動選択\"\n \n #: gitk:11365\n msgid \"Hide remote refs\"\n@@ -1217,13 +1205,12 @@ msgid \"Tab spacing\"\n msgstr \"タブ空白幅\"\n \n #: gitk:11374\n-#, fuzzy\n msgid \"Display nearby tags/heads\"\n-msgstr \"近くのタグを表示する\"\n+msgstr \"近くのタグ/headを表示する\"\n \n #: gitk:11377\n msgid \"Maximum # tags/heads to show\"\n-msgstr \"\"\n+msgstr \"表示する最大のタグ/ヘッド数 #\"\n \n #: gitk:11380\n msgid \"Limit diffs to listed paths\"\n@@ -1242,21 +1229,20 @@ msgid \"Choose...\"\n msgstr \"選択...\"\n \n #: gitk:11395\n-#, fuzzy\n msgid \"General options\"\n-msgstr \"パッチ生成\"\n+msgstr \"全般オプション\"\n \n #: gitk:11398\n msgid \"Use themed widgets\"\n-msgstr \"\"\n+msgstr \"テーマのウィジェットを使う\"\n \n #: gitk:11400\n msgid \"(change requires restart)\"\n-msgstr \"\"\n+msgstr \"(変更を反映するには再スタートの必要があります）\"\n \n #: gitk:11402\n msgid \"(currently unavailable)\"\n-msgstr \"\"\n+msgstr \"（現在存在しない）\"\n \n #: gitk:11413\n msgid \"Colors: press to choose\"\n@@ -1343,17 +1329,16 @@ msgid \"Gitk preferences\"\n msgstr \"Gitk 設定\"\n \n #: gitk:11494\n-#, fuzzy\n msgid \"General\"\n-msgstr \"生成\"\n+msgstr \"全般\"\n \n #: gitk:11495\n msgid \"Colors\"\n-msgstr \"\"\n+msgstr \"色\"\n \n #: gitk:11496\n msgid \"Fonts\"\n-msgstr \"\"\n+msgstr \"フォント\"\n \n #: gitk:11546\n #, tcl-format\n@@ -1365,6 +1350,8 @@ msgid \"\"\n \"Sorry, gitk cannot run with this version of Tcl/Tk.\\n\"\n \" Gitk requires at least Tcl/Tk 8.4.\"\n msgstr \"\"\n+\"申し訳有りません。gitkは、このバージョンのTcl/Tkでは動作しません。\\n\"\n+\"Gitkには少なくともTcl/Tk 8.4が必要です。\"\n \n #: gitk:12269\n msgid \"Cannot find a git repository here.\"\n-- \n2.6.2\n"},{"id":"272849","messageId":"xmqqio5iddf6.fsf@gitster.mtv.corp.google.com","threadId":"40715","inReplyTo":"1446554860-2539-1-git-send-email-miurahr@linux.com","subject":"Re: [PATCH] Update japanese translation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-11-03T20:40:45Z","receivedAt":"2015-11-03T20:40:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"miurahr@linux.com writes:\n\n> From: Hiroshi Miura \n>\n> - Update untranslated terms\n>\n> Signed-off-by: Hiroshi Miura \n> ---\n> gitk-git/po/ja.po | 97 ++++++++++++++++++++++++-------------------------------\n> 1 file changed, 42 insertions(+), 55 deletions(-)\n\nSorry but I do not take patches directly to gitk or git-gui, both of\nwhich are independent projects of their own.\n\nCould you redo this change against Paul Mackerras's tree, which is\nour upstream \"gitk\" project, that is found here:\n\n git://git.kernel.org/pub/scm/gitk/gitk.git\n\nand Cc Paul Mackerras when you post your patch?\n\nThanks.\n"},{"id":"273019","messageId":"20151106143618.GA5118@miurahr-note","threadId":"40715","inReplyTo":"xmqqio5iddf6.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] Update japanese translation","fromName":"Hiroshi Miura","fromEmail":"miurahr@linux.com","sentAt":"2015-11-06T14:36:19Z","receivedAt":"2015-11-06T14:36:19Z","isPatch":true,"sender":{"key":"miurahr@linux.com","avatar":"https://gravatar.com/avatar/fdd13c316e73212ccfcd64adf4c7156a8dce9bddaa59d9e9929262ed25020888?d=mp&s=160"},"body":"On Tue, Nov 03, 2015 at 12:40:45PM -0800, Junio C Hamano wrote:\n> Could you redo this change against Paul Mackerras's tree, which is\n> our upstream \"gitk\" project, that is found here:\n> \n> git://git.kernel.org/pub/scm/gitk/gitk.git\n> \n> and Cc Paul Mackerras when you post your patch?\n \n Thank you for advise. I tried again.\n\n-- \nHiroshi Miura\n"}]}