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

Revamp zh_cn manual (ready to go) #2888

Merged
merged 2 commits into from
Aug 25, 2019
Merged

Revamp zh_cn manual (ready to go) #2888

merged 2 commits into from
Aug 25, 2019

Conversation

3TUSK
Copy link
Contributor

@3TUSK 3TUSK commented Jul 10, 2018

This PR contains a fully-revamped translation of OpenComputer manual. Calling @TartaricAcid, @ZeroAurora and @JackyWangMislantiaJnirvana for review, don't merge it yet.

Targeting master-MC1.12 only, as all file names are lowercased.

Also, CC @tongkl1 as he did #2839.

@@ -0,0 +1,9 @@
# 转运器

Choose a reason for hiding this comment

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

建议翻译:数控传输机


![Such a poser.](oredict:oc:transposer)

转运器连接了红石控制的漏斗和[机器人](robot.md),这样[电脑](../general/computer.md)就能控制物品和流体在相邻方块之间的传输了。
Copy link

Choose a reason for hiding this comment

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

[跑腿儿的]
数控传输机用于实现电脑控制的物品或者流体传输。它能在相邻的容器之间转移物品或者流体,比如用于链接红石控制的漏斗和机器人

注意,这个设备没有内部存储空间。

此外,这个设备还可以用于检测与它相邻的容器装了什么。此时它的行为类似于一个装了物品栏升级适配器(当你在检测相邻的箱子里有什么东西的时候)或者一个装了储罐控制器适配器(当你在检测相邻的液槽里有什么东西的时候)


转运器连接了红石控制的漏斗和[机器人](robot.md),这样[电脑](../general/computer.md)就能控制物品和流体在相邻方块之间的传输了。

**注意:本方块没有物品栏。**

Choose a reason for hiding this comment

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

(原文不是斜体么)
注意:类似红石力量模组里的传输机,本设备没有内置的物品栏或液槽。它只能使物品或流体在与它相邻的几个容器中转移。

@payonel
Copy link
Member

payonel commented Sep 1, 2018

What is that status of this PR?

@ZeroAurora
Copy link

ZeroAurora commented Sep 1, 2018

This PR is WIP. We don't have enough time to review all translations in the PR. But we're still trying to squeezing time to review it.

Copy link

@ZeroAurora ZeroAurora left a comment

Choose a reason for hiding this comment

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

居然有两个 Pending 的 Review……惊了
修改了一点东西

@ZeroAurora
Copy link

Any progress in this PR? I still have no time to review.

@3TUSK
Copy link
Contributor Author

3TUSK commented Mar 9, 2019

Distracted by a sheer amount of other things... I will see if I can get free time soon™.

@3TUSK
Copy link
Contributor Author

3TUSK commented May 6, 2019

@ZeroAurora @JackyWangMislantiaJnirvana @FledgeXu @TartaricAcid
有时间的话还请帮忙校读一下。

I think the translation is ready for the last round of review now - calling for some people for last proofreading.

@ZeroAurora
Copy link

ZeroAurora commented May 11, 2019 via email

@JackyWangMislantiaJnirvana

@ZeroAurora @JackyWangMislantiaJnirvana @FledgeXu @TartaricAcid
有时间的话还请帮忙校读一下。

I think the translation is ready for the last round of review now - calling for some people for last proofreading.

准备高考,暂无时间,抱歉。26天之后复活。
I'm sorry for not being able to contribute because of the approaching GaoKao(Chinese Collage entrance exam). WILL be active after 26 days.

@FledgeXu
Copy link

terminal 被翻译成远程终端是不是有点问题?一般使用的时候直接用终端的。

Copy link

@FledgeXu FledgeXu left a comment

Choose a reason for hiding this comment

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

oc:gui.Switch.TransferRate=周期率这里应该是传输率

@xiaoxi654
Copy link

oc:gui.Switch.TransferRate=周期率这里应该是传输率

我认为 传输速率 在这个语境下可能更好一些吧?

@3TUSK
Copy link
Contributor Author

3TUSK commented Jun 23, 2019

Done:

  • "Cycle Rate" -> “传输速率”
  • "Remote Terminal" -> “终端”

@ZeroAurora
Copy link

ZeroAurora commented Jun 30, 2019 via email

@xiaoxi654
Copy link

觉得国内玩家看不懂就换了个都能理解的词,我觉得来源请求没什么问题,但是怎么说…有点生硬了

我觉得这个属于是一个梗了,在有共识的情况下,我认为没有必要去替换就是,毕竟长期以来中文维基百科也有在用这个模板,对应的英文维基百科模板就是Citation Needed

@3TUSK
Copy link
Contributor Author

3TUSK commented Aug 24, 2019

This PR is ready to go unless there are new comments.

@3TUSK 3TUSK changed the title Revamp zh_cn manual Revamp zh_cn manual (ready to go) Aug 24, 2019
@payonel
Copy link
Member

payonel commented Aug 24, 2019

I am glad to hear this PR is ready, but, I would like you to rebase and resolve conflicts so I can merge the PR

@3TUSK
Copy link
Contributor Author

3TUSK commented Aug 24, 2019

rebase and resolve conflicts

GitHub tells me that there is no merge conflicts. Plus, GitHub does have a squash merge functionality?

@payonel
Copy link
Member

payonel commented Aug 24, 2019

you'll have to fix the PR on your own machine and force push the rebased commits, or make a new PR

3TUSK and others added 2 commits August 25, 2019 08:13
Co-authored-by: ZeroAurora <[email protected]>
Co-authored-by: JackyWangMislantiaJnirvana <[email protected]>
@3TUSK
Copy link
Contributor Author

3TUSK commented Aug 25, 2019

I am not sure why squash merge is not viable, but here you have the rebased version.

I am not sure why the CI keeps failing, either.

@payonel payonel merged commit cd88968 into MightyPirates:master-MC1.12 Aug 25, 2019
@3TUSK 3TUSK deleted the feature/zh-cn-update branch August 25, 2019 05:33
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.

7 participants