TL Localization - Chapter 7, Submodules (1,112 words) #84
Conversation
This file contains 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
cherryloua
reviewed
Feb 28, 2018
There was a problem hiding this comment.
Hi @heywens
I have a few suggestions that you might like to consider.
| Here we'll see that there was a change on the server for this submodule and it gets merged in. | ||
| Subukan natin ito sa opsyon na ``merge''. | ||
| Upang itakda ito nang manu-mano, maaari lamang nating idagdag ang pagpipilian na `--merge` sa ating `update` na pagtawag. | ||
| Dito, makikita natin na may isang pagbabago sa server para sa submodule na ito at ito ay nai-merge. |
There was a problem hiding this comment.
Please, change "manu-mano" to "mano-mano" base on Google Translate and Glosbe it was spelled like that.
|
|
||
| [[_publishing_submodules]] | ||
| ===== Publishing Submodule Changes | ||
| ===== Paglalahatla sa mga Pagbabago ng Submodule | ||
|
|
| Now we have some changes in our submodule directory. | ||
| Some of these were brought in from upstream by our updates and others were made locally and aren't available to anyone else yet as we haven't pushed them yet. | ||
| Ngayon ay mayroon ng tayo iilang mga pagbabago sa ating submodule na direktoryo. | ||
| Ilan sa mga ito ay dinala mula sa upstream sa pamamagitan ng ating mga update at ang iba ay ginawa sa lokal at hindi pa magagamit ng sinuman dahil hindi pa natin na-push ang mga ito. |
There was a problem hiding this comment.
"mayroon ng tayo" to "mayroon na tayong"
| If we commit in the main project and push it up without pushing the submodule changes up as well, other people who try to check out our changes are going to be in trouble since they will have no way to get the submodule changes that are depended on. | ||
| Those changes will only exist on our local copy. | ||
| Kung tayo ay nag-commit sa pangunahing proyekto at pi-nush ito, nang wala ring pag-push sa mga pagbabago ng submodule, ang ibang tao na nagsusubok na mag-check out ng mga pagbabago ay magkakaroon ng problema dahil wala silang paraan upang makuha ang mga naka-dependeng pagbabago sa submodule. | ||
| Ang mga pagbabago iyon ay umiiral lamang sa ating lokal na kopya. | ||
|
|
There was a problem hiding this comment.
"mga pagbabago iyon" to "mga pagbabagong iyon"
| In order to make sure this doesn't happen, you can ask Git to check that all your submodules have been pushed properly before pushing the main project. | ||
| The `git push` command takes the `--recurse-submodules` argument which can be set to either ``check'' or ``on-demand''. | ||
| The ``check'' option will make `push` simply fail if any of the committed submodule changes haven't been pushed. | ||
| Para makasiguro na hindi na ito mangyayari, maaari mong hilingin ang Git na suriin na ang lahat ng iyong mga submodile ay na-push nang maayos bago mag-push sa pangunahing proyekto. |
There was a problem hiding this comment.
"maaari mong hilingin ang Git" to "maaari mong hilingin sa Git" not really sure... but the later sounds better, I guess.
| The `git push` command takes the `--recurse-submodules` argument which can be set to either ``check'' or ``on-demand''. | ||
| The ``check'' option will make `push` simply fail if any of the committed submodule changes haven't been pushed. | ||
| Para makasiguro na hindi na ito mangyayari, maaari mong hilingin ang Git na suriin na ang lahat ng iyong mga submodile ay na-push nang maayos bago mag-push sa pangunahing proyekto. | ||
| Ang utos `git push` ay tumatanggap ng argumento na `--recurse-submodules` na kung saan maaari itakda alinman sa ``check'' o ``on-demand''. |
There was a problem hiding this comment.
"na kung saan maaari itakda alinman sa" to "na kung saan ay maaaring itakda ang alinman sa"
|
|
||
| [source,console] | ||
| ---- | ||
| $ git push --recurse-submodules=check | ||
| The following submodule paths contain changes that can | ||
| not be found on any remote: | ||
| Ang mga sumusunod na mga path ng submodule ay naglalaman ng mga pagbabago na maaari |
There was a problem hiding this comment.
"na maaari" change to "na maaaring"
| The simple option is to go into each submodule and manually push to the remotes to make sure they're externally available and then try this push again. | ||
| If you want the check behavior to happen for all pushes, you can make this behavior the default by doing `git config push.recurseSubmodules check`. | ||
| Tulad ng iyong nakikita, nagbibigay din ito sa atin ng ilang kapaki-pakinabang na payo tungkol sa kung ano ang maaari nating gawin sa susunod. | ||
| Ang simpleng pagpipilian ay pumunta sa bawat submodule at manu-manong i-push sa mga remote upang matiyak na magagamit ang mga ito sa labas at pagkatapos ay subukang muli ang push na ito. |
There was a problem hiding this comment.
"manu-manong" change to "mano-manong"
|
Hi @cherryloua, thank you very much for the review. Necessary changes have been applied. Thank you. |
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.
Hi, kindly check my contribution. Thanks!