From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 13 Dec 2018 14:25:55 +0000 (+0800)
Subject: Merge branch 'master' of github.com:linusboyle/git
X-Git-Tag: v2.21.0~2^2~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9376a570cfbaa7b34f461719ee3199bd16245c1;p=git

Merge branch 'master' of github.com:linusboyle/git
---

e9376a570cfbaa7b34f461719ee3199bd16245c1
diff --cc po/zh_CN.po
index 912083e9ed,9c94f2dda3..645a76dcef
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -16975,13 -14069,13 +16975,13 @@@ msgstr "无法找到配置 '%s'。假å®
  msgid "Failed to register url for submodule path '%s'"
  msgstr "无法为子模组 '%s' 注册 url"
  
 -#: builtin/submodule--helper.c:515
 +#: builtin/submodule--helper.c:667
  #, c-format
  msgid "Submodule '%s' (%s) registered for path '%s'\n"
- msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
+ msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
  
  #
 -#: builtin/submodule--helper.c:525
 +#: builtin/submodule--helper.c:677
  #, c-format
  msgid "warning: command update mode suggested for submodule '%s'\n"
  msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"