diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-11-04 13:29:38 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-04 13:29:38 +0900 |
| commit | ab6b50e4c8339167c0b048c778055526226c45ca (patch) | |
| tree | f378953158b99acafc700cff190ee31b0f964593 /git-gui/po | |
| parent | Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po (diff) | |
| parent | Merge branch 'ka/japanese-translation' (diff) | |
| download | tgif-ab6b50e4c8339167c0b048c778055526226c45ca.tar.xz | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
git-gui: improve Japanese translation
git-gui: add a readme
git-gui: support for diff3 conflict style
git-gui: use existing interface to query a path's attribute
git-gui (Windows): use git-bash.exe if it is available
treewide: correct several "up-to-date" to "up to date"
Fix build with core.autocrlf=true
Diffstat (limited to 'git-gui/po')
| -rw-r--r-- | git-gui/po/ja.po | 9 |
1 files 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 |