summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Chen <oldsharp@gmail.com>2015-08-20 11:01:34 +0800
committerJiang Xin <worldhello.net@gmail.com>2015-08-23 15:12:22 +0800
commite397e7e353ed647088f29e7d5f867a5a8be08480 (patch)
tree42ec80313627ab991cbc5dad82032e49f41a20d2
parent933c015e37fe3ecb7c643394f247b8c32c8b3f65 (diff)
downloadgit-e397e7e353ed647088f29e7d5f867a5a8be08480.tar.gz
l10n: zh_CN: Update Git Glossary: fork
Remove "复刻" from translation option list of "fork", keeping "派生" as the only one. In Git context, by talking about the term "fork", one usually mean the procedure that divides a branch into two or more history lines. That is quite like the "fork" concept in programming, which split a process into two or more independent processes. On the other hand, "复刻" by itself means "copy" or "mirror". It is considered more suitable for describing the procedure like "fork a repository", which is common on public repository hosting services, such as GitHub. However, this is beyond the scope of core-Git. As a l10n work for core-Git, "复刻" should be removed here. There used to be another option - "分岔". Its a good idea to translate "fork point" as "分岔点". However, "派生点" is as good, too. So this option is finally discarded. Also fix a relevant translation issue which was introduced in `160fb2b`. Signed-off-by: Ray Chen <oldsharp@gmail.com>
-rw-r--r--po/zh_CN.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 507023e256..752937ec5f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -52,7 +52,7 @@
# fast-forward | 快进
# fetch | 获取
# file system | 文件系统
-# fork | 派生,复刻
+# fork | 派生
# Git archive | 仓库(对于 arch 用户)
# gitfile | gitfile(仓库链接文件)
# grafts | (提交)嫁接
@@ -7441,7 +7441,7 @@ msgstr "第一个是其他的祖先提交么?"
#: builtin/merge-base.c:222
msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根据引用日志 <引用> 查找 <提交> 的派生处"
+msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
#: builtin/merge-file.c:8
msgid ""