Skip to content

git-gui: Improve Japanese translation #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

git-gui: Improve Japanese translation #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions git-gui/po/ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
#
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Johannes Schindelin wrote (reply to this):

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323328-1573521775-1571051885=:46
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

[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 @@
>  #
>  # =E3=81=97=E3=82=89=E3=81=84=E3=81=97 =E3=81=AA=E3=81=AA=E3=81=93 <nan=
ako3@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 =E3=81=AE %s =E3=83=96=E3=83=A9=E3=83=B3=E3=83=81"
> +msgstr "%2$s =E3=81=AE %1$s =E3=83=96=E3=83=A9=E3=83=B3=E3=83=81"
>
>  #: lib/merge.tcl:122
>  #, tcl-format
> @@ -956,7 +957,7 @@ msgstr "=E3=82=A8=E3=83=A9=E3=83=BC: =E3=82=B3=E3=83=
=9E=E3=83=B3=E3=83=89=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=97=E3=81=BE=E3=81=
=97=E3=81=9F"
>  #: lib/checkout_op.tcl:85
>  #, tcl-format
>  msgid "Fetching %s from %s"
> -msgstr "%s =E3=81=8B=E3=82=89 %s =E3=82=92=E3=83=95=E3=82=A7=E3=83=83=
=E3=83=81=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99"
> +msgstr "%2$s =E3=81=8B=E3=82=89 %1$s =E3=82=92=E3=83=95=E3=82=A7=E3=83=
=83=E3=83=81=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99"
>
>  #: lib/checkout_op.tcl:133
>  #, tcl-format
> --
> gitgitgadget
>

--8323328-1573521775-1571051885=:46--

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Pratyush Yadav wrote (reply to this):

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

-- 
Regards,
Pratyush Yadav

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Junio C Hamano wrote (reply to this):

"kdnakt via GitGitGadget" <gitgitgadget@gmail.com> writes:

> @@ -661,7 +662,7 @@ msgstr ""
>  #: lib/merge.tcl:108
>  #, tcl-format
>  msgid "%s of %s"
> -msgstr "%s =E3=81=AE %s =E3=83=96=E3=83=A9=E3=83=B3=E3=83=81"
> +msgstr "%2$s =E3=81=AE %1$s =E3=83=96=E3=83=A9=E3=83=B3=E3=83=81"
> =20
>  #: lib/merge.tcl:122
>  #, tcl-format
> @@ -956,7 +957,7 @@ msgstr "=E3=82=A8=E3=83=A9=E3=83=BC: =E3=82=B3=E3=83=
=9E=E3=83=B3=E3=83=89=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=97=E3=81=BE=E3=81=97=
=E3=81=9F"
>  #: lib/checkout_op.tcl:85
>  #, tcl-format
>  msgid "Fetching %s from %s"
> -msgstr "%s =E3=81=8B=E3=82=89 %s =E3=82=92=E3=83=95=E3=82=A7=E3=83=83=E3=
=83=81=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99"
> +msgstr "%2$s =E3=81=8B=E3=82=89 %1$s =E3=82=92=E3=83=95=E3=82=A7=E3=83=
=83=E3=83=81=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99"

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 ;-).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Pratyush Yadav wrote (reply to this):

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.

-- 
Regards,
Pratyush Yadav

# しらいし ななこ <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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down