git-gui: Improve Japanese translation #396

kdnakt · 2019-10-13T14:32:33Z

Fixed word order in Japanese translation.

gitgitgadget · 2019-10-13T14:33:26Z

Welcome to GitGitGadget

Hi @kdnakt, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that this Pull Request has a good description, as it will be used as cover letter.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

the lines should not exceed 76 columns,
the first line should be like a header and typically start with a prefix like "tests:" or "commit:", and
the commit messages' body should be describing the "why?" of the change.
Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a PR comment of the form /allow <username>.

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions.

If you want to see what email(s) would be sent for a submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this.

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox ("raw") file corresponding to the mail you want to reply to from the Git mailing list. If you use GMail, you can upload that raw mbox file via:

curl -g --user "<EMailAddress>:<Password>" --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

Signed-off-by: kdnakt <[email protected]>

dscho · 2019-10-13T22:22:06Z

/allow

gitgitgadget · 2019-10-13T22:23:30Z

User kdnakt is now allowed to use GitGitGadget.

WARNING: kdnakt has no public email address set on GitHub

kdnakt · 2019-10-14T01:30:40Z

/submit

gitgitgadget · 2019-10-14T01:31:54Z

Submitted as [email protected]

WARNING: kdnakt has no public email address set on GitHub

gitgitgadget · 2019-10-14T11:19:35Z

git-gui/po/ja.po

@@ -4,14 +4,15 @@
 #


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 <[email protected]> > > Signed-off-by: kdnakt <[email protected]> > --- > 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= [email protected]>, 2007. > # Satoshi Yasushima <[email protected]>, 2016. > +# KIDANI Akito <[email protected]>, 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 <[email protected]>\n" > +"PO-Revision-Date: 2019-10-13 23:20+0900\n" > +"Last-Translator: KIDANI Akito <[email protected]>\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--

gitgitgadget · 2019-10-14T17:55:42Z

git-gui/po/ja.po

@@ -4,14 +4,15 @@
 #


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 <[email protected]> > > Signed-off-by: kdnakt <[email protected]> > --- > 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 @@ > # > # しらいしななこ <[email protected]>, 2007. > # Satoshi Yasushima <[email protected]>, 2016. > +# KIDANI Akito <[email protected]>, 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 <[email protected]>\n" > +"PO-Revision-Date: 2019-10-13 23:20+0900\n" > +"Last-Translator: KIDANI Akito <[email protected]>\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

gitgitgadget · 2019-10-15T02:05:05Z

git-gui/po/ja.po

@@ -4,14 +4,15 @@
 #


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

"kdnakt via GitGitGadget" <[email protected]> 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 ;-).

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

On 15/10/19 10:59AM, Junio C Hamano wrote: > "kdnakt via GitGitGadget" <[email protected]> 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

dscho · 2019-10-15T14:07:20Z

@kdnakt please note that this ticket will not be updated as nicely by GitGitGadget as non-Git GUI PRs, as only git.git's pu/next/master/maint are tracked by GitGitGadget, not Git GUI's.

Eventually, the patch should land in master of git.git, though, at which stage this PR should be closed automatically.

gitgitgadget · 2019-11-04T05:33:46Z

This branch is now known as git-gui/ka/japanese-translation.

gitgitgadget · 2019-11-04T05:33:49Z

This patch series was integrated into pu via git@ab6b50e.

gitgitgadget · 2019-11-04T05:33:52Z

This patch series was integrated into next via git@ab6b50e.

gitgitgadget · 2019-11-04T05:33:55Z

This patch series was integrated into master via git@ab6b50e.

gitgitgadget · 2019-11-04T05:34:00Z

Closed via ab6b50e.

kdnakt force-pushed the translation-ja branch from bfedb3f to be111c7 Compare October 13, 2019 14:34

Improve Japanese translation

3dc8687

Signed-off-by: kdnakt <[email protected]>

kdnakt force-pushed the translation-ja branch from be111c7 to 3dc8687 Compare October 13, 2019 14:36

gitgitgadget bot reviewed Oct 14, 2019

View reviewed changes

gitgitgadget bot reviewed Oct 15, 2019

View reviewed changes

weekly-digest bot mentioned this pull request Oct 20, 2019

Weekly Digest (13 October, 2019 - 20 October, 2019) #409

Closed

gitgitgadget bot added master next pu labels Nov 4, 2019

gitgitgadget bot closed this Nov 4, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

git-gui: Improve Japanese translation #396

git-gui: Improve Japanese translation #396

Uh oh!

kdnakt commented Oct 13, 2019

Uh oh!

gitgitgadget bot commented Oct 13, 2019

Uh oh!

dscho commented Oct 13, 2019

Uh oh!

gitgitgadget bot commented Oct 13, 2019

Uh oh!

kdnakt commented Oct 14, 2019

Uh oh!

gitgitgadget bot commented Oct 14, 2019

Uh oh!

gitgitgadget bot Oct 14, 2019

Uh oh!

gitgitgadget bot Oct 14, 2019

Uh oh!

gitgitgadget bot Oct 15, 2019

Uh oh!

gitgitgadget bot Oct 16, 2019

Uh oh!

dscho commented Oct 15, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

Uh oh!

git-gui: Improve Japanese translation #396

git-gui: Improve Japanese translation #396

Uh oh!

Conversation

kdnakt commented Oct 13, 2019

Uh oh!

gitgitgadget bot commented Oct 13, 2019

Welcome to GitGitGadget

Contributing the patches

Uh oh!

dscho commented Oct 13, 2019

Uh oh!

gitgitgadget bot commented Oct 13, 2019

Uh oh!

kdnakt commented Oct 14, 2019

Uh oh!

gitgitgadget bot commented Oct 14, 2019

Uh oh!

gitgitgadget bot Oct 14, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Oct 14, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Oct 15, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Oct 16, 2019

Choose a reason for hiding this comment

Uh oh!

dscho commented Oct 15, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

Uh oh!