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

diff --cc po/zh_CN.po
index 912083e9ede18c0f31122fdd52dfa6c113747a6d,9c94f2dda315318a0b3b2a7c43d195f8ad48d2b6..645a76dcefb2cea6225610080fe2a2274918809f
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -16975,13 -14069,13 +16975,13 @@@ msgstr "æ\97 æ³\95æ\89¾å\88°é\85\8dç½® '%s'ã\80\82å\81\87å®
  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"