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

Inclusive language #393

Merged
merged 5 commits into from
Jul 30, 2021
Merged

Inclusive language #393

merged 5 commits into from
Jul 30, 2021

Conversation

Holzhaus
Copy link
Member

Following up on our commitment we made here: https://mixxx.org/news/2020-06-29-black-lives-matter/

This replaces the term "master" with "main", "master sync" with "sync lock", "sync master" with "sync leader". I did not replace occurences where I had the impression that it referred to a hardware label, as this would make it harder to find the corresponding button/fader.

This also fixes an actual issue because we already replaced the term in the GUI, but the old term was still used in the docs.

@Holzhaus Holzhaus requested review from ywwg and Swiftb0y May 15, 2021 21:33
@Holzhaus Holzhaus added this to In progress in 2.3 via automation May 15, 2021
@Holzhaus
Copy link
Member Author

Oops, this should go into main, we didn't rename the outputs in 2.3 yet.

@Holzhaus Holzhaus removed this from In progress in 2.3 May 15, 2021
@Holzhaus Holzhaus added this to In progress in 2.4 via automation May 15, 2021
@Holzhaus Holzhaus changed the base branch from 2.3 to main May 15, 2021 21:41
@ronso0
Copy link
Member

ronso0 commented May 16, 2021

Oops, this should go into main, we didn't rename the outputs in 2.3 yet.

hmm.. It's also rather inconsistent for the GUI documentation and in skins:
we use MAIN in LateNight (only) now, also in the mixer chapter but the [Master],gain tooltip still says Master.

I think we should add this to 2.3 --except maybe the sound hardware preferences documentation-- but the remaining skin labels can easily be adjusted for 2.3 (even with the label/tooltip inconsistency).

@Holzhaus
Copy link
Member Author

Hmm, I think it would be confusing to talk about "Main output" if it's named "master output" in the preferences. I'm not particularily keen on splitting up this issue. If you think it's needed, please go ahead, otherwise let's just postpone it until 2.4.

@ronso0
Copy link
Member

ronso0 commented May 18, 2021

ah okay, I see mixxxdj/mixxx#3868 was merged to main because of String freeze.

Side note: why should Master/Main be translated at all? I vaguely remember we discussed to not translate terms that are virtually omnipresent hardware labels on most DJ/audio gear.

@Holzhaus
Copy link
Member Author

So, should we merge this into main?

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

Thanks, two small nitpicks, LGTM otherwise.


main output
master output
Copy link
Member

Choose a reason for hiding this comment

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

maybe emphasize that the term "master output" has been used historically, but is being phased out so people will know which one to use?

Copy link
Member Author

Choose a reason for hiding this comment

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

Can you suggest a wording? I'm a bit uncreative today.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe add an extra sentence at the end of the description like this:

Please note: the term "master output" has been used historically but is in the process of being phased out. Prefer using "main output".

I'm not too good at writing either so feel free to make changes as you see fit

source/hardware/controllers/denon_mc7000.rst Outdated Show resolved Hide resolved
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

Thank you very much LGTM

2.4 automation moved this from In progress to Reviewer approved Jul 30, 2021
@Swiftb0y
Copy link
Member

I guess owen doesn't have any interest / time to review this so I'll go ahead and merge now.

@Swiftb0y Swiftb0y merged commit a6e6684 into mixxxdj:main Jul 30, 2021
2.4 automation moved this from Reviewer approved to Done Jul 30, 2021
@ywwg
Copy link
Member

ywwg commented Jul 30, 2021

sorry I didn't have time to review. thanks for doing the work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
2.4
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants