Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
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.ascBefore forking this repository…+ 术语表fork => 派生→fork => 分叉book/06-github/sections/2-contributing.asc==== Forking Projects、fork the project、your fork、Push our new topic branch back up to our GitHub forkbook/05-distributed-git/sections/contributing.asc==== Forked Public Project、contributing via forking、creating your own writable fork of the project、your forked repository、Instead of forking the projectbook/05-distributed-git/sections/distributed-workflows.ascfork a project and push your changes into your forkbook/05-distributed-git/sections/maintaining.asca maint branch that is forked off from the last releasebook/06-github/sections/4-managing-organization.ascwhen you fork a repository, you'll have the choice of forking it to your organization's namespacebook/10-git-internals/sections/transfer-protocols.ascprojects that are forks of one another其中两处做了轻微润色,使替换后的中文通顺(仍属同一关注点):
创建一份自己的可写的项目派生仓库→创建一份属于自己的可写项目分叉(对应creating your own writable fork of the project)第一个例子描述在支持简单派生的 Git 托管上使用派生来做贡献。→第一个例子描述在支持简单分叉的 Git 托管上,如何通过分叉来做贡献。验证
全仓库已无残留「派生」:
用与
Gemfile一致的 asciidoctor 2.0.12 渲染全部 7 个改动文件,均成功(退出码 0,无语法错误),渲染后的 HTML 中「派生」出现次数为 0、「分叉」按处替换:
未改动任何代码、图片或格式;diff 只有这 24 处替换(+24/−24),与 修复2.4Git-基础-撤消操作中两个连字符--被渲染成了一个长破折号— #539(
undoing.asc)、Fix quotation marks around help #543(
help.asc)两个 open PR 修改的文件不重叠,无冲突。Closes #541