about summary refs log tree commit diff
path: root/third_party/git/git-gui/po/ja.po
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/git-gui/po/ja.po
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/git-gui/po/ja.po')
-rw-r--r--third_party/git/git-gui/po/ja.po9
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po
index 2f61153ab9ff..208651c1afc1 100644
--- a/third_party/git/git-gui/po/ja.po
+++ b/third_party/git/git-gui/po/ja.po
@@ -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