* [PATCH 0/1] git-gui: Improve Japanese translation
@ 2019-10-14 1:31 KIDANI Akito via GitGitGadget
2019-10-14 1:31 ` [PATCH 1/1] " kdnakt via GitGitGadget
0 siblings, 1 reply; 6+ messages in thread
From: KIDANI Akito via GitGitGadget @ 2019-10-14 1:31 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] Improve Japanese translation
2019-10-14 1:31 [PATCH 0/1] git-gui: Improve Japanese translation KIDANI Akito via GitGitGadget
@ 2019-10-14 1:31 ` kdnakt via GitGitGadget
2019-10-14 11:17 ` Johannes Schindelin
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: kdnakt via GitGitGadget @ 2019-10-14 1:31 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, kdnakt
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Improve Japanese translation
2019-10-14 1:31 ` [PATCH 1/1] " kdnakt via GitGitGadget
@ 2019-10-14 11:17 ` Johannes Schindelin
2019-10-14 17:51 ` Pratyush Yadav
2019-10-15 1:59 ` Junio C Hamano
2 siblings, 0 replies; 6+ messages in thread
From: Johannes Schindelin @ 2019-10-14 11:17 UTC (permalink / raw)
To: kdnakt via GitGitGadget; +Cc: git, Junio C Hamano, kdnakt, Pratyush Yadav
[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]
[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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Improve Japanese translation
2019-10-14 1:31 ` [PATCH 1/1] " kdnakt via GitGitGadget
2019-10-14 11:17 ` Johannes Schindelin
@ 2019-10-14 17:51 ` Pratyush Yadav
2019-10-15 1:59 ` Junio C Hamano
2 siblings, 0 replies; 6+ messages in thread
From: Pratyush Yadav @ 2019-10-14 17:51 UTC (permalink / raw)
To: kdnakt via GitGitGadget; +Cc: git, Junio C Hamano, kdnakt
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Improve Japanese translation
2019-10-14 1:31 ` [PATCH 1/1] " kdnakt via GitGitGadget
2019-10-14 11:17 ` Johannes Schindelin
2019-10-14 17:51 ` Pratyush Yadav
@ 2019-10-15 1:59 ` Junio C Hamano
2019-10-16 15:15 ` Pratyush Yadav
2 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2019-10-15 1:59 UTC (permalink / raw)
To: kdnakt via GitGitGadget; +Cc: git, kdnakt
"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 ;-).
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] Improve Japanese translation
2019-10-15 1:59 ` Junio C Hamano
@ 2019-10-16 15:15 ` Pratyush Yadav
0 siblings, 0 replies; 6+ messages in thread
From: Pratyush Yadav @ 2019-10-16 15:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: kdnakt via GitGitGadget, git, kdnakt
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-16 15:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-14 1:31 [PATCH 0/1] git-gui: Improve Japanese translation KIDANI Akito via GitGitGadget
2019-10-14 1:31 ` [PATCH 1/1] " kdnakt via GitGitGadget
2019-10-14 11:17 ` Johannes Schindelin
2019-10-14 17:51 ` Pratyush Yadav
2019-10-15 1:59 ` Junio C Hamano
2019-10-16 15:15 ` Pratyush Yadav
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).