Skip to content

统一 fork 的译法:将「派生」改为「分叉」 - #545

Open
Goldloli wants to merge 1 commit into
progit:masterfrom
Goldloli:fix/fork-translation
Open

Goldloli wants to merge 1 commit into
progit:masterfrom
Goldloli:fix/fork-translation

Conversation

@Goldloli

Copy link
Copy Markdown

背景

issue #541 指出:书中 fork 一直译作「派生」,而在 Git 提交图语境里「分叉」更贴切(从一个 branch/repo 分叉出另一个,commit graph 仍是同一棵树),GitHub 中文文档也使用「分叉」。维护者在 issue 中回复「同意,可以全局查找替换一下,提一个 PR。」本 PR 落实该决定。

英文原版(progit/progit2 @ a013e32)中,以下 24 处对应的原文全部是 fork / forking / forked,语义一致,因此统一替换。

改动

全仓库 24 处「派生」→「分叉」,并把 TRANSLATION_NOTES.asc 的术语表更新为 fork => 分叉(共 7 个文件,+24/−24):

文件 处数 对应英文原文(示例)
TRANSLATION_NOTES.asc 2 Before forking this repository… + 术语表 fork => 派生 → fork => 分叉
book/06-github/sections/2-contributing.asc 13 ==== Forking Projects、fork the project、your fork、Push our new topic branch back up to our GitHub fork
book/05-distributed-git/sections/contributing.asc 5 ==== Forked Public Project、contributing via forking、creating your own writable fork of the project、your forked repository、Instead of forking the project
book/05-distributed-git/sections/distributed-workflows.asc 1 fork a project and push your changes into your fork
book/05-distributed-git/sections/maintaining.asc 1 a maint branch that is forked off from the last release
book/06-github/sections/4-managing-organization.asc 1 when you fork a repository, you'll have the choice of forking it to your organization's namespace
book/10-git-internals/sections/transfer-protocols.asc 1 projects that are forks of one another

其中两处做了轻微润色,使替换后的中文通顺(仍属同一关注点):

  • 创建一份自己的可写的项目派生仓库 → 创建一份属于自己的可写项目分叉(对应 creating your own writable fork of the project)
  • 第一个例子描述在支持简单派生的 Git 托管上使用派生来做贡献。 → 第一个例子描述在支持简单分叉的 Git 托管上,如何通过分叉来做贡献。

验证

  1. 全仓库已无残留「派生」:

    grep -rn "派生" --exclude-dir=.git .   # 修改前 24 处;修改后无输出
  2. 用与 Gemfile 一致的 asciidoctor 2.0.12 渲染全部 7 个改动文件,均成功(退出码 0,无语法错误),
    渲染后的 HTML 中「派生」出现次数为 0、「分叉」按处替换:

    for f in $(git diff --name-only); do asciidoctor -o /tmp/out "$f"; done   # 7/7 通过
  3. 未改动任何代码、图片或格式;diff 只有这 24 处替换(+24/−24),与 修复2.4Git-基础-撤消操作中两个连字符--被渲染成了一个长破折号— #539(undoing.asc)、
    Fix quotation marks around help #543(help.asc)两个 open PR 修改的文件不重叠,无冲突。

Closes #541

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fork 建议译作 ”分叉“

1 participant