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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 912083e9ede18c0f31122fdd52dfa6c113747a6d..645a76dcefb2cea6225610080fe2a2274918809f 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16978,7 +16978,7 @@ msgstr "无法为子模组 '%s' 注册 url"
 #: 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:677