revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
9
third_party/git/git-gui/po/ja.po
vendored
9
third_party/git/git-gui/po/ja.po
vendored
|
|
@ -4,15 +4,14 @@
|
|||
#
|
||||
# しらいし ななこ <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: 2019-10-13 23:20+0900\n"
|
||||
"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\n"
|
||||
"PO-Revision-Date: 2016-06-22 12:50+0900\n"
|
||||
"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n"
|
||||
"Language-Team: Japanese\n"
|
||||
"Language: ja\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -662,7 +661,7 @@ msgstr ""
|
|||
#: lib/merge.tcl:108
|
||||
#, tcl-format
|
||||
msgid "%s of %s"
|
||||
msgstr "%2$s の %1$s ブランチ"
|
||||
msgstr "%s の %s ブランチ"
|
||||
|
||||
#: lib/merge.tcl:122
|
||||
#, tcl-format
|
||||
|
|
@ -957,7 +956,7 @@ msgstr "エラー: コマンドが失敗しました"
|
|||
#: lib/checkout_op.tcl:85
|
||||
#, tcl-format
|
||||
msgid "Fetching %s from %s"
|
||||
msgstr "%2$s から %1$s をフェッチしています"
|
||||
msgstr "%s から %s をフェッチしています"
|
||||
|
||||
#: lib/checkout_op.tcl:133
|
||||
#, tcl-format
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue