Merge branch 'mh/config-copy-string-from-git-path'

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 37a044bcbc1daa9c2d17b318d15bafadb16b0aa7..4b0e9eeaa687b2eca2d739c7e3e34c4e55b44749 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 10:05+0800\n"
+"PO-Revision-Date: 2014-11-20 16:10+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
 "Language: zh_CN\n"
@@ -8191,10 +8191,6 @@ msgstr "引用名>:<期望值"
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"
 
-#: builtin/push.c:506
-msgid "check"
-msgstr "检查"
-
 #: builtin/push.c:507
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"