Merge branch 'js/mingw-tests-2.8' into maint

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 063df93f2a84948451bb22107e1ea046ba7c63dd..a6b06f9d3999706d648b78f9bdb40696de2670d6 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -135,8 +135,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-12 22:05+0800\n"
-"PO-Revision-Date: 2016-03-16 00:02+0800\n"
+"POT-Creation-Date: 2016-03-16 00:16+0800\n"
+"PO-Revision-Date: 2016-03-16 00:18+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -1327,17 +1327,17 @@ msgstr ":strip= 需要一个正整型参数"
 #: ref-filter.c:883
 #, c-format
 msgid "ref '%s' does not have %ld components to :strip"
-msgstr "å¼\95ç\94¨ '%s' 没æ\9c\89æ\8f\90ä¾\9bè¦\81è\84±æ\8e\89的 %ld 个组件"
+msgstr "å¼\95ç\94¨ '%s' æ\9cªæ\8f\90ä¾\9bç\94¨äº\8e :strip 的 %ld 个组件"
 
 #: ref-filter.c:1046
 #, c-format
 msgid "unknown %.*s format %s"
-msgstr "未知 %.*s 格式 %s"
+msgstr "未知的 %.*s 格式 %s"
 
 #: ref-filter.c:1066 ref-filter.c:1097
 #, c-format
 msgid "missing object %s for %s"
-msgstr "丢失 %2$s 的对象 %1$s"
+msgstr "缺失 %2$s 的对象 %1$s"
 
 #: ref-filter.c:1069 ref-filter.c:1100
 #, c-format
@@ -1779,7 +1779,7 @@ msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
 #: sha1_file.c:2463
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（截断的索引？）"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
 
 #: sha1_name.c:462
 msgid ""
@@ -2442,6 +2442,10 @@ msgstr "丢失"
 msgid "behind "
 msgstr "落后 "
 
+#: wt-status.c:1680 wt-status.c:1683
+msgid "ahead "
+msgstr "领先 "
+
 #: compat/precompose_utf8.c:57 builtin/clone.c:413
 #, c-format
 msgid "failed to unlink '%s'"
@@ -4847,7 +4851,7 @@ msgid ""
 "Please specify a directory on the command line"
 msgstr ""
 "无法猜到目录名。\n"
-"请å\9c¨å\91½ä»¤è¡\8cæ\8f\90ä¾\9b一个目录"
+"请å\9c¨å\91½ä»¤è¡\8cæ\8c\87å®\9a一个目录"
 
 #: builtin/clone.c:305
 #, c-format