Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos on word development and on some Brazilian Portuguese translations #648

Merged
merged 1 commit into from
May 25, 2021

Conversation

jaimeadf
Copy link
Contributor

No description provided.

@ImagicTheCat
Copy link
Member

  • A translation fix doesn't respect the capitalization of words.
  • The docs/ files are generated and shouldn't be modified manually, but it should work in this case.

@jaimeadf
Copy link
Contributor Author

jaimeadf commented May 25, 2021

Oh sorry, I didn’t know about that. If you want I can force push commits without the changes in the .html files or close this PR and create another one.

@ImagicTheCat
Copy link
Member

You can rebase the PR as you wish. Except for the uppercase issue, it should be fine because I think you modified the html as the generation would, it's just not a good idea to do that for more complex edits.

@jaimeadf
Copy link
Contributor Author

jaimeadf commented May 25, 2021

Thanks, I’ll make all those changes in about an hour or two.

@ImagicTheCat
Copy link
Member

Thanks, it would be nice to rebase all the commits to one or two meaningful ones (for clarity).

@jaimeadf
Copy link
Contributor Author

jaimeadf commented May 25, 2021

Wouldn't be better for you to use the squash option to merge them?
The squash merges all commits into one and lets you change its message as your liking, so your main branch doesn't get messy.

image

@jaimeadf
Copy link
Contributor Author

I squashed them for you, sorry for the inconvenience.

@ImagicTheCat
Copy link
Member

I prefer to let people do it first because that's what I do myself when I'm done, I cleanup/clarify the commits. Thanks for the fixes.

@ImagicTheCat ImagicTheCat merged commit c901bf0 into vRP-framework:master May 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants