summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b150dc)
raw | patch | inline | side by side (parent: 1b150dc)
author | Thynson <lanxingcan@gmail.com> | |
Tue, 28 Feb 2012 18:18:52 +0000 (02:18 +0800) | ||
committer | Jiang Xin <worldhello.net@gmail.com> | |
Fri, 2 Mar 2012 08:50:35 +0000 (16:50 +0800) |
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/zh_CN.po | patch | blob | history |
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f50b724eb2cff40e4945926dd718cf4e2e2fd53..d7d5b92c71ffd5c710eda426d334334c817c3b42 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
msgid "git archive: expected a flush"
msgstr "git archive: 预期一个刷新"
+# 保持原换行格式,在输出时 %s 的替代内容会让字串变长
#: builtin/branch.c:137
#, c-format
msgid ""
"将要删除的分支 '%s' 已经被合并到\n"
" '%s',但未合并到 HEAD。"
+# 保持原换行格式,在输出时 %s 的替代内容会让字串变长
#: builtin/branch.c:141
#, c-format
msgid ""
"\t%s\n"
"然后重试。\n"
-# 注意保持前导空格
#: builtin/commit.c:796
msgid "Please enter the commit message for your changes."
msgstr "请为您的修改输入提交说明。"
+# 前导空格用于拼接英文字串,中文字串拼接无需空格
#: builtin/commit.c:799
msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
-" 以 '#' 开头\n"
-"的行将被忽略,而且空提交说明将会终止提交。\n"
+"以 '#' 开头\n"
+"的行将被忽略,并且空的提交说明将会中止提交。\n"
-# 注意保持前导空格
+# 前导空格用于拼接英文字串,中文字串拼接无需空格
#: builtin/commit.c:804
msgid ""
" Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
-" 以 '#' 开头\n"
-"的行将被保留,您可以删除它们如果您想这样做。空提交说明将会终止提交。\n"
+"以 '#' 开头\n"
+"的行将被保留,您可以删除它们如果您想这样做的话。空的提交说明将会\n"
+"中止提交。\n"
# 为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:816