git-gui: Improve Japanese translation

PATCH In review KIDANI Akito via GitGitGadget 4 participants 6 messages Oct 14, 2019 – Oct 16, 2019

lore

Share & tools

lore

KIDANI Akito via GitGitGadget

author

2019-10-14 01:31 UTC #0 lore raw

cover git-gui: Improve Japanese translation

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

Signature · 1 line

gitgitgadget

kdnakt via GitGitGadget

author

2019-10-14 01:31 UTC #1 lore raw

PATCH 1/1 Improve Japanese translation

From: kdnakt <[email protected]>

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

---
 git-gui/po/ja.po | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

git-gui/po/ja.po +5 -4

index 208651c1af..2f61153ab9 100644
@@ -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

Signature · 1 line

gitgitgadget

Pratyush Yadav

2019-10-14 17:51 UTC #3 lore raw

Re: [PATCH 1/1] Improve Japanese translation

In reply to kdnakt via GitGitGadget

Hi kdnakt,

I updated the commit message subject locally to "git-gui: improve Japanese translation" to match our commit message style.

Quoted 5 lines · kdnakt via GitGitGadget

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].

Quoted 34 lines

 1 file changed, 5 insertions(+), 4 deletions(-)

git-gui/po/ja.po +4 -3

index 208651c1af..2f61153ab9 100644
@@ -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

git-gui/po/ja.po msgstr "エラー: コマンドが失敗しました" · line 963

Quoted 8 lines

git-gui/po/ja.po +1 -1

@@ -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

Signature · 2 lines

Regards,
Pratyush Yadav

Junio C Hamano

2019-10-15 01:59 UTC #4 lore raw

Re: [PATCH 1/1] Improve Japanese translation

In reply to kdnakt via GitGitGadget

Quoted 10 lines · kdnakt via GitGitGadget

git-gui/po/ja.po +1 -1

@@ -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

git-gui/po/ja.po msgstr "エラー: コマンドが失敗しました" · line 960

Quoted 5 lines

git-gui/po/ja.po +1 -1

@@ -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 UTC #5 lore raw

Re: [PATCH 1/1] Improve Japanese translation

Quoted 20 lines · Junio C Hamano

Quoted 10 lines · kdnakt via GitGitGadget
git-gui/po/ja.po +1 -1
@@ -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
git-gui/po/ja.po msgstr "エラー: コマンドが失敗しました" · line 960
Quoted 5 lines
git-gui/po/ja.po +1 -1
@@ -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.

Quoted 2 lines

It's a bit surprising that these haven't been noticed/fixed for quite some time ;-).

Thanks for the review.

Signature · 2 lines

Regards,
Pratyush Yadav