[1/1] Improve Japanese translation
diff mbox series

Message ID 3dc8687d9f93a08cdb9e7de8d159df6aa0b05c02.1571016698.git.gitgitgadget@gmail.com
State New
Headers show
Series
  • git-gui: Improve Japanese translation
Related show

Commit Message

Johannes Schindelin via GitGitGadget Oct. 14, 2019, 1:31 a.m. UTC
From: kdnakt <a.kid.1985@gmail.com>

Signed-off-by: kdnakt <a.kid.1985@gmail.com>
---
 git-gui/po/ja.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Johannes Schindelin Oct. 14, 2019, 11:17 a.m. UTC | #1
[Cc:ing the Git GUI maintainer]


On Mon, 14 Oct 2019, kdnakt via GitGitGadget wrote:

> From: kdnakt <a.kid.1985@gmail.com>
>
> Signed-off-by: kdnakt <a.kid.1985@gmail.com>
> ---
>  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 @@
>  #
>  # しらいし ななこ <nanako3@bluebottle.com>, 2007.
>  # Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
> +# KIDANI Akito <a.kid.1985@gmail.com>, 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 <s.yasushima@gmail.com>\n"
> +"PO-Revision-Date: 2019-10-13 23:20+0900\n"
> +"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\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 Oct. 14, 2019, 5:51 p.m. UTC | #2
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 <a.kid.1985@gmail.com>
> 
> Signed-off-by: kdnakt <a.kid.1985@gmail.com>
> ---
>  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 @@
>  #
>  # しらいし ななこ <nanako3@bluebottle.com>, 2007.
>  # Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
> +# KIDANI Akito <a.kid.1985@gmail.com>, 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 <s.yasushima@gmail.com>\n"
> +"PO-Revision-Date: 2019-10-13 23:20+0900\n"
> +"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\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
Junio C Hamano Oct. 15, 2019, 1:59 a.m. UTC | #3
"kdnakt via GitGitGadget" <gitgitgadget@gmail.com> 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 Oct. 16, 2019, 3:15 p.m. UTC | #4
On 15/10/19 10:59AM, Junio C Hamano wrote:
> "kdnakt via GitGitGadget" <gitgitgadget@gmail.com> 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.

Patch
diff mbox series

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 @@ 
 #
 # しらいし ななこ <nanako3@bluebottle.com>, 2007.
 # Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
+# KIDANI Akito <a.kid.1985@gmail.com>, 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 <s.yasushima@gmail.com>\n"
+"PO-Revision-Date: 2019-10-13 23:20+0900\n"
+"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\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