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

CmdLine: show native path separators in --help #4657

Merged
merged 5 commits into from
Feb 1, 2022
Merged

CmdLine: show native path separators in --help #4657

merged 5 commits into from
Feb 1, 2022

Conversation

motific
Copy link
Contributor

@motific motific commented Feb 1, 2022

Translation source changed in cmdLineArgs.cpp line 134

@uklotzde
Copy link
Contributor

uklotzde commented Feb 1, 2022

Translations are synchronized with Transifex once in a while, not manually.

https://github.com/mixxxdj/mixxx/wiki/Internationalization#developers---i18nl10n-and-mixxx

@uklotzde uklotzde closed this Feb 1, 2022
@uklotzde uklotzde reopened this Feb 1, 2022
@uklotzde
Copy link
Contributor

uklotzde commented Feb 1, 2022

Didn't notice that there are 2 commits. Please revert all changes of .ts files.

@uklotzde
Copy link
Contributor

uklotzde commented Feb 1, 2022

As a First-time Contributor we have to ask you to sign our Contributor Agreement (follow this link) before we can merge any code. ✔️

@motific
Copy link
Contributor Author

motific commented Feb 1, 2022

Thanks, I'm a bit rusty. I think I reverted those properly and the only file being changed should be the .cpp now

@uklotzde
Copy link
Contributor

uklotzde commented Feb 1, 2022

Next time please stash the changes and then force push to eliminate those extra commits. This is a special case were a force push is accepted and desired.

@Holzhaus
Copy link
Member

Holzhaus commented Feb 1, 2022

Next time please stash the changes and then force push to eliminate those extra commits.

@uklotzde meant squash, not stash. If you're interested, you can find a description how that works here: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

No need to do this now, we just use the squash-and-merge strategy.

Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you. Did you already sign the CLA?

@ronso0 ronso0 changed the title I18N/cmdLine: space after colon in translation sources CmdLine: show native path separators in --help Feb 1, 2022
@uklotzde uklotzde merged commit a7730a3 into mixxxdj:main Feb 1, 2022
@motific
Copy link
Contributor Author

motific commented Feb 2, 2022

LGTM, thank you. Did you already sign the CLA?

That's taken care of, thanks for the reminder.

@motific motific deleted the cli-help-slash-fix branch February 2, 2022 09:39
@daschuer
Copy link
Member

@motific, I like to add you to the contributor list in the Mixxx About Box. Shall I use your GitHub User name or your real name?

@daschuer
Copy link
Member

@motific, I like to add you to the contributor list in the Mixxx About Box. Shall I use your GitHub User name or your real name?

I went ahead using motific: 1a9db7e

@motific
Copy link
Contributor Author

motific commented Oct 11, 2022 via email

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.

4 participants