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

jiangxin · jiangxin · commit e9376a570cfb · 2018-12-13T22:25:55.000+08:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -16978,7 +16978,7 @@ msgstr "无法为子模组 '%s' 注册 url"`
`16978`	`16978`	`#: builtin/submodule--helper.c:667`
`16979`	`16979`	`#, c-format`
`16980`	`16980`	`msgid "Submodule '%s' (%s) registered for path '%s'\n"`
`16981`		`-msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"`
	`16981`	`+msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"`
`16982`	`16982`
`16983`	`16983`	`#`
`16984`	`16984`	`#: builtin/submodule--helper.c:677`