search

pcottle / learnGitBranching

An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git!
https://pcottle.github.io/learnGitBranching/
MIT License
30.16k stars 5.72k forks source link

pt_BR Translations fix and add. #1112

Closed maxoliverbr closed 8 months ago

maxoliverbr commented 8 months ago

Fixed and added some missing pt_BR translations.

netlify[bot] commented 8 months ago

Deploy Preview for xenodochial-hugle-b9ec84 ready!

Name Link
Latest commit a88ef6066edcf3b276939479a064cbab84b0e33b
Latest deploy log https://app.netlify.com/sites/xenodochial-hugle-b9ec84/deploys/655040b9de8def000803c8a7
Deploy Preview https://deploy-preview-1112--xenodochial-hugle-b9ec84.netlify.app/
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

maxoliverbr commented 8 months ago

Fixed a type and last minute missing translation in pt_BR.

pcottle commented 8 months ago

Thanks for the extra pair of eyes in reviewing @waldyrious! Looks like this is ready to go out in its current state?

pcottle commented 8 months ago

Went ahead and pushed the site with these changes but we can always update them later!

waldyrious commented 8 months ago

Looks like this is ready to go out in its current state?

Went ahead and pushed the site with these changes but we can always update them later!

Sorry @pcottle but I think it would have been more appropriate to give me at least a few hours (!) to react before merging the changes. As you can see from my responses above, I still disagree with some of the changes that were merged. Please hold for me and @maxoliverbr to reach a consensus before applying further changes — thanks! :pray:

pcottle commented 8 months ago

Apologies! reverted for now :P

waldyrious commented 8 months ago

Unfortunately PRs can't be un-merged and re-merged, so I'm afraid either @maxoliverbr, you or I will need to submit a new PR. In any case, it seems like agreement has been reached in all the threads above — but if you could chime in on the first thread above, that'd be appreciated :)

maxoliverbr commented 8 months ago

Hi ! Just submitted a new PR with the rolledback translations :)

waldyrious commented 7 months ago

Sorry both, I've been quite busy in the past few days. I just saw PR #1114, but I'm a bit confused — hadn't all of this PR's changes been reverted in #1113 already?

Hmm, it seems like the merged diff of #1114 is indeed empty; it's a little puzzling that the diff in the PR actually showed changed content, though.

In any case, it seems like the remaining changes from this PR (minus the reversals done in #1114) still need to be re-submitted as a new PR, right?

waldyrious commented 7 months ago

pinging @pcottle in case the previous comment didn't generate a notification. :point_up:

pcottle commented 7 months ago

@waldyrious ah yes it looks like you're right -- git-dummy-msg is still the string before this pull request (Vai Timão!) rather than the string after.

there were definitely changes in #1114: https://github.com/pcottle/learnGitBranching/pull/1114/files

but it wasn't a complete revert.

Let me know how we should proceed -- we can revert-my-revert if necessary 😅

waldyrious commented 7 months ago

No worries, I'll resubmit those changes as a new PR to make things easier :) I'll retain @maxoliverbr's authorship of the commit, of course.

waldyrious commented 7 months ago

Ok, done: #1119.