From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/git-gui/po/ja.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'third_party/git/git-gui/po/ja.po') diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po index 2f61153ab9..208651c1af 100644 --- a/third_party/git/git-gui/po/ja.po +++ b/third_party/git/git-gui/po/ja.po @@ -4,15 +4,14 @@ # # しらいし ななこ , 2007. # Satoshi Yasushima , 2016. -# KIDANI Akito , 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 \n" +"PO-Revision-Date: 2016-06-22 12:50+0900\n" +"Last-Translator: Satoshi Yasushima \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 -- cgit 1.4.1