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 glossary #21

Merged
merged 11 commits into from
Feb 3, 2019
Merged

Translate glossary #21

merged 11 commits into from
Feb 3, 2019

Conversation

potato4d
Copy link
Member

@potato4d potato4d commented Feb 2, 2019

This pull request resolve #2

@smikitky smikitky self-requested a review February 2, 2019 01:53
@potato4d potato4d changed the title WIP: Translate glossary Translate glossary Feb 2, 2019
@potato4d
Copy link
Member Author

potato4d commented Feb 2, 2019

@smikitky
crowdin のものをもとに、新しい部分は追従する形で翻訳を行いました。レビューお願いいたします。

crowdin の時は翻訳されていなかったみたいですが、ソースコードのコメントも翻訳するかどうかは追加で検討したほうがですね 🤔

Copy link
Member

@smikitky smikitky left a comment

Choose a reason for hiding this comment

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

よろしくお願いします

content/docs/reference-glossary.md Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
@smikitky
Copy link
Member

smikitky commented Feb 2, 2019

サジェスチョンを1個1個コミットすると大量のコミットが作成されるのでバッチでコミットする機能を使ってみてください

@potato4d
Copy link
Member Author

potato4d commented Feb 2, 2019

今帰宅中なので後で見ますー。
もし問題なければですが、適用して squash merge してしまったほうがコミットログ綺麗になりそうなので、そちらにしませんか?

@smikitky
Copy link
Member

smikitky commented Feb 2, 2019

少なくともこのPRに関していえば squash で問題ありませんが、他のPRに関してもマージバブル作るべきかどうかについては、確かに考えないとですね…

Co-Authored-By: potato4d <mail@potato4d.me>
@potato4d
Copy link
Member Author

potato4d commented Feb 2, 2019

@smikitky
レビューありがとうございます ✨
Crowdin 時代と diff がないものはそのまま適用していましたが、ルールや情勢も変わっているのでちゃんと見直したほうがよさそうですね。お手数おかけしました 🙇

対応したので再度見ていただけると。マージについてですが、 "typo" みたいなコミットメッセージが入ってしまっても微妙ですし、おりをみて全て squash merge に限定しても良いかなぁと思っています。

特に、英語ドキュメントで新規の翻訳が出た場合、翻訳レポジトリでは 1 コミット目に英文を追加して続くコミットで diff を取りたくなることが多々あるので、 Pull Request 時点ではコミットが多いほうが円滑な気がしました(最悪 squash merge しなくても rebase すれば良いので)

Copy link
Member

@koba04 koba04 left a comment

Choose a reason for hiding this comment

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

いくつかフォーマットの修正と単語の修正(数字 -> 数値)の確認をお願いします。

mergeに関しては、 squash merge に限定するのに賛成です。

content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
Copy link
Member

@smikitky smikitky left a comment

Choose a reason for hiding this comment

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

もう少しだけ細かい修正点を見つけましたので対応お願いします

content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
content/docs/reference-glossary.md Outdated Show resolved Hide resolved
smikitky and others added 2 commits February 3, 2019 00:49
Co-Authored-By: potato4d <mail@potato4d.me>
Co-Authored-By: potato4d <mail@potato4d.me>
@potato4d
Copy link
Member Author

potato4d commented Feb 3, 2019

@smikitky 良きときにマージを貰えるとー🙏

@smikitky smikitky merged commit 2d3bcd6 into master Feb 3, 2019
@tesseralis tesseralis mentioned this pull request Feb 3, 2019
90 tasks
@potato4d potato4d deleted the issues/#2 branch February 20, 2019 03:49
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.

Translate glossary
3 participants