# [PATCH 0/1] git-gui: Improve Japanese translation 6 messages from 2019-10-14 to 2019-10-16. Participants: KIDANI Akito via GitGitGadget, kdnakt via GitGitGadget, Johannes Schindelin, Pratyush Yadav, Junio C Hamano. Thread: https://gitlist.dev/t/52031 ## KIDANI Akito via GitGitGadget, 2019-10-14 01:31 Subject: [PATCH 0/1] git-gui: Improve Japanese translation Message-ID: URL: https://gitlist.dev/e/pull.396.git.1571016698.gitgitgadget%40gmail.com ``` Fixed word order in Japanese translation. kdnakt (1): Improve Japanese translation git-gui/po/ja.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) base-commit: 08da6496b61341ec45eac36afcc8f94242763468 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-396%2Fkdnakt%2Ftranslation-ja-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-396/kdnakt/translation-ja-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/396 -- gitgitgadget ``` ## kdnakt via GitGitGadget, 2019-10-14 01:31 Subject: [PATCH 1/1] Improve Japanese translation Message-ID: <3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget@gmail.com> URL: https://gitlist.dev/e/3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget%40gmail.com In-Reply-To: ``` From: kdnakt Signed-off-by: kdnakt --- git-gui/po/ja.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po index 208651c1af..2f61153ab9 100644 --- a/git-gui/po/ja.po +++ b/git-gui/po/ja.po @@ -4,14 +4,15 @@ # # しらいし ななこ , 2007. # Satoshi Yasushima , 2016. +# KIDANI Akito , 2019. # 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: 2016-06-22 12:50+0900\n" -"Last-Translator: Satoshi Yasushima \n" +"PO-Revision-Date: 2019-10-13 23:20+0900\n" +"Last-Translator: KIDANI Akito \n" "Language-Team: Japanese\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -661,7 +662,7 @@ msgstr "" #: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" -msgstr "%s の %s ブランチ" +msgstr "%2$s の %1$s ブランチ" #: lib/merge.tcl:122 #, tcl-format @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました" #: lib/checkout_op.tcl:85 #, tcl-format msgid "Fetching %s from %s" -msgstr "%s から %s をフェッチしています" +msgstr "%2$s から %1$s をフェッチしています" #: lib/checkout_op.tcl:133 #, tcl-format -- gitgitgadget ``` ## Johannes Schindelin, 2019-10-14 11:17 Subject: Re: [PATCH 1/1] Improve Japanese translation Message-ID: URL: https://gitlist.dev/e/nycvar.QRO.7.76.6.1910141317190.46%40tvgsbejvaqbjf.bet In-Reply-To: <3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget@gmail.com> ``` [Cc:ing the Git GUI maintainer] On Mon, 14 Oct 2019, kdnakt via GitGitGadget wrote: > From: kdnakt > > Signed-off-by: kdnakt > --- > git-gui/po/ja.po | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po > index 208651c1af..2f61153ab9 100644 > --- a/git-gui/po/ja.po > +++ b/git-gui/po/ja.po > @@ -4,14 +4,15 @@ > # > # しらいし ななこ , 2007. > # Satoshi Yasushima , 2016. > +# KIDANI Akito , 2019. > # > 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: 2016-06-22 12:50+0900\n" > -"Last-Translator: Satoshi Yasushima \n" > +"PO-Revision-Date: 2019-10-13 23:20+0900\n" > +"Last-Translator: KIDANI Akito \n" > "Language-Team: Japanese\n" > "Language: ja\n" > "MIME-Version: 1.0\n" > @@ -661,7 +662,7 @@ msgstr "" > #: lib/merge.tcl:108 > #, tcl-format > msgid "%s of %s" > -msgstr "%s の %s ブランチ" > +msgstr "%2$s の %1$s ブランチ" > > #: lib/merge.tcl:122 > #, tcl-format > @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました" > #: lib/checkout_op.tcl:85 > #, tcl-format > msgid "Fetching %s from %s" > -msgstr "%s から %s をフェッチしています" > +msgstr "%2$s から %1$s をフェッチしています" > > #: lib/checkout_op.tcl:133 > #, tcl-format > -- > gitgitgadget > ``` ## Pratyush Yadav, 2019-10-14 17:51 Subject: Re: [PATCH 1/1] Improve Japanese translation Message-ID: <20191014175135.mbrmwyydnnktkqap@yadavpratyush.com> URL: https://gitlist.dev/e/20191014175135.mbrmwyydnnktkqap%40yadavpratyush.com In-Reply-To: <3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget@gmail.com> ``` Hi kdnakt, I updated the commit message subject locally to "git-gui: improve Japanese translation" to match our commit message style. On 14/10/19 01:31AM, kdnakt via GitGitGadget wrote: > From: kdnakt > > Signed-off-by: kdnakt > --- > git-gui/po/ja.po | 9 +++++---- You based this patch on the git.git repo. For now, I munged the patch and applied to my tree, but for future contributions, please base your patches on the git-gui tree. That would mean your paths in the diff would look like: 'po/ja.po' instead of 'git-gui/po/ja.po/'. The instructions to do that in GitGitGadget can be found at [0]. > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/git-gui/po/ja.po b/git-gui/po/ja.po > index 208651c1af..2f61153ab9 100644 > --- a/git-gui/po/ja.po > +++ b/git-gui/po/ja.po > @@ -4,14 +4,15 @@ > # > # しらいし ななこ , 2007. > # Satoshi Yasushima , 2016. > +# KIDANI Akito , 2019. > # > 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: 2016-06-22 12:50+0900\n" > -"Last-Translator: Satoshi Yasushima \n" > +"PO-Revision-Date: 2019-10-13 23:20+0900\n" > +"Last-Translator: KIDANI Akito \n" > "Language-Team: Japanese\n" > "Language: ja\n" > "MIME-Version: 1.0\n" > @@ -661,7 +662,7 @@ msgstr "" > #: lib/merge.tcl:108 > #, tcl-format > msgid "%s of %s" > -msgstr "%s の %s ブランチ" > +msgstr "%2$s の %1$s ブランチ" > > #: lib/merge.tcl:122 > #, tcl-format > @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました" > #: lib/checkout_op.tcl:85 > #, tcl-format > msgid "Fetching %s from %s" > -msgstr "%s から %s をフェッチしています" > +msgstr "%2$s から %1$s をフェッチしています" > > #: lib/checkout_op.tcl:133 > #, tcl-format Thanks for the translation update. Will queue. [0] https://github.com/prati0100/git-gui#using-gitgitgadget -- Regards, Pratyush Yadav ``` ## Junio C Hamano, 2019-10-15 01:59 Subject: Re: [PATCH 1/1] Improve Japanese translation Message-ID: URL: https://gitlist.dev/e/xmqqmue2db0n.fsf%40gitster-ct.c.googlers.com In-Reply-To: <3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget@gmail.com> ``` "kdnakt via GitGitGadget" writes: > @@ -661,7 +662,7 @@ msgstr "" > #: lib/merge.tcl:108 > #, tcl-format > msgid "%s of %s" > -msgstr "%s の %s ブランチ" > +msgstr "%2$s の %1$s ブランチ" > > #: lib/merge.tcl:122 > #, tcl-format > @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました" > #: lib/checkout_op.tcl:85 > #, tcl-format > msgid "Fetching %s from %s" > -msgstr "%s から %s をフェッチしています" > +msgstr "%2$s から %1$s をフェッチしています" Both of these changes to word order make sense. It's a bit surprising that these haven't been noticed/fixed for quite some time ;-). ``` ## Pratyush Yadav, 2019-10-16 15:15 Subject: Re: [PATCH 1/1] Improve Japanese translation Message-ID: <20191016151514.fbjziwhko7szh3wm@yadavpratyush.com> URL: https://gitlist.dev/e/20191016151514.fbjziwhko7szh3wm%40yadavpratyush.com In-Reply-To: ``` On 15/10/19 10:59AM, Junio C Hamano wrote: > "kdnakt via GitGitGadget" writes: > > > @@ -661,7 +662,7 @@ msgstr "" > > #: lib/merge.tcl:108 > > #, tcl-format > > msgid "%s of %s" > > -msgstr "%s の %s ブランチ" > > +msgstr "%2$s の %1$s ブランチ" > > > > #: lib/merge.tcl:122 > > #, tcl-format > > @@ -956,7 +957,7 @@ msgstr "エラー: コマンドが失敗しました" > > #: lib/checkout_op.tcl:85 > > #, tcl-format > > msgid "Fetching %s from %s" > > -msgstr "%s から %s をフェッチしています" > > +msgstr "%2$s から %1$s をフェッチしています" > > Both of these changes to word order make sense. > > It's a bit surprising that these haven't been noticed/fixed for > quite some time ;-). Thanks for the review. -- Regards, Pratyush Yadav ```