l10n: zh_CN: Update Git Glossary: fork
authorRay Chen <oldsharp@gmail.com>
Thu, 20 Aug 2015 03:01:34 +0000 (11:01 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 23 Aug 2015 07:12:22 +0000 (15:12 +0800)
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>
po/zh_CN.po
index 507023e2566d9360f10800463902e874b69184ee..752937ec5f10be6685e1f1dc21ba729988462a4c 100644 (file)
@@ -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 ""