[WIP]1.9/develop japanese conflict 行数チェック#783
Open
NEKOGET wants to merge 1908 commits into1.9/developfrom
Open
[WIP]1.9/develop japanese conflict 行数チェック#783NEKOGET wants to merge 1908 commits into1.9/developfrom
NEKOGET wants to merge 1908 commits into1.9/developfrom
Conversation
classes/session/advanced.html 翻訳完了
CREDITSに名前を追加
classes/theme/methods.html 翻訳完了
packages/orm/model/nestedset.html 翻訳中
- 各メソッドの説明文とサンプルコードのコメント部分を翻訳 - 誤字を修正 - 文意の明確化のため、related() の注意書きで表現を微修正
packages/orm/model/nestedset.htmlの翻訳完了
Conflicts: classes/asset/usage.html classes/request/curl.html classes/session/config.html general/error.html general/routing.html general/unit_testing.html packages/auth/ormauth/usage.html packages/orm/observers/included.html toc.html
本家1.8/developをマージ
Fixed typo in views.html and models.html
classes/file/usage.html の誤字修正
classes/database/db.html 翻訳
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
11 participants
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.
行数チェック用PR
mergeはしません。