diff options
| author | Be <be@mixxx.org> | 2021-07-31 11:27:45 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2021-07-31 11:27:45 -0500 |
| commit | ab4d3ddbf83ad8cadcf7ffbdd621f31379e9fa6d (patch) | |
| tree | 97239fd70fa9fbd165d25cfed6d2410b4821a6de /src/controllers/controlpickermenu.cpp | |
| parent | c7fc7563d7c6ea2ade23f814225fa0e281d6cbca (diff) | |
| parent | 143896dd69dd7e09475564c3b4709961ac1a6203 (diff) | |
Merge remote-tracking branch 'upstream/main' into effects_refactoring
Diffstat (limited to 'src/controllers/controlpickermenu.cpp')
| -rw-r--r-- | src/controllers/controlpickermenu.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/controllers/controlpickermenu.cpp b/src/controllers/controlpickermenu.cpp index f0a933bb23..f1465a204f 100644 --- a/src/controllers/controlpickermenu.cpp +++ b/src/controllers/controlpickermenu.cpp @@ -238,42 +238,42 @@ ControlPickerMenu::ControlPickerMenu(QWidget* pParent) syncMenu); syncMenu->addSeparator(); addControl("[InternalClock]", - "sync_master", - tr("Internal Sync Master"), - tr("Toggle Internal Sync Master"), + "sync_leader", + tr("Internal Sync Leader"), + tr("Toggle Internal Sync Leader"), syncMenu); addControl("[InternalClock]", "bpm", - tr("Internal Master BPM"), - tr("Internal Master BPM"), + tr("Internal Leader BPM"), + tr("Internal Leader BPM"), syncMenu); addControl("[InternalClock]", "bpm_up", - tr("Internal Master BPM +1"), - tr("Increase internal master BPM by 1"), + tr("Internal Leader BPM +1"), + tr("Increase internal Leader BPM by 1"), syncMenu); addControl("[InternalClock]", "bpm_down", - tr("Internal Master BPM -1"), - tr("Decrease internal master BPM by 1"), + tr("Internal Leader BPM -1"), + tr("Decrease internal Leader BPM by 1"), syncMenu); addControl("[InternalClock]", "bpm_up_small", - tr("Internal Master BPM +0.1"), - tr("Increase internal master BPM by 0.1"), + tr("Internal Leader BPM +0.1"), + tr("Increase internal Leader BPM by 0.1"), syncMenu); addControl("[InternalClock]", "bpm_down_small", - tr("Internal Master BPM -0.1"), - tr("Decrease internal master BPM by 0.1"), + tr("Internal Leader BPM -0.1"), + tr("Decrease internal Leader BPM by 0.1"), syncMenu); syncMenu->addSeparator(); - addDeckAndSamplerControl("sync_master", tr("Sync Master"), tr("Toggle sync master"), syncMenu); - addDeckAndSamplerControl("sync_mode", - tr("Sync Mode"), - tr("Sync mode 3-state toggle (OFF, FOLLOWER, MASTER)"), + addDeckAndSamplerControl("sync_leader", + tr("Sync Leader"), + tr("Sync mode 3-state toggle / indicator (Off, Soft Leader, " + "Explicit Leader)"), syncMenu); // Speed |