Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate 10-git-internals refspec (Originally #74 ) #217

Merged

Conversation

oldsharp
Copy link
Contributor

@oldsharp oldsharp commented Aug 7, 2015

Squashed commit of the following (originally token from #74 ):

commit 579ae77
Author: morstar [email protected]
Date: Sat Jun 13 10:23:10 2015 +0800

rebase conflicted file

commit d68a600
Author: morstar [email protected]
Date: Sat Jun 13 10:18:27 2015 +0800

rebase 10-git-internals/1-git-internals

commit 1d4a83e
Author: morstar [email protected]
Date: Sat Jun 13 10:01:01 2015 +0800

rebase conflicted file

commit a3d6fa1
Author: morstar [email protected]
Date: Sat Jun 13 09:53:01 2015 +0800

unify the vocabulary and del useless space

将 origin 统一译为“远程版本库”,删除多余空白

commit 2155728
Author: morstar [email protected]
Date: Wed Jun 10 02:38:25 2015 +0800

Update 10-git-internals/1-git-internals.asc

Simplify some sentences and clarify the logic.

commit 0b85182
Author: morstar [email protected]
Date: Wed Jun 10 02:18:30 2015 +0800

Update 1-git-internals.asc

commit e35d605
Author: morstar [email protected]
Date: Wed Jun 10 02:16:38 2015 +0800

Update TRANSLATION_NOTES.asc

commit 4729806
Author: morstar [email protected]
Date: Wed Jun 10 02:06:42 2015 +0800

Translated 10-git-internals/sections/refspec

commit 964c21c
Author: morstar [email protected]
Date: Wed Jun 10 00:45:32 2015 +0800

update 'reference' & 'refspec'

reference to the Chinese translations for Git package

commit 9d68c37
Author: morstar [email protected]
Date: Tue Jun 9 22:31:57 2015 +0800

some minor adjustments

@oldsharp oldsharp changed the title Translate 10-git-internals refspec.asc (Originally #74 ) Translate 10-git-internals refspec (Originally #74 ) Aug 7, 2015
@networm networm mentioned this pull request Aug 7, 2015
95 tasks
@networm
Copy link
Member

networm commented Aug 7, 2015

@oldsharp 请将我在 #74 的审校意见在这里直接修改吧,包括统一中英文行数。

@networm
Copy link
Member

networm commented Aug 7, 2015

@oldsharp 已关闭 #74,且已更新 #160 的审校链接。

@oldsharp
Copy link
Contributor Author

@networm 你之前的 review 意见我已经 fix 了,你可以检查一下。

另外,我也做了一轮 review 工作,并且直接把修改意见应用到了文本上,详见 e611d7a
所以请把这个 PR 的 reviewer 列表加上我的名字,可以算是对此 PR +1 了。

@networm
Copy link
Member

networm commented Aug 10, 2015

@oldsharp 大概检查了一下,没有问题。审校者已经加上你的名字了。

@networm networm added this to the v1.0.0 milestone Aug 11, 2015
morstar and others added 3 commits August 11, 2015 14:19
Squashed commit of the following:

commit 579ae77
Author: morstar <[email protected]>
Date:   Sat Jun 13 10:23:10 2015 +0800

    rebase conflicted file

commit d68a600
Author: morstar <[email protected]>
Date:   Sat Jun 13 10:18:27 2015 +0800

    rebase 10-git-internals/1-git-internals

commit 1d4a83e
Author: morstar <[email protected]>
Date:   Sat Jun 13 10:01:01 2015 +0800

    rebase conflicted file

commit a3d6fa1
Author: morstar <[email protected]>
Date:   Sat Jun 13 09:53:01 2015 +0800

    unify the vocabulary and del useless space

    将 origin 统一译为“远程版本库”,删除多余空白

commit 2155728
Author: morstar <[email protected]>
Date:   Wed Jun 10 02:38:25 2015 +0800

    Update 10-git-internals/1-git-internals.asc

    Simplify some sentences and clarify the logic.

commit 0b85182
Author: morstar <[email protected]>
Date:   Wed Jun 10 02:18:30 2015 +0800

    Update 1-git-internals.asc

commit e35d605
Author: morstar <[email protected]>
Date:   Wed Jun 10 02:16:38 2015 +0800

    Update TRANSLATION_NOTES.asc

commit 4729806
Author: morstar <[email protected]>
Date:   Wed Jun 10 02:06:42 2015 +0800

    Translated 10-git-internals/sections/refspec

commit 964c21c
Author: morstar <[email protected]>
Date:   Wed Jun 10 00:45:32 2015 +0800

    update 'reference' & 'refspec'

    reference to the Chinese translations for Git package

commit 9d68c37
Author: morstar <[email protected]>
Date:   Tue Jun 9 22:31:57 2015 +0800

    some minor adjustments
- Fix the mis-translation of "reference".
- Fix the line-break issue.
Apply my review suggestion.
@oldsharp oldsharp force-pushed the prq-translate-refspec-original-pull-74 branch from e611d7a to bf249ac Compare August 11, 2015 06:25
@oldsharp
Copy link
Contributor Author

考虑到原译者的署名权,我修改了一下 ed83407 的 author 和 date 信息。

Throughout this book, we've used simple mappings from remote branches to local references, but they can be more complex.
Suppose you add a remote like this:
纵观全书,我们已经使用过一些诸如远程分支到本地引用的简单映射方式,但这种映射可以更复杂。
假设你添加了这样一个远程版本库:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改成:假设你添加了这样一个远程仓库。
原因:根据02-git-basics中的remotes一节的翻译用词和这里的上下文,这里的remote应该指的是remote repository,按照这次翻译的惯例应该使用“远程仓库”。
级别:建议修改

Here in this context, "something" should stand for all kinds
of refspecs.
@oldsharp
Copy link
Contributor Author

@robinwen 感谢你细致的审校和评注!我已根据你的建议作了两处修订,请检查。

其余的评注都与术语翻译有关,你的所有相关建议都是 make sense 的,但是我的提议是暂不修改。
其实之前在 #130 中( #130 (comment) )我已经简要提及,这里我再详细解释一下:

  1. “repository”翻译为“仓库”是最近定下来的,之前所有的“repo”、“repository”均翻译成“版本库”,其中还有一部分已经合并到主干上。目前来看,更适合的做法是,在全书审校结束后统一处理,参见 https://github.com/progit/progit2-zh/wiki/Unify 。所以我在修订这部分文本时故意保留了原翻译。
  2. 目前,Git 官方的中文本地化项目提供了一个术语表,我正在根据这个术语表对我们 progit2-zh 项目的术语表进行修订。所以目前我们的术语表的某些词条并非最终版本,比如 fetch。
  3. 综上,我的意见是,这部分工作可以留到最后的统一工作中进行。

Which were introduced in 80c4fad .
Remove them according to the original text.
@oldsharp oldsharp force-pushed the prq-translate-refspec-original-pull-74 branch from 9186909 to 9e8d522 Compare August 13, 2015 23:56
Backport the upstream fix (was progit/progit2@98aed4e ).
@oldsharp oldsharp force-pushed the prq-translate-refspec-original-pull-74 branch from 9e8d522 to f05549f Compare August 13, 2015 23:59
@yaobinwen
Copy link

@oldsharp 修订结果已确认。剩下的comment都是和术语相关的,这些comment就打算保留在这里直到最终的审校是吗?

@oldsharp
Copy link
Contributor Author

@robinwen 是的。

networm added a commit that referenced this pull request Aug 14, 2015
…pull-74

Translate 10-git-internals refspec (Originally #74 )
@networm networm merged commit db878cd into progit:master Aug 14, 2015
@networm
Copy link
Member

networm commented Aug 14, 2015

@oldsharp 已合并入主干。

@oldsharp oldsharp deleted the prq-translate-refspec-original-pull-74 branch August 14, 2015 08:14
OlingCat added a commit to OlingCat/progit2-zh that referenced this pull request Jan 31, 2020
OlingCat added a commit to OlingCat/progit2-zh that referenced this pull request Jan 31, 2020
OlingCat pushed a commit to OlingCat/progit2-zh that referenced this pull request Mar 6, 2020
The name clashes with the chapter 1.

This fixes progit#217
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.

4 participants