Teach Page Rebasing #1245
Teach Page Rebasing #1245
Conversation
Change all footer links to https
Update libraries links to https
Get Started page: remove errant comma
…d_link removed link that is no longer in use
…s_to_object_category Moved car instances into the Object category
Add 2021 fundraiser link to the banner
Get Started page: Remove Extra the
added p5 logo in contributor-docs page
update Chinese translation of 'Donate' and 'Teach' at the sidebar
update sidebar translation
Quick fix to dom-video examples. Fixes processing#1103
Change line endings to Unix style for copy() method example
Also optimized template for better i18n.
Update footer template
…vek-hindi-trans Hindi Translation for line 846-848 Added
Updated link of JAVA install. Reiterate the instruction for clonning repo.
docs: fixed java link and cloning instruction
Some text is edited following reviewer's suggestion and comments, There is not-edited text yet, I will translate it after making appropriate conclusion.
Edit p5.bezier translation
Add showcase form
…NG]toKOR] Snp0301 translation [ENG] to [KOR]
…8befff9c0d4a390e02ed)
Correction of Issue Template label
There was a problem hiding this comment.
Hi @Gracia-zhang, I have seen your past PRs.
Am I correct here that you want to match the teach branch to the latest main?
What you are doing is correct, but in the end, you need to resolve conflicts between branches.
You can see what exactly is in conflict here.
Conflict resolution is simply the process of deciding whether to prioritize current or past commitments.
As far as I can ascertain, the conflicts this time are for 2020-2021 commits (8b55a32, 899b132, etc.) and it is better to ask @yinhwa for help.
Also, regarding the PR outline, it would be great if you could include a description of why you want to do it and how the PR will solve the problem. This will help us in the present, but also for someone in the future😸.
I'm not confident that what is described is completely correct, and there are several ways to resolve conflicts, so I would appreciate it if you could look into this on your own:pray:
|
Hi @3ru thank you so much for the kindly instruction for Gracia :) I really appreciate it. We'll discuss on the conflicts soon and get the rebasing done! |
There was a problem hiding this comment.
Thanks @Gracia-zhang for this commit :) Just one thing you might wanna change:
in src/data/es.yml file, could we keep the Spanish version of the codes, as this file is dedicated for Spanish translation. You can simply change lines 1707-1715 into the original Spanish version.
I guess we are good to merge, once you make this final change :)
Revert the Spanish version of line 1707-1715
|
Hi @yinhwa , I reverted the Spanish version of es.yml file on line 1707-1715 with GitHub editor. I think we are good to merge! |
|
Think you can reopen the post updates PR now @Gracia-zhang yay~💙💙 |
Fixes #[Add issue number here]
Changes:
upstream: main --> origin: teach
Screenshots of the change: