L10n japanese updates 2023 11 17 #698
Merged
+40
−23
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
New translations about.md (Japanese) New translations about.md (Japanese) New translations about.md (Japanese) New translations about.md (Japanese) New translations about.md (Japanese)
New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese) New translations config.yaml (Japanese)
New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese) New translations news.md (Japanese)
New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese) New translations tabcontents.yaml (Japanese)
✅ Deploy Preview for numpy-org ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
content/ja/news.md
Outdated
| * Ricardo Prins (ricardoprins) | ||
| * Getúlio Silva (getuliosilva) | ||
| * Getúlio Silva (getuliosilva) | ||
| >>>>>>> 4528610 (New translations news.md (Japanese)) |
There was a problem hiding this comment.
This looks like it should be removed.
There was a problem hiding this comment.
Thanks. Not sure how I missed these merge artifacts.
content/ja/news.md
Outdated
| @@ -212,6 +226,10 @@ _2019年11月15日_ -- NumPyと、NumPyの重要な依存ライブラリの1つ | |||
|
|
|||
| こちらは、より以前のNumPyリリースのリストで、各リリースノートへのリンクが記載されています。 全てのバグフィックスリリース(バージョン番号`x.y.z` の`z`だけが変更されたもの)は新しい機能追加はされず、マイナーリリース (`y` が増えたもの)は、新しい機能追加されています。 | |||
|
|
|||
| <<<<<<< HEAD | |||
AtsushiSakai
approved these changes
Nov 18, 2023
tkoyama010
suggested changes
Nov 18, 2023
Co-authored-by: Tetsuo Koyama <tkoyama010@gmail.com>
|
Thanks @jarrodmillman for pointing out the merge artifacts, @AtsushiSakai for the review, and @tkoyama010 for the suggestions. I think this is ready now if someone wants to merge it. |
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.
Brief description of what is fixed or changed
Update Japanese translations. I saw on Crowdin that @AtsushiSakai translated the updated news content and adjusted some translations so making a PR to get these updates in.
Crowdin is completely out of sync with github because we didn't merge Crowdin's autogenerated PR, instead taking only the commits we wanted. In addition, translations on main also had some updates made directly without using Crowdin. My process here is to do a scripted rebase on the commit where l10n_main diverges from main which filters out all commits not from the language of interest, and squashes together commits that touch the same file (fortunately Crowdin doesn't make commits that touch multiple files). I then rebase this on main and manually clean up the merge conflicts.
@AtsushiSakai, please let me know if everything looks Ok. cc @tkoyama010 in case you want to take a look too.