aboutsummaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorThynson <lanxingcan@gmail.com>2012-02-29 02:18:52 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-03-02 16:50:35 +0800
commit2d0dc4746444a1d9fea40332d97ad39a995daaba (patch)
tree9d216b462af4211e7ecefe609fc97bef64f492e2 /po/zh_CN.po
parent1b150dc96fc11f5d3a8a1442bd364035e38bb549 (diff)
downloadgit-2d0dc4746444a1d9fea40332d97ad39a995daaba.tar.gz
git-2d0dc4746444a1d9fea40332d97ad39a995daaba.tar.xz
l10n: Improve commit msg for zh_CN translation
Signed-off-by: Thynson <lanxingcan@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po15
1 files changed, 9 insertions, 6 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f50b724e..d7d5b92c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -797,6 +797,7 @@ msgstr "git archive: 协议错误"
msgid "git archive: expected a flush"
msgstr "git archive: 预期一个刷新"
+# 保持原换行格式,在输出时 %s 的替代内容会让字串变长
#: builtin/branch.c:137
#, c-format
msgid ""
@@ -806,6 +807,7 @@ msgstr ""
"将要删除的分支 '%s' 已经被合并到\n"
" '%s',但未合并到 HEAD。"
+# 保持原换行格式,在输出时 %s 的替代内容会让字串变长
#: builtin/branch.c:141
#, c-format
msgid ""
@@ -1515,28 +1517,29 @@ msgstr ""
"\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