Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: Improve many translation for zh_CN
author
Thynson
<lanxingcan@gmail.com>
Tue, 7 Aug 2012 09:39:30 +0000
(17:39 +0800)
committer
Thynson
<lanxingcan@gmail.com>
Tue, 7 Aug 2012 11:48:27 +0000
(19:48 +0800)
Signed-off-by: Thynson <lanxingcan@gmail.com>
po/zh_CN.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9aafc93
)
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index 51045f67e94eb6282c4ae0e1494923e5cd3a836f..354bf4dac89537fbf78a14c3c14ce9dc5b64c8f9 100644
(file)
--- a/
po/zh_CN.po
+++ b/
po/zh_CN.po
@@
-350,7
+350,7
@@
msgstr[0] ""
"您指的是这个么？"
msgstr[1] ""
"\n"
"您指的是这个么？"
msgstr[1] ""
"\n"
-"您指的是这
些其中
一个么？"
+"您指的是这
其中的某
一个么？"
#: merge-recursive.c:190
#, c-format
#: merge-recursive.c:190
#, c-format
@@
-661,10
+661,10
@@
msgid_plural ""
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离，\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离，\n"
-"并ä¸
\94
å
\90
\84
è
\87
ªå
\88
\86
å
\88
«æ
\9c
\89
%d å
\92
\8c
%d å¤
\84
ä¸
\8d
å
\90
\8c
ç
\9a
\84
æ
\8f
\90
交ã
\80
\82
\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
msgstr[1] ""
"您的分支和 '%s' 出现了偏离，\n"
msgstr[1] ""
"您的分支和 '%s' 出现了偏离，\n"
-"并ä¸
\94
å
\90
\84
è
\87
ªå
\88
\86
å
\88
«æ
\9c
\89
%d å
\92
\8c
%d å¤
\84
ä¸
\8d
å
\90
\8c
ç
\9a
\84
æ
\8f
\90
交ã
\80
\82
\n"
+"并且分别有 %d 和 %d 处不同的提交。\n"
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
#: builtin/merge.c:1088 builtin/merge.c:1098
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
#: builtin/merge.c:1088 builtin/merge.c:1098
@@
-864,7
+864,7
@@
msgstr "错误收尾 %s。"
#: sequencer.c:779 sequencer.c:913
msgid "no cherry-pick or revert in progress"
#: sequencer.c:779 sequencer.c:913
msgid "no cherry-pick or revert in progress"
-msgstr "æ
²¡æ
\9c
\89
æ
\8b
£é
\80
\89
æ
\88
\96
è¿
\98
å
\8e
\9f
æ
\93
\8d
ä½
\9c
å
\9c
¨
进行"
+msgstr "æ
\8b
£é
\80
\89
æ
\88
\96
è¿
\98
å
\8e
\9f
æ
\93
\8d
ä½
\9c
并æ
\9c
ª
进行"
#: sequencer.c:781
msgid "cannot resolve HEAD"
#: sequencer.c:781
msgid "cannot resolve HEAD"
@@
-928,7
+928,7
@@
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
#: wrapper.c:413
#, c-format
msgid "unable to look up current user in the passwd file: %s"
#: wrapper.c:413
#, c-format
msgid "unable to look up current user in the passwd file: %s"
-msgstr "无法在 passwd 文件中查询到
当前
用户：%s"
+msgstr "无法在 passwd 文件中查询到
该
用户：%s"
#: wrapper.c:414
msgid "no such user"
#: wrapper.c:414
msgid "no such user"
@@
-1106,7
+1106,7
@@
msgstr "bug：未处理的差异状态 %c"
#: wt-status.c:785
msgid "You have unmerged paths."
#: wt-status.c:785
msgid "You have unmerged paths."
-msgstr "您有
路径尚未合并
。"
+msgstr "您有
尚未合并的路径
。"
# 译者：注意保持前导空格
#: wt-status.c:788 wt-status.c:912
# 译者：注意保持前导空格
#: wt-status.c:788 wt-status.c:912
@@
-1191,7
+1191,7
@@
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
#: wt-status.c:898
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
#: wt-status.c:898
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
-msgstr " （
执行 \"git rebase --continue\" 一旦您满意您的修改
）"
+msgstr " （
当您对您的修改满意后执行 \"git rebase --continue\"
）"
#: wt-status.c:908
msgid "You are currently cherry-picking."
#: wt-status.c:908
msgid "You are currently cherry-picking."
@@
-1349,11
+1349,11
@@
msgstr "不能读取索引"
#: builtin/add.c:286
#, c-format
msgid "Could not open '%s' for writing."
#: builtin/add.c:286
#, c-format
msgid "Could not open '%s' for writing."
-msgstr "不能
为写入打开 '%s'
。"
+msgstr "不能
打开 '%s' 以写入
。"
#: builtin/add.c:290
msgid "Could not write patch"
#: builtin/add.c:290
msgid "Could not write patch"
-msgstr "不能
写
补丁"
+msgstr "不能
生成
补丁"
#: builtin/add.c:295
#, c-format
#: builtin/add.c:295
#, c-format
@@
-1371,7
+1371,7
@@
msgstr "不能应用 '%s'"
#: builtin/add.c:312
msgid "The following paths are ignored by one of your .gitignore files:\n"
#: builtin/add.c:312
msgid "The following paths are ignored by one of your .gitignore files:\n"
-msgstr "下列路径
被您的一个 .gitignore 文件所
忽略：\n"
+msgstr "下列路径
根据您的一个 .gitignore 文件而被
忽略：\n"
#: builtin/add.c:352
#, c-format
#: builtin/add.c:352
#, c-format
@@
-1494,7
+1494,7
@@
msgstr "删除的文件仍有内容"
#: builtin/apply.c:1665
#, c-format
msgid "corrupt patch at line %d"
#: builtin/apply.c:1665
#, c-format
msgid "corrupt patch at line %d"
-msgstr "补丁
损坏位于第 %d 行
"
+msgstr "补丁
在第 %d 行损坏
"
#: builtin/apply.c:1701
#, c-format
#: builtin/apply.c:1701
#, c-format
@@
-1715,8
+1715,8
@@
msgstr "内部错误"
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] "应用
补丁 %%s 时
%d 个被拒绝..."
-msgstr[1] "应用
补丁 %%s 时
%d 个被拒绝..."
+msgstr[0] "应用
%%s 个补丁，其中
%d 个被拒绝..."
+msgstr[1] "应用
%%s 个补丁，其中
%d 个被拒绝..."
#: builtin/apply.c:3980
#, c-format
#: builtin/apply.c:3980
#, c-format
@@
-1791,7
+1791,7
@@
msgstr "应用补丁而不修改工作区"
#: builtin/apply.c:4310
msgid "also apply the patch (use with --stat/--summary/--check)"
#: builtin/apply.c:4310
msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "è¿
\98
åº
\94
ç
\94
¨æ¤è¡¥ä¸
\81
ï¼
\88
ä
½¿ç
\94
¨ --stat/--summary/--check å
\8f
\82
æ
\95
°
）"
+msgstr "è¿
\98
åº
\94
ç
\94
¨æ¤è¡¥ä¸
\81
ï¼
\88
ä
¸
\8e
--stat/--summary/--check é
\80
\89
项å
\90
\8c
æ
\97
¶ä½¿ç
\94
¨
）"
#: builtin/apply.c:4312
msgid "attempt three-way merge if a patch does not apply"
#: builtin/apply.c:4312
msgid "attempt three-way merge if a patch does not apply"
@@
-1843,7
+1843,7
@@
msgstr "冗长输出"
#: builtin/apply.c:4339
msgid "tolerate incorrectly detected missing new-line at the end of file"
#: builtin/apply.c:4339
msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr "å
®½å®¹
不正确的文件末尾换行符"
+msgstr "å
\85
\81
许
不正确的文件末尾换行符"
#: builtin/apply.c:4342
msgid "do not trust the line counts in the hunk headers"
#: builtin/apply.c:4342
msgid "do not trust the line counts in the hunk headers"
@@
-1895,7
+1895,7
@@
msgstr "不能创建归档文件 '%s'"
#: builtin/archive.c:20
msgid "could not redirect output"
#: builtin/archive.c:20
msgid "could not redirect output"
-msgstr "不能
输出重定向
"
+msgstr "不能
重定向输出
"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
@@
-1921,7
+1921,7
@@
msgstr "git archive：协议错误"
#: builtin/archive.c:71
msgid "git archive: expected a flush"
#: builtin/archive.c:71
msgid "git archive: expected a flush"
-msgstr "git archive：应为
一个
刷新"
+msgstr "git archive：应为刷新"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:144
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:144