diff --git a/.tx/config b/.tx/config index 8fc985b970..d0b647a187 100644 --- a/.tx/config +++ b/.tx/config @@ -5,119 +5,213 @@ type = PO [mixxxdj-manual.chaptersadvanced_topicspot] file_filter = source/locale//LC_MESSAGES/chapters/advanced_topics.po +minimum_perc = 0 source_file = source/locale/pot/chapters/advanced_topics.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersappendixpot] file_filter = source/locale//LC_MESSAGES/chapters/appendix.po +minimum_perc = 0 source_file = source/locale/pot/chapters/appendix.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersconfigurationpot] file_filter = source/locale//LC_MESSAGES/chapters/configuration.po +minimum_perc = 0 source_file = source/locale/pot/chapters/configuration.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersdjing_with_mixxxpot] file_filter = source/locale//LC_MESSAGES/chapters/djing_with_mixxx.po +minimum_perc = 0 source_file = source/locale/pot/chapters/djing_with_mixxx.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersgetting_involvedpot] file_filter = source/locale//LC_MESSAGES/chapters/getting_involved.po +minimum_perc = 0 source_file = source/locale/pot/chapters/getting_involved.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersinstallationpot] file_filter = source/locale//LC_MESSAGES/chapters/installation.po +minimum_perc = 0 source_file = source/locale/pot/chapters/installation.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersintroductionpot] file_filter = source/locale//LC_MESSAGES/chapters/introduction.po +minimum_perc = 0 source_file = source/locale/pot/chapters/introduction.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chapterslibrarypot] file_filter = source/locale//LC_MESSAGES/chapters/library.po +minimum_perc = 0 source_file = source/locale/pot/chapters/library.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chapterslivebroadcastingpot] file_filter = source/locale//LC_MESSAGES/chapters/livebroadcasting.po +minimum_perc = 0 source_file = source/locale/pot/chapters/livebroadcasting.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chaptersquickstartpot] file_filter = source/locale//LC_MESSAGES/chapters/quickstart.po +minimum_perc = 0 source_file = source/locale/pot/chapters/quickstart.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.chapterssetuppot] file_filter = source/locale//LC_MESSAGES/chapters/setup.po +minimum_perc = 0 source_file = source/locale/pot/chapters/setup.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.user_interfacepot] file_filter = source/locale//LC_MESSAGES/chapters/user_interface.po -source_file = source/locale/pot/chapters/user_interface.pot -source_lang = en_US minimum_perc = 0 -type = PO - -[mixxxdj-manual.vinyl_controlpot] -file_filter = source/locale//LC_MESSAGES/chapters/vinyl_control.pot source_file = source/locale/pot/chapters/user_interface.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.vinyl_controlpot] file_filter = source/locale//LC_MESSAGES/chapters/vinyl_control.po +minimum_perc = 0 source_file = source/locale/pot/chapters/user_interface.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.glossarypot] file_filter = source/locale//LC_MESSAGES/glossary.po +minimum_perc = 0 source_file = source/locale/pot/glossary.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.indexpot] file_filter = source/locale//LC_MESSAGES/index.po +minimum_perc = 0 source_file = source/locale/pot/index.pot source_lang = en_US -minimum_perc = 0 type = PO [mixxxdj-manual.sphinxpot] file_filter = source/locale//LC_MESSAGES/sphinx.po +minimum_perc = 0 source_file = source/locale/pot/sphinx.pot source_lang = en_US -minimum_perc = 0 type = PO + +[mixxxdj-manual.glossary_] +file_filter = source/locale//LC_MESSAGES/glossary.po +source_file = source/locale/pot/glossary.pot +source_lang = en + +[mixxxdj-manual.index] +file_filter = source/locale//LC_MESSAGES/index.po +source_file = source/locale/pot/index.pot +source_lang = en + +[mixxxdj-manual.index_developer] +file_filter = source/locale//LC_MESSAGES/index_developer.po +source_file = source/locale/pot/index_developer.pot +source_lang = en + +[mixxxdj-manual.manual_guidelines] +file_filter = source/locale//LC_MESSAGES/manual_guidelines.po +source_file = source/locale/pot/manual_guidelines.pot +source_lang = en + +[mixxxdj-manual.sphinx] +file_filter = source/locale//LC_MESSAGES/sphinx.po +source_file = source/locale/pot/sphinx.pot +source_lang = en + +[mixxxdj-manual.todolist] +file_filter = source/locale//LC_MESSAGES/todolist.po +source_file = source/locale/pot/todolist.pot +source_lang = en + +[mixxxdj-manual.chapters--advanced_topics] +file_filter = source/locale//LC_MESSAGES/chapters/advanced_topics.po +source_file = source/locale/pot/chapters/advanced_topics.pot +source_lang = en + +[mixxxdj-manual.chapters--appendix] +file_filter = source/locale//LC_MESSAGES/chapters/appendix.po +source_file = source/locale/pot/chapters/appendix.pot +source_lang = en + +[mixxxdj-manual.chapters--configuration] +file_filter = source/locale//LC_MESSAGES/chapters/configuration.po +source_file = source/locale/pot/chapters/configuration.pot +source_lang = en + +[mixxxdj-manual.chapters--controlling_mixxx] +file_filter = source/locale//LC_MESSAGES/chapters/controlling_mixxx.po +source_file = source/locale/pot/chapters/controlling_mixxx.pot +source_lang = en + +[mixxxdj-manual.chapters--djing_with_mixxx] +file_filter = source/locale//LC_MESSAGES/chapters/djing_with_mixxx.po +source_file = source/locale/pot/chapters/djing_with_mixxx.pot +source_lang = en + +[mixxxdj-manual.chapters--getting_involved] +file_filter = source/locale//LC_MESSAGES/chapters/getting_involved.po +source_file = source/locale/pot/chapters/getting_involved.pot +source_lang = en + +[mixxxdj-manual.chapters--installation] +file_filter = source/locale//LC_MESSAGES/chapters/installation.po +source_file = source/locale/pot/chapters/installation.pot +source_lang = en + +[mixxxdj-manual.chapters--introduction] +file_filter = source/locale//LC_MESSAGES/chapters/introduction.po +source_file = source/locale/pot/chapters/introduction.pot +source_lang = en + +[mixxxdj-manual.chapters--library] +file_filter = source/locale//LC_MESSAGES/chapters/library.po +source_file = source/locale/pot/chapters/library.pot +source_lang = en + +[mixxxdj-manual.chapters--livebroadcasting] +file_filter = source/locale//LC_MESSAGES/chapters/livebroadcasting.po +source_file = source/locale/pot/chapters/livebroadcasting.pot +source_lang = en + +[mixxxdj-manual.chapters--quickstart] +file_filter = source/locale//LC_MESSAGES/chapters/quickstart.po +source_file = source/locale/pot/chapters/quickstart.pot +source_lang = en + +[mixxxdj-manual.chapters--setup] +file_filter = source/locale//LC_MESSAGES/chapters/setup.po +source_file = source/locale/pot/chapters/setup.pot +source_lang = en + +[mixxxdj-manual.chapters--user_interface] +file_filter = source/locale//LC_MESSAGES/chapters/user_interface.po +source_file = source/locale/pot/chapters/user_interface.pot +source_lang = en + +[mixxxdj-manual.chapters--vinyl_control] +file_filter = source/locale//LC_MESSAGES/chapters/vinyl_control.po +source_file = source/locale/pot/chapters/vinyl_control.pot +source_lang = en + diff --git a/Makefile b/Makefile index af19a50df8..9e46d7c1ea 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = sphinx-build-3 +SPHINXBUILD = sphinx-build #SPHINXBUILD = sphinx-build-2.7 #For OSX if sphinx has been installed via MacPorts PAPER = diff --git a/README.md b/README.md index 11194d4f20..ff614565c5 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,19 @@ First [Download] the latest Mixxx manual source or clone the repository $ git clone https://github.com/mixxxdj/manual.git -Next, install the dependencies using pip. From within the repository root +Next, install the dependencies using [pip]. From within the repository root (type ```cd manual``` after typing the above command): $ pip install -r requirements.txt If you do not wish to use pip: -* [Install Sphinx], the documentation generator. *Note:* Version 1.3.1 seems to have a bug - with graphviz. We suggest using version 1.2.3 until this is resolved. +* [Install Sphinx], the documentation generator. * [Install Graphviz], graph visualization software (used to draw some diagrams) +To upgrade dependencies using pip: + + $ pip install -r requirements.txt --upgrade + If you'd like to build manual PDFs, you will need a functioning LaTeX installation. * On Mac, install [MacTeX]. * On Debian-based systems, install `texlive-fonts-recommended` and @@ -69,8 +72,8 @@ The Mixxx manual is translated using the [Transifex] web service for team transl ### Prerequisites -If you did not install requirements with `pip install -r requirements.txt` above -then you must manually install the following dependencies: +If you did **not** install requirements with `pip install -r requirements.txt` +above then you must manually install the following dependencies: * [sphinx-intl], a utility that makes it easy to translate and compile translations to Sphinx projects. @@ -78,17 +81,26 @@ then you must manually install the following dependencies: interface. The Python-based command line client makes it easy to fetch and push translations. - Install transifex-client on Linux and Mac OS X +**Install transifex-client on Linux and macOS** + + $ pip install transifex-client + +**Install transifex-client on Windows** + + The easiest way to install it is with pip: - `pip install transifex-client` + $ easy_install pip + $ pip install transifex-client - Install transifex-client on Windows + The first line installs pip on a system level. Then it installs the Transifex + Client using pip. - `http://files.transifex.com/transifex-client/0.11b3/tx.exe` + If you do not wish to use pip, download the latest releases from + https://github.com/transifex/transifex-client/releases - You will need to make a `.transifexrc` in your home directory with your - username and password to use the Transifex client. See - [transifex-configuration] for more details. +You will need to make a `.transifexrc` in your home directory with your +username and password to use the Transifex client. See +[transifex-configuration] for more details. ### Maintaining translations @@ -104,7 +116,7 @@ For every change to the manual source files (.rst) the source translation files the text of every English phrase in the manual in a common format used for translation. -Additionally, for every new source file added (i.e. new chapters or manaul +Additionally, for every new source file added (i.e. new chapters or manual pages) the Transifex configuration file (stored in `.tx/config`) needs updating. To do both of these, run: @@ -190,7 +202,7 @@ For more information on Translating with Sphinx, see [Sphinx i18n]. ### Editors with Restructured Text (reST) syntax highlighting -* Windows, Linux, Mac OSX : [Atom], [Sublime] +* Windows, Linux, Mac OSX : [Atom], [Visual Studio Code], [Sublime] * Linux: [Kate], [Retext] * Windows: [Intype] * Webapp: [Notex] @@ -200,6 +212,7 @@ For more information on Translating with Sphinx, see [Sphinx i18n]. Even more [reStructuredText] resources: +[pip]: https://pip.pypa.io/ [reStructuredText]: http://docutils.sourceforge.net/rst.html [Sphinx]: http://sphinx-doc.org [Install Sphinx]: http://sphinx-doc.org/latest/install.html @@ -208,9 +221,10 @@ Even more [reStructuredText] resources: [sphinx-intl]: https://pypi.python.org/pypi/sphinx-intl [Transifex]: https://www.transifex.com/organization/mixxx-dj-software/dashboard/mixxxdj-manual -[transifex-client]: http://docs.transifex.com/client/setup/ -[transifex-configuration]: http://docs.transifex.com/client/config/ +[transifex-client]: https://docs.transifex.com/client/installing-the-client +[transifex-configuration]: https://docs.transifex.com/client/client-configuration/ [Atom]: https://atom.io/ +[Visual Studio Code]: https://code.visualstudio.com/ [Sublime]: http://www.sublimetext.com [Kate]: http://kate-editor.org/ [Retext]: http://sourceforge.net/p/retext/ diff --git a/requirements.txt b/requirements.txt index 4ad366afbf..389ff7b923 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ fabric -sphinx==1.2.3 +sphinx sphinx-intl graphviz pycrypto diff --git a/source/_templates/layout.html b/source/_templates/layout.html index 957d4e7b3a..70d41b76bc 100644 --- a/source/_templates/layout.html +++ b/source/_templates/layout.html @@ -5,7 +5,7 @@ Master layout for Mixxx manual. Adapted from Basic theme. :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - :copyright: Copyright 2011 by the Mixxx Team + :copyright: Copyright 2011-2018 by the Mixxx Development Team :license: BSD, see LICENSE for details. #} {%- block doctype -%} diff --git a/source/chapters/advanced_topics.rst b/source/chapters/advanced_topics.rst index 3500d78b29..1811946be3 100644 --- a/source/chapters/advanced_topics.rst +++ b/source/chapters/advanced_topics.rst @@ -1,4 +1,3 @@ - .. include:: /shortcuts.rstext Advanced Topics @@ -17,7 +16,7 @@ file. This file tells Mixxx how to translate, or map, :term:`MIDI`/:term:`HID` messages from a controller into commands that Mixxx understands. You can download and share custom controller presets in the -`Mixxx User customizations forums `_. +`Mixxx User customizations forums `_. .. _advanced-controller-wizard: @@ -75,13 +74,13 @@ There are also some advanced options in the Midi Wizard you may need to use: The Controller wizard saves the new preset to the following file paths: * Linux: :file:`/home//.mixxx/controllers` -* Mac OS X: :file:`/Users//Library/Application\ Support/Mixxx/controllers` +* macOS: :file:`/Users//Library/Application\ Support/Mixxx/controllers` * Windows: :file:`%LOCALAPPDATA%\\Mixxx\\controllers` You can then modify the XML file it creates (or any of the ones that ship with Mixxx) if you'd like to fine-tune it or add more presets. For more information, go to -``_. +``_. The Controller Wizard works only for :term:`MIDI` devices. Currently you can't map modifier (shift) keys and platter rotations. Use :ref:`MIDI Scripting @@ -104,8 +103,8 @@ two or more Mixxx properties (“controls”), adjust incoming control values to work better with Mixxx (scratching), display a complex LED sequence, or even send messages to text displays on the controller. -For more information, go to ``_ -and ``_. +For more information, go to ``_ +and ``_. .. _advanced-keyboard: @@ -116,7 +115,7 @@ The :ref:`default keyboard mappings` are defined in a text file which can be found at the following location: * Linux: :file:`/usr/local/share/mixxx/keyboard/en_US.kbd.cfg` -* Mac OS X: :file:`/Applications/Mixxx.app/Contents/Resources/keyboard/en_US.kbd.cfg` +* macOS: :file:`/Applications/Mixxx.app/Contents/Resources/keyboard/en_US.kbd.cfg` * Windows: :file:`\\keyboard\\en_US.kbd.cfg` Depending on your system's language settings, Mixxx might use a different @@ -128,7 +127,7 @@ all your changes may be lost if you uninstall or upgrade Mixxx. Instead, copy the default mapping file to the following location: * Linux: :file:`~/.mixxx/Custom.kbd.cfg` -* Mac OS X: :file:`~/Library/Application\ Support/Mixxx/Custom.kbd.cfg` +* macOS: :file:`~/Library/Application\ Support/Mixxx/Custom.kbd.cfg` * Windows: :file:`%LOCALAPPDATA%\\Mixxx\\Custom.kbd.cfg` Then edit this file and save the changes. On the next startup, Mixxx will check @@ -137,24 +136,24 @@ mapping file. This has the advantage that you can always revert back to the default mapping by deleting :file:`Custom.kbd.cfg`. For a list of controls that can be used in a keyboard mapping, see -``_. +``_. You can download and share custom keyboard mappings in the -`Mixxx User customizations forums `_. +`Mixxx User customizations forums `_. .. _advanced-external-fx: Additional Effects via external Mixer Mode ========================================== -Mixxx comes with a set of :ref:`native effects `. +Mixxx comes with a set of :ref:`native effects `. Additionally, using the :ref:`external mixer mode ` you can route each deck directly to 3rd party effect hosts. The following examples are only intended to encourage experimentation, they are not definitive guidance. -Effects via AU Lab on Mac OS X +Effects via AU Lab on macOS ------------------------------- .. figure:: ../_static/Mixxx-111-external-fx-aulab-setup.png @@ -164,12 +163,12 @@ Effects via AU Lab on Mac OS X :alt: The Au Lab routing for external effects :figclass: pretty-figures - The Au Lab routing for external effects on Mac OS X + The Au Lab routing for external effects on macOS -On Mac OS X there is a simple and free way to give Mixxx access to the +On macOS there is a simple and free way to give Mixxx access to the collection of AU/VST/MAS plugins that are installed on your system. -* Install the free `Soundflower `_, +* Install the free `Soundflower `_, a system extension for inter-application audio routing. * Download AU Lab.app standalone from Apple (you will need an free Apple Developer Login though), go to the @@ -233,9 +232,9 @@ The library file is stored in the following places depending on your To delete your library on Windows, delete the :file:`mixxxdb.sqlite` file in this folder. -**Mac OS X** +**macOS** The Mixxx library is stored in the :file:`Library/Application Support/Mixxx` - folder in your home directory. To delete your library on Mac OS X type the + folder in your home directory. To delete your library on macOS type the following command into a terminal: :: rm ~/Library/Application\ Support/Mixxx/mixxxdb.sqlite diff --git a/source/chapters/appendix.rst b/source/chapters/appendix.rst index f3756a2976..4a8b7ea5b4 100644 --- a/source/chapters/appendix.rst +++ b/source/chapters/appendix.rst @@ -1,3 +1,4 @@ +.. include:: /shortcuts.rstext Appendix ******** @@ -12,20 +13,20 @@ Got questions? Need more information? Want to :ref:`contribute `? There are a variety of other resources where you can find out more: * **Mixxx Website**: For general information and updates, as well as the latest - news on Mixxx, go to: ``_ + news on Mixxx, go to: ``_ * **Mixxx Wiki**: For up-to-date information about supported DJ hardware, documentation on making controller mappings, and other tips and tricks, go to: ``_ * **Mixxx Community Forums**: To search for answers, post your question or - answer other DJ's questions, go to: ``_ + answer other DJ's questions, go to: ``_ + +* **Mixxx Zulip Chat**: Hang out with Mixxx developers and users on our + `Zulip chat `_. Stand-alone + `apps for Zulip `_ can be configured to use the + server ``mixxx.zulipchat.com``. -* **Mixxx Zulip Chat**: Hang out with Mixxx developers and users on our - `Zulip chat `_. Stand-alone - `apps for Zulip `_ can be configured to use the - server mixxx.zulipchat.com - * **Mixxx Source Code**: To download the source code for Mixxx, go to: ``_ @@ -34,7 +35,7 @@ There are a variety of other resources where you can find out more: * **Mixxx Translations**: To translate Mixxx and promote your mother tongue, go to: ``_ . Please - read the `Translation FAQ `_ + read the `Translation FAQ `_ first. * **Social Media**: Follow us on `Twitter `_ , @@ -50,13 +51,6 @@ Shortcuts let you work more efficiently. This table lists the default keyboard shortcuts for accessing Mixxx with an English keyboard layout. Depending on your language settings the defaults may be different. -.. versionadded:: 2.0 - *Passthrough*, *Vinylcontrol Mode*, *Vinylcontrol Cueing*, and - *Single Deck Vinylcontrol Toggle* shortcuts - -.. versionchanged:: 2.0 - *Auto DJ* shortcuts, :kbd:`Esc` key exit search and leave focus - +----------------------------------------+---------------------+---------------------+--------------+ | Function | Deck 1 | Deck 2 | Master | +========================================+=====================+=====================+==============+ @@ -207,14 +201,6 @@ Application shortcuts Use these shortcuts to access features available in the menu on top of the application window. -.. versionadded:: 2.0 - Added *Show Effect Rack*, *Maximize Library*, and *Show Cover Art* shortcuts. - Added a :guilabel:`Developer Tools` option to the :guilabel:`Developer` menu - which provides various useful debugging tools. - -.. versionchanged:: 2.0 - Shortcuts for *Enable Vinyl Control 1-4*. - ======================================== ================================ Function Key ======================================== ================================ @@ -248,7 +234,7 @@ Maximize Library Space ---------------------------------------- -------------------------------- Full Screen (Windows & Linux) F11 ---------------------------------------- -------------------------------- -Full Screen (Mac OS X) Shift + Command + F +Full Screen (macOS) Shift + Command + F ---------------------------------------- -------------------------------- **Options menu** -------------------------------------------------------------------------- @@ -268,7 +254,7 @@ Enable Keyboard Shortcuts Ctrl + \` ---------------------------------------- -------------------------------- Open Preferences (Windows & Linux) Ctrl + P ---------------------------------------- -------------------------------- -Open Preferences (Mac OS X) Ctrl + , +Open Preferences (macOS) Ctrl + , ---------------------------------------- -------------------------------- Exit Mixxx Ctrl + Q ---------------------------------------- -------------------------------- @@ -286,8 +272,8 @@ Debugger Enabled Ctrl + Shift + D ======================================== ================================ .. hint:: The :kbd:`Ctrl` key on Windows & Linux is equivalent to the - :kbd:`Command` key on Mac OS X. The :kbd:`Alt` key on Windows & Linux - is equivalent to the :kbd:`Option` key on Mac OS X. Application + :kbd:`Command` key on macOS. The :kbd:`Alt` key on Windows & Linux + is equivalent to the :kbd:`Option` key on macOS. Application shortcuts are not customizable. .. note:: The Developer menu is available if Mixxx is started using the @@ -302,22 +288,23 @@ Mixxx is designed to be as user-friendly as possible. As such, its command line options are only useful for development or debugging, as they make these tasks easier. Command line options are case-sensitive. -.. versionadded:: 2.0 +.. versionadded:: 2.1.0 + + * ``--debugAssertBreak`` option + * ``--logLevel`` option + * ``--logFlushLevel`` option - * Show debug tooltips - * Provide extra skins when developer mode is enabled. - * Adds the debugger during skin parsing in ``--developer`` mode - * Adds "Enable Base" and "Enable Experiment" option in ``--developer`` mode - * Added ``--safeMode`` option. +.. versionchanged:: 2.1.0 + + * ``--controllerDebug`` option also prints outgoing MIDI messages ====================== ================================================= Option Description ====================== ================================================= [FILE] Load the specified music file(s) at start-up. Each file you specify will be loaded into the - next virtual deck. Supported file types: mp3, ogg, - aiff, aif, wav, flac, and optional unprotected - aac (m4a) + next virtual deck. For a list of supported file + types, go to :ref:`configuration-import` ---------------------- ------------------------------------------------- --resourcePath PATH Top-level directory where Mixxx should look for its resource files such as MIDI mappings, @@ -332,7 +319,8 @@ Option Description database and preferences configuration file. ---------------------- ------------------------------------------------- --controllerDebug Causes Mixxx to display/log all controller data - it receives and script functions it loads. + it sends and receives, and script functions it + loads. ---------------------- ------------------------------------------------- --developer Enables developer-mode. Includes extra log info, stats on performance, a Developer tools menu, @@ -350,10 +338,31 @@ Option Description * Doesn't open controllers by default ---------------------- ------------------------------------------------- --locale LOCALE Use a custom locale for loading translations - (e.g 'fr') + (e.g ``fr``) ---------------------- ------------------------------------------------- -f, --fullScreen Starts Mixxx in full-screen mode ---------------------- ------------------------------------------------- +--logLevel LEVEL Sets the verbosity of command line logging + + * ``critical`` - Critical/Fatal only + * ``warning`` - Above + Warnings + * ``info`` - Above + Informational messages + * ``debug`` - Above + Debug/Developer messages + * ``trace`` - Above + Profiling messages +---------------------- ------------------------------------------------- +--logFlushLevel LEVEL Sets the the logging level at which the log buffer + is flushed to ``mixxx.log``. + LEVEL is one of the values defined at ``--logLevel`` + above. +---------------------- ------------------------------------------------- +--debugAssertBreak Breaks (SIGINT) Mixxx, if a DEBUG_ASSERT evaluates + to false. Under a debugger you can continue + afterwards. This will also avoid to switch the + MIXXX_DEBUG_ASSERTIONS_FATAL flag which leads to + a time consuming full rebuild. Now the + MIXXX_DEBUG_ASSERTIONS_FATAL is only respected if + ``--debugAssertBreak`` is not passed. +---------------------- ------------------------------------------------- -h, --help Display this help message and exit ====================== ================================================= @@ -370,15 +379,13 @@ terminal and hit return: :: Experiment modes for rapid development and testing --------------------------------------------------- -.. versionadded:: 2.0 - * Adds a static Experiment class with a tri-state mode flag that indicates whether the experiment mode is OFF, BASE, or EXPERIMENT. - * Adds :menuselection:`Developer-->Stats:Experiment Bucket` and - :menuselection:`Developer-->Stats:Base Bucket`. Each one toggles between OFF - and BASE/EXPERIMENT so you can choose exactly what time spans you would like - to collect in your base and experiment buckets. + * Adds :menuselection:`Developer --> Stats:Experiment Bucket` and + :menuselection:`Developer --> Stats:Base Bucket`. Each one toggles between + OFF and BASE/EXPERIMENT so you can choose exactly what time spans you would + like to collect in your base and experiment buckets. * Updates StatsManager to segment collected stats into a base and experiment bucket. This allows you to quickly measure the difference a code change has @@ -419,49 +426,5 @@ Version History For a full list of new features and bugfixes, go to: `https://launchpad.net/mixxx/2.0 `_. -**v1.11.0** (2013-05-09) - - * Completely revamped Waveforms - * Direct :term:`HID` controller support - * Point & Click Controller Mapping - * Next Generation Beat Detection - * Library History Feature - * Improved AutoDJ - * Beatloop Rolls - * Preview Deck - * Advanced Search - * New and Improved User Manual - * New Controller Support - -For a full list of new features and bugfixes, go to: -`https://launchpad.net/mixxx/1.11.0 `_. - -**v1.10.1** (2012-06-30) - - * Bugfixes - -For a full list of bugfixes, go to: -`https://launchpad.net/mixxx/1.10.1 `_. - -**v1.10.0** (2011-12-25) - - * Rewritten and Improved Vinyl Control Support - * 4 Sampler Decks - * Quantized Loops, Hotcues and Beatloops - * Phase Synchronization - * Beatgrid Adjust Feature - * Microphone Support - * Spinning Turntable Widgets and Waveform Scratching - * M4A Support for Windows Vista and Windows 7 users - * Brand New and Updated Skins - * Accessibility Improvements - * Limited Support for Internationalization - * Revamped and Rewritten User Manual - * Mixing engine improvements - * Updated MIDI Mappings - -For a full list of new features and bugfixes, go to: -`https://launchpad.net/mixxx/1.10.0 `_. - .. seealso:: For an overview of previous versions, `take a look `_ at the timeline. diff --git a/source/chapters/controlling_mixxx.rst b/source/chapters/controlling_mixxx.rst index 854d934464..006c2f20d4 100644 --- a/source/chapters/controlling_mixxx.rst +++ b/source/chapters/controlling_mixxx.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _controlling mixxx: Controlling Mixxx @@ -149,9 +151,9 @@ or :term:`IRC` channel. Device support varies for each supported :term:`OS up-to-date information about which controllers work with Mixxx and the details of each. -.. _Hardware Compatibility wiki page: http://www.mixxx.org/wiki/doku.php/hardware_compatibility +.. _Hardware Compatibility wiki page: https://mixxx.org/wiki/doku.php/hardware_compatibility .. _Bug Tracker: https://bugs.launchpad.net/mixxx -.. _Controller presets forum: http://mixxx.org/forums/viewforum.php?f=7 +.. _Controller presets forum: https://mixxx.org/forums/viewforum.php?f=7 Installing a preset from the forum ---------------------------------- @@ -163,7 +165,7 @@ folder, go to :menuselection:`Preferences --> Controllers` and click the folder in your :term:`OS ` file browser: * GNU/Linux: :file:`/home//.mixxx/controllers` - * OS X: :file:`/Users//Library/Application Support/Mixxx/controllers` + * macOS: :file:`/Users//Library/Application Support/Mixxx/controllers` * Windows Vista and newer: :file:`C:\\Users\\\\AppData\\Mixxx\\controllers` * Windows XP: :file:`C:\\Documents and Settings\\\\AppData\\controllers` diff --git a/source/chapters/djing_with_mixxx.rst b/source/chapters/djing_with_mixxx.rst index d8f18c0a03..7f30e55dd8 100644 --- a/source/chapters/djing_with_mixxx.rst +++ b/source/chapters/djing_with_mixxx.rst @@ -134,8 +134,6 @@ appropriate direction. Master Sync =========== -.. versionadded:: 2.0 - :term:`Master Sync` is an intelligent assistant that allows you to leave the beatmatching to Mixxx so you can focus on track selection, effects manipulation, looping, 4 deck mixing, and other advanced DJing techniques. @@ -166,9 +164,9 @@ Harmonic Mixing Harmonic mixing is a technique to mix songs with matching melodies and harmonies. To learn more about harmonic mixing you might want to check out `the -mixshare site`_. +mixshare archive`_. -.. _the mixshare site: http://www.mixshare.com/wiki/doku.php?id=harmonic_mixing +.. _the mixshare archive: https://web.archive.org/web/20161123191234/http://www.mixshare.com/wiki/doku.php?id=harmonic_mixing Mixxx has two features to help you with harmonic mixing. The first is a :term:`key lock`. When it is active changing the speed of a track won't affect @@ -188,10 +186,11 @@ Recording Your Mix With the integrated recording feature you can record your mix as an audio file and listen to it later, distribute it as a :term:`Podcast` or burn it to CD. -By default, Mixxx records the Master output. Alternatively, Mixxx can record -the output of an external mixer if you have an audio interface configured for -the :guilabel:`Record/Broadcast` input in :menuselection:`Preferences --> Sound -Hardware`. Refer to :ref:`microphones-record-broadcast-external-mixer` for + +By default, Mixxx records the Master output. Alternatively, Mixxx can record +the output of an external mixer if you have an audio interface configured for +the :guilabel:`Record/Broadcast` input in :menuselection:`Preferences --> Sound +Hardware`. Refer to :ref:`microphones-record-broadcast-external-mixer` for details. .. figure:: ../_static/Mixxx-111-Library-Recordings.png @@ -223,8 +222,17 @@ choose to create them in the preferences. Record your mix to disk ----------------------- -.. versionadded:: 2.0 - Displays the duration of the recording. +.. versionadded:: 2.1 + + Added recording widget to toggle a recording session. + +Click on the recording icon on top of the application window to start, +and stop the recording session. The duration of the running recording is +displayed next to the icon. + +.. note:: The recording widget might not be available in some skins. + +Alternatively: * Click on the *Recordings* icon in the sidebar to switch to the :guilabel:`Recordings` view @@ -257,9 +265,6 @@ Using Auto DJ For Automatic Mixing Mixxx library - Auto DJ view -.. versionadded:: 2.0 - Add random tracks from Auto DJ track sources - Auto DJ allows you to automatically load tracks from the Auto DJ playlist when the current track is nearly finished, and crossfade into it. See :ref:`library-auto-dj`. diff --git a/source/chapters/effects.rst b/source/chapters/effects.rst index 47a09d073d..464615fe6a 100644 --- a/source/chapters/effects.rst +++ b/source/chapters/effects.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _effects: Effects diff --git a/source/chapters/example_setups.rst b/source/chapters/example_setups.rst index 784beaf0f3..e94c24b7e6 100644 --- a/source/chapters/example_setups.rst +++ b/source/chapters/example_setups.rst @@ -1,43 +1,44 @@ +.. include:: /shortcuts.rstext + .. _setup: Example Setups ************** -This chapter presents some example hardware setups with instructions for how to +This chapter presents some example hardware setups with instructions for how to configure Mixxx to work with them. -.. seealso:: * :ref:`hardware`: background information about different types of +.. seealso:: * :ref:`hardware`: background information about different types of equipment. - * :ref:`getting-started-sound-io`: details about each available + * :ref:`getting-started-sound-io`: details about each available input and output option. - * :ref:`microphones`: details for configuring Mixxx to work with + * :ref:`microphones`: details for configuring Mixxx to work with microphones. - * `DJ Hardware Guide - `_: - lists specific devices with information about their prices, + * `DJ Hardware Guide + `_ + lists specific devices with information about their prices, features, and compatibility with Mixxx. - .. _setup-laptop-only: Computer Only ============= -The built-in audio interface on most computers comes with a single stereo +The built-in audio interface on most computers comes with a single stereo line-out and a microphone input. This can be set up with Mixxx in two ways: Practicing Mixing / Broadcasting -------------------------------- -This setup can be used with a single audio output for speakers or headphones to -practice DJing without investing in any equipment other than a computer and a -set of speakers or headphones. With this configuration, use the :ref:`Pre/Main -Knob ` to switch back and forth between the Master mix -and :term:`PFL` signal. This setup cannot be used to play for a live audience -because the Master mix is not sent to an audio interface output. However, it can -be used by radio DJs who only need to send the Master mix to a broadcast +This setup can be used with a single audio output for speakers or headphones to +practice DJing without investing in any equipment other than a computer and a +set of speakers or headphones. With this configuration, use the :ref:`Pre/Main +Knob ` to switch back and forth between the Master mix +and :term:`PFL` signal. This setup cannot be used to play for a live audience +because the Master mix is not sent to an audio interface output. However, it can +be used by radio DJs who only need to send the Master mix to a broadcast audience. #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab -#. From the :guilabel:`Headphones` drop-down menu, select your built-in audio +#. From the :guilabel:`Headphones` drop-down menu, select your built-in audio interface, then :guilabel:`Channels 1-2`. Although this is labeled :guilabel:`Headphones`, you can also plug speakers into the output jack of your computer. @@ -45,7 +46,7 @@ audience. :ref:`microphone ` a. Use your built-in microphone or connect a microphone to your computer - b. Check that your microphone is detected by your :term:`OS ` c. Open the :guilabel:`Input` tab d. From the :guilabel:`Microphone` drop-down menu, select the input your @@ -67,13 +68,13 @@ This setup allows for playing to an audience without headphone :term:`cueing`. #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab -#. From the :guilabel:`Master` drop-down menu, select your built-in audio +#. From the :guilabel:`Master` drop-down menu, select your built-in audio interface, then :guilabel:`Channels 1-2` #. Depending on your audio interface, you can specify a :ref:`microphone ` a. Use your built-in microphone or connect a microphone to your computer - b. Check that your microphone is detected by your :term:`OS ` c. Open the :guilabel:`Input` tab d. From the :guilabel:`Microphone` drop-down menu, select the input your @@ -93,16 +94,16 @@ Laptop and Splitter Cable :alt: Using Mixxx with your built-in sound card and a DJ splitter cable :figclass: pretty-figures -The cheapest way to DJ and :term:`cue` with headphones uses a stereo-to-mono DJ -splitter cable (also known as a “Y cable”) plugged into the headphone jack of a -laptop or other computer. This cable divides the stereo output from a single +The cheapest way to DJ and :term:`cue` with headphones uses a stereo-to-mono DJ +splitter cable (also known as a “Y cable”) plugged into the headphone jack of a +laptop or other computer. This cable divides the stereo output from a single jack into two separate mono singals. -This setup allows you to start DJing without having to invest in expensive -equipment. However, because the signals are in mono, you and your audience will -not be able to enjoy music producers' positioning of sound in space (although -many club PA systems are wired in mono anyway). Furthermore, audio interfaces -built into computers are usually low quality and often pick up interface from +This setup allows you to start DJing without having to invest in expensive +equipment. However, because the signals are in mono, you and your audience will +not be able to enjoy music producers' positioning of sound in space (although +many club PA systems are wired in mono anyway). Furthermore, audio interfaces +built into computers are usually low quality and often pick up interface from other components of the computer. **Using a built-in audio interface and a stereo-to-mono splitter** @@ -110,11 +111,11 @@ other components of the computer. #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab #. Check that your headphones are plugged into the side of the cable with a - headphones symbol and that the speakers are plugged into the side of the + headphones symbol and that the speakers are plugged into the side of the cable with a speaker symbol. -#. From the :guilabel:`Master` drop-down menu, select your built-in audio +#. From the :guilabel:`Master` drop-down menu, select your built-in audio interface, then :guilabel:`Channel 1` -#. From the :guilabel:`Headphones` drop-down menu, select your built-in +#. From the :guilabel:`Headphones` drop-down menu, select your built-in audio interface, then :guilabel:`Channel 2` #. Click :guilabel:`Apply` to save the changes. @@ -144,7 +145,7 @@ Laptop and External USB Audio Interface #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab -#. From the :guilabel:`Master` drop-down menu, select the external audio +#. From the :guilabel:`Master` drop-down menu, select the external audio interface, then :guilabel:`Channels 1-2` #. From the :guilabel:`Headphones` drop-down menu, select the built-in audio interface, then :guilabel:`Channels 1-2` @@ -153,7 +154,7 @@ Laptop and External USB Audio Interface #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab -#. From the :guilabel:`Master` drop-down menu, select the external +#. From the :guilabel:`Master` drop-down menu, select the external audio interface, then :guilabel:`Channels 1-2` #. From the :guilabel:`Headphones` drop-down menu, select the external audio interface, then :guilabel:`Channels 3-4` @@ -177,7 +178,7 @@ A setup with this kind of controller may look like the diagram below: :align: center :width: 75% :figwidth: 100% - :alt: Using Mixxx together with a DJ controller and integrated audio + :alt: Using Mixxx together with a DJ controller and integrated audio interface :figclass: pretty-figures @@ -196,7 +197,7 @@ A setup with this kind of controller may look like the diagram below: Controllers without an integrated audio interface ------------------------------------------------- -Controllers without an integrated audio interface can be used together with a +Controllers without an integrated audio interface can be used together with a USB audio interface as depicted in the diagram below: .. figure:: ../_static/mixxx_setup_midi_with_ext_audio_interface.png @@ -207,12 +208,12 @@ USB audio interface as depicted in the diagram below: :figclass: pretty-figures Using Mixxx together with a DJ controller and external audio interface - + **Using a controller without an integrated audio interface** #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Output` tab -#. From the :guilabel:`Master` drop-down menu, select the external audio +#. From the :guilabel:`Master` drop-down menu, select the external audio interface, then :guilabel:`Channels 1-2` #. From the :guilabel:`Headphones` drop-down menu, select the built-in audio interface, then :guilabel:`Channels 1-2` @@ -236,10 +237,10 @@ Laptop, External Hardware Mixer and Vinyl Control Using Mixxx together with turntables and external mixer -This setup allows DJs to use the techniques of DJing with vinyl record -turntables combined with the portability and flexibility of a laptop computer. -Instead of carrying crates of records or CDs, DJs can carry their entire music -collection on their laptop. In addition to a laptop and headphones, this setup +This setup allows DJs to use the techniques of DJing with vinyl record +turntables combined with the portability and flexibility of a laptop computer. +Instead of carrying crates of records or CDs, DJs can carry their entire music +collection on their laptop. In addition to a laptop and headphones, this setup requires an audio interface with at least two pairs of stereo inputs and outputs as well as a pair of :term:`timecode` records. diff --git a/source/chapters/getting_involved.rst b/source/chapters/getting_involved.rst index 68418c6600..8388ea548b 100644 --- a/source/chapters/getting_involved.rst +++ b/source/chapters/getting_involved.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _contributing: Contributing to the Project @@ -14,19 +16,19 @@ contribute**. As a non-developer ================== -* `Donate `_ to Mixxx using Paypal to help +* `Donate `_ to Mixxx using Paypal to help support and enhance development. -* `Make skins `_ +* `Make skins `_ * `Make MIDI mappings - `_ for + `_ for your controller * `Report bugs `_ -* Update our `Wiki `_ to make sure the +* Update our `Wiki `_ to make sure the information on it is up to date. * Translate Mixxx using `Transifex `_ * Answer questions on the `Troubleshooting Forum - `_ and the `Launchpad Answers page + `_ and the `Launchpad Answers page `_ * Help promote Mixxx: If you've got a blog, write an article about Mixxx. Blog about our new releases when they come out. Any exposure on the web and in @@ -39,24 +41,25 @@ As a software developer * You don't have to know C++. There are developers who got into Mixxx development while learning C++ along the way. * Join our mailing list: `mixxx-devel - `_ -* Join our :term:`IRC` channel, #mixxx on `Freenode `_ -* Tell us your ideas! Email us, talk on IRC, file wishlist :term:`bugs `, or post on the forums. + `_ +* Join our `Zulip chat `_. +* Tell us your ideas! Email us, talk on :term:`Zulip`, file wishlist + :term:`bugs `, or post on the forums. * Register an account on our development platform `Github `_ and fork our code. - See `Using Git for Mixxx Development `_ + See `Using Git for Mixxx Development `_ * Join the `Mixxx Development Team `_ on Launchpad. * Get familiar with the code. Pick a bug off of the `Easy Bug List `_ -* Get help fixing the bug on IRC, talk to us about the best way to do it. +* Get help fixing the bug on :term:`Zulip`, talk to us about the best way to do + it. **Contributing to Mixxx in 3 Easy Steps:** #. Pick a bug off of the `Easy Bug List `_ -#. Talk to us on IRC for help on how to fix it. +#. Talk to us on :term:`Zulip` for help on how to fix it. #. Fix it! *Done!* Your name will now be on the `Mixxx contributor list - `_. + `_. diff --git a/source/chapters/getting_started.rst b/source/chapters/getting_started.rst index e304751173..a39a8d65fc 100644 --- a/source/chapters/getting_started.rst +++ b/source/chapters/getting_started.rst @@ -24,9 +24,9 @@ Mixxx and importing your music to the Mixxx library. Click the Mixxx icon in the applications menu or launcher of your desktop environment or perform a search for :file:`mixxx`. Alternatively type :command:`mixxx` into the terminal, then hit :kbd:`Return`. - If your :term:`audio interface` is not accessible from Mixxx because it is - used by other applications via PulseAudio, you may close and restart Mixxx - using :command:`pasuspender mixxx`. See :ref:`appendix-command-line-options` + If your :term:`audio interface` is not accessible from Mixxx because it is + used by other applications via PulseAudio, you may close and restart Mixxx + using :command:`pasuspender mixxx`. See :ref:`appendix-command-line-options` for an overview of Mixxx's command line options. .. _getting-started-import-audio-files: @@ -52,7 +52,7 @@ are typically held, but you can select any location on your computer. Click :guilabel:`Select Folder` and Mixxx will scan your music library. Depending on the size of your library this could take some time. All the -supported music files Mixxx detects will be listed in the :ref:`library-root`. +supported music files Mixxx detects will be listed in the :ref:`library-tracks`. If you want to refresh your library (for example because you added or moved files), you can do this with :menuselection:`Library --> Rescan Library` in @@ -80,10 +80,10 @@ analysis takes considerable CPU power and might cause skips in the audio --- things you surely don't need while performing. Once you have -:ref:`imported your music library`, press -:guilabel:`OK` on the Preferences window. Go to the Analyze view on the left -side panel of the library. This allows you to run :term:`beatgrid`, -:term:`key`, and :term:`ReplayGain` detection on tracks in advance. While +:ref:`imported your music library`, press +:guilabel:`OK` on the Preferences window. Go to the Analyze view on the left +side panel of the library. This allows you to run :term:`beatgrid`, +:term:`key`, and :term:`ReplayGain` detection on tracks in advance. While analyzing, the progress in percentage and total queue length are shown. .. seealso:: For more information, go to :ref:`configuration-bpm-detection`. @@ -94,7 +94,7 @@ Configuring sound input and output ================================== Before you can start using Mixxx, you need to configure Mixxx to use your -sound hardware in :menuselection:`Preferences --> Sound Hardware`. You do not +sound hardware in :menuselection:`Preferences --> Sound Hardware`. You do not need to configure all inputs and outputs. The :ref:`hardware` chapter explains different types of DJ hardware and how to @@ -116,8 +116,8 @@ Output Options **Internal mixing**: -Use these outputs if you are not using an :ref:`external hardware mixer -`. If you are using a controller with a built-in audio +Use these outputs if you are not using an :ref:`external hardware mixer +`. If you are using a controller with a built-in audio interface, use these outputs. * *Master*: all decks, samplers, microphones, and auxiliary inputs mixed @@ -145,14 +145,14 @@ using a controller with a built in audio interface, use these inputs. **External mixing**: * *Record/Broadcast*: When this is configured, Mixxx will record and - broadcast from this audio interface input instead of the internal master - mix. If you have a microphone plugged into the mixer, do not configure the + broadcast from this audio interface input instead of the internal master + mix. If you have a microphone plugged into the mixer, do not configure the Microphone 1-4 inputs. **Either internal or external mixing**: * *Vinyl Control 1-4*: timecode input from turntables or CDJs for manipulating decks 1-4 - + .. seealso:: :ref:`microphones` diff --git a/source/chapters/hardware.rst b/source/chapters/hardware.rst index a0cbff4216..56e9239ae3 100644 --- a/source/chapters/hardware.rst +++ b/source/chapters/hardware.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _hardware: DJ Hardware @@ -8,63 +10,63 @@ DJ Hardware S.Brandt Be -Although Mixxx can be used with just a laptop or desktop computer, fully taking -advantage of Mixxx's features requires specialized DJ hardware. Depending on -your budget and application area, your setup and requirements may vary. This -chapter provides general background information about various types of DJ +Although Mixxx can be used with just a laptop or desktop computer, fully taking +advantage of Mixxx's features requires specialized DJ hardware. Depending on +your budget and application area, your setup and requirements may vary. This +chapter provides general background information about various types of DJ hardware. -.. seealso:: The `Mixxx DJ Hardware Guide - `_ lists - specific devices with information about their prices, +.. seealso:: The `Mixxx DJ Hardware Guide + `_ lists + specific devices with information about their prices, features, and compatibility with Mixxx. .. _hardware-controllers: Controllers =========== -DJ controllers are devices with knobs, faders, buttons, and jog wheels to -control DJ software such as Mixxx. Controllers allow quick access to different -controls while providing tactile and visual feedback indicating the state of -each control, such as the position of a knob or whether a switch is on or off. -This allows you to focus on manipulating the music without needing to look at -your computer screen all the time. Controllers also allow using two hands to -manipulate two different controls at the same time, which is required for many +DJ controllers are devices with knobs, faders, buttons, and jog wheels to +control DJ software such as Mixxx. Controllers allow quick access to different +controls while providing tactile and visual feedback indicating the state of +each control, such as the position of a knob or whether a switch is on or off. +This allows you to focus on manipulating the music without needing to look at +your computer screen all the time. Controllers also allow using two hands to +manipulate two different controls at the same time, which is required for many mixing techniques. DJ controllers typically do not do any actual audio processing. Instead, they send signals (typically :term:`MIDI` or :term:`HID` over a USB cable) to the -computer to instruct DJ software how to manipulate the audio. Many DJ -controllers include an :ref:`audio interface ` with -2 separate stereo outputs built into the device. This allows the DJ to -transport and setup only one piece of hardware in addition to a laptop. Some -devices can be used as both a controller and :ref:`hardware mixer +computer to instruct DJ software how to manipulate the audio. Many DJ +controllers include an :ref:`audio interface ` with +2 separate stereo outputs built into the device. This allows the DJ to +transport and setup only one piece of hardware in addition to a laptop. Some +devices can be used as both a controller and :ref:`hardware mixer `. -Mixxx can work with any :term:`MIDI` or :term:`HID` :term:`controller` as long -as there is a mapping file to tell Mixxx how to understand the controller's -signals. Mixxx comes bundled with a number of MIDI and HID mapping presets, -which are listed in the `Mixxx DJ Hardware Guide -`_ on the wiki. For -controllers that Mixxx does not yet support, you can `search the forum -`_ to see if anyone has +Mixxx can work with any :term:`MIDI` or :term:`HID` :term:`controller` as long +as there is a mapping file to tell Mixxx how to understand the controller's +signals. Mixxx comes bundled with a number of MIDI and HID mapping presets, +which are listed in the `Mixxx DJ Hardware Guide +`_ on the wiki. For +controllers that Mixxx does not yet support, you can `search the forum +`_ to see if anyone has started a mapping. You can also start one yourself using the information in the -`Controller Mapping Documentation -`_ +`Controller Mapping Documentation +`_ on the wiki. -.. seealso:: :ref:`control-midi` describes how to configure Mixxx to use +.. seealso:: :ref:`control-midi` describes how to configure Mixxx to use controllers. .. _hardware-audio-interfaces: Audio Interfaces ================ -An audio interface (also known as a "sound card", although few of them are -shaped like cards anymore) is a device that allows a computer to send output to -and receive input from audio equipment. Whether using :ref:`internal or -external mixing `, it is recommended to use a single -audio interface with at least 4 independent output channels (2 separate stereo +An audio interface (also known as a "sound card", although few of them are +shaped like cards anymore) is a device that allows a computer to send output to +and receive input from audio equipment. Whether using :ref:`internal or +external mixing `, it is recommended to use a single +audio interface with at least 4 independent output channels (2 separate stereo pairs). The headphone jack on most laptops is not a second audio output. Rather, @@ -78,127 +80,127 @@ in stereo by your audience. Unlike some proprietary DJ systems, Mixxx can use any audio interface and any :term:`MIDI` or :term:`HID` controller that your :term:`OS ` -has drivers to use. If your controller has an integrated audio interface, you -may choose to use a different audio interface for higher quality audio. Mixxx +has drivers to use. If your controller has an integrated audio interface, you +may choose to use a different audio interface for higher quality audio. Mixxx can also use multiple audio interfaces simultaneously. Audio Interface Considerations ------------------------------ -This section provides background information to help you choose an audio +This section provides background information to help you choose an audio interface to use with Mixxx. Bit Depth and Sample Rate ^^^^^^^^^^^^^^^^^^^^^^^^^ -Most music is published with a bit depth of 16 bits at a sample rate of 44.1 -kHz because this is all that is needed to store all the detail of music in +Most music is published with a bit depth of 16 bits at a sample rate of 44.1 +kHz because this is all that is needed to store all the detail of music in digital form. -Bit depth determines the possible dynamic range of the signal. 16 bits is more -than enough for playing back music. While 24 bits is helpful for recording, -`it is useless for playback +Bit depth determines the possible dynamic range of the signal. 16 bits is more +than enough for playing back music. While 24 bits is helpful for recording, +`it is useless for playback `_. -Half the sample rate determines the maximum frequency that can be represented -by the signal. Humans generally can't hear frequencies above 20 kHz, so a -sampling rate of 44.1 kHz, representing a maximum frequency of 22.05 kHz, is -fine for playback. Higher sample rates like 88.2 kHz and 96 kHz can be helpful -to reduce aliasing distortion when recording, but have no benefit for playback +Half the sample rate determines the maximum frequency that can be represented +by the signal. Humans generally can't hear frequencies above 20 kHz, so a +sampling rate of 44.1 kHz, representing a maximum frequency of 22.05 kHz, is +fine for playback. Higher sample rates like 88.2 kHz and 96 kHz can be helpful +to reduce aliasing distortion when recording, but have no benefit for playback and make your computer work harder. -For a more thorough and technical explanation of why 16 bits at 44.1 kHz is all -that is needed for playback, read `24/192 Music Downloads Are Very Silly Indeed -`_. +For a more thorough and technical explanation of why 16 bits at 44.1 kHz is all +that is needed for playback, read `24/192 Music Downloads Are Very Silly Indeed +`_. Specifications ^^^^^^^^^^^^^^ -When considering specifications, higher dynamic range, higher signal-to-noise -ratio (SNR), higher maximum output level, lower THD+N (Total Harmonic -Distortion + Noise; look for a more negative dB value or smaller percentage), -and lower crosstalk (more negative dB value) are better. Cheap audio interfaces +When considering specifications, higher dynamic range, higher signal-to-noise +ratio (SNR), higher maximum output level, lower THD+N (Total Harmonic +Distortion + Noise; look for a more negative dB value or smaller percentage), +and lower crosstalk (more negative dB value) are better. Cheap audio interfaces tend to not have these specifications published. Connector and Cable Types ^^^^^^^^^^^^^^^^^^^^^^^^^ -If you are unfamiliar with professional audio equipment, read Digital DJ Tips' -`Essential Guide to Audio Cables for DJs +If you are unfamiliar with professional audio equipment, read Digital DJ Tips' +`Essential Guide to Audio Cables for DJs `_ -to understand the different kinds of connectors on audio interfaces. It -is better to use an audio interface with balanced outputs, especially if you -will run long cables directly into an amplifier or active speakers without -going through a :ref:`hardware mixer `. Balanced signals -reject interference and are less susceptible to ground loop hum issues (which +to understand the different kinds of connectors on audio interfaces. It +is better to use an audio interface with balanced outputs, especially if you +will run long cables directly into an amplifier or active speakers without +going through a :ref:`hardware mixer `. Balanced signals +reject interference and are less susceptible to ground loop hum issues (which can be a problem when plugging unbalanced gear into separate power sources). -However, most venues have DJs plug into :ref:`hardware DJ mixers -`, which typically only have RCA inputs (RCA cables cannot be -balanced). Most home/computer speakers and amplifiers have RCA and/or 1/8" TRS -stereo inputs. Most live sound mixers have balanced 1/4" TRS mono inputs. If -you need to interconnect balanced and unbalanced gear, refer to this `guide -from Presonus `_ and +However, most venues have DJs plug into :ref:`hardware DJ mixers +`, which typically only have RCA inputs (RCA cables cannot be +balanced). Most home/computer speakers and amplifiers have RCA and/or 1/8" TRS +stereo inputs. Most live sound mixers have balanced 1/4" TRS mono inputs. If +you need to interconnect balanced and unbalanced gear, refer to this `guide +from Presonus `_ and this `guide from Rane `_. Number of Channels ^^^^^^^^^^^^^^^^^^^ -Audio interfaces sometimes have multiple connectors for a single channel, -resulting in more connectors than channels. So, not every connector can send or -receive and independent signal. For example, some audio interfaces made for -DJing have 4 output channels with 4 mono output connectors and 1 stereo -headphone connector. This does not mean that the audio interface can send out 6 -different signals at the same time; rather, the signal on 2 of the mono outputs -and the stereo headphone output would be the same. Also, many controllers have -separate master and booth outputs with independent volume controls, but they +Audio interfaces sometimes have multiple connectors for a single channel, +resulting in more connectors than channels. So, not every connector can send or +receive and independent signal. For example, some audio interfaces made for +DJing have 4 output channels with 4 mono output connectors and 1 stereo +headphone connector. This does not mean that the audio interface can send out 6 +different signals at the same time; rather, the signal on 2 of the mono outputs +and the stereo headphone output would be the same. Also, many controllers have +separate master and booth outputs with independent volume controls, but they both play the same signal. Vinyl Control and Phono Preamplifiers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Turntables output low voltage (phono level) signals that need to be amplified -to line level before most audio equipment can work with them. So, if you want -to use :ref:`vinyl-control`, sometimes referred to as a Digital Vinyl System -(DVS), it is best to have phono preamplifiers (one for each deck) somewhere -between your turntable and sound card to boost the turntable's phono level -signal to line level. Mixxx can amplify phono level signals in software, but it -is better to do it in hardware. The phono preamp can be in the turntable, in -the audio interface, or a stand alone device. Most audio interfaces do not have -phono preamps; these are generally found on audio interfaces specifically made -for controlling DJ software with timecode vinyl. :ref:`hardware-mixers` with -audio interfaces have phono preamps on their deck inputs, but not necessarily -on every deck input. Many higher-end all-in-one controllers also include audio +Turntables output low voltage (phono level) signals that need to be amplified +to line level before most audio equipment can work with them. So, if you want +to use :ref:`vinyl-control`, sometimes referred to as a Digital Vinyl System +(DVS), it is best to have phono preamplifiers (one for each deck) somewhere +between your turntable and sound card to boost the turntable's phono level +signal to line level. Mixxx can amplify phono level signals in software, but it +is better to do it in hardware. The phono preamp can be in the turntable, in +the audio interface, or a stand alone device. Most audio interfaces do not have +phono preamps; these are generally found on audio interfaces specifically made +for controlling DJ software with timecode vinyl. :ref:`hardware-mixers` with +audio interfaces have phono preamps on their deck inputs, but not necessarily +on every deck input. Many higher-end all-in-one controllers also include audio interfaces with phono preamps. .. _hardware-mixers: Mixers ====== -Mixers are devices that combine audio signals. DJ mixers are different from -live and studio mixers because they have multiple stereo channels with phono -preamplifiers for connecting :ref:`hardware-turntables`. It is conventional to -use a DJ mixer with :ref:`vinyl-control`, but vinyl control can be used without +Mixers are devices that combine audio signals. DJ mixers are different from +live and studio mixers because they have multiple stereo channels with phono +preamplifiers for connecting :ref:`hardware-turntables`. It is conventional to +use a DJ mixer with :ref:`vinyl-control`, but vinyl control can be used without a hardware mixer. -Using Mixxx with a DJ mixer requires an audio interface with at least 4 mono -outputs (2 stereo pairs) to send Mixxx's decks to the mixer's stereo channels. -Some DJ mixers have a USB :ref:`audio interface ` -built into them. This lets Mixxx send unmixed audio files directly to the mixer +Using Mixxx with a DJ mixer requires an audio interface with at least 4 mono +outputs (2 stereo pairs) to send Mixxx's decks to the mixer's stereo channels. +Some DJ mixers have a USB :ref:`audio interface ` +built into them. This lets Mixxx send unmixed audio files directly to the mixer without needing a separate stand-alone audio interface. -Often DJs who use DJ software with internal mixing send their master output to -a hardware mixer. This can be helpful to send the mixed signal to both a main -speaker output for the audience and booth speakers for the DJ with separate -gain controls for each output. It also facilitates smooth transitions between +Often DJs who use DJ software with internal mixing send their master output to +a hardware mixer. This can be helpful to send the mixed signal to both a main +speaker output for the audience and booth speakers for the DJ with separate +gain controls for each output. It also facilitates smooth transitions between DJs. -However, using an external mixer with internal mixing is not necessary and -reduces the sound quality. Each piece of equipment an audio signal passes -through reduces the sound quality, so avoiding unnecessary equipment in the -signal path can provide better sound quality. Many DJ controllers provide -separate master and booth outputs with independent volume controls. -Alternatively, a sound card with at least 6 output channels can be used with +However, using an external mixer with internal mixing is not necessary and +reduces the sound quality. Each piece of equipment an audio signal passes +through reduces the sound quality, so avoiding unnecessary equipment in the +signal path can provide better sound quality. Many DJ controllers provide +separate master and booth outputs with independent volume controls. +Alternatively, a sound card with at least 6 output channels can be used with Mixxx's :guilabel:`Booth` output. -Many people confuse "analog mixers" and "hardware mixers", but these are are -not the same. Many hardware mixers process audio digitally with specialized -signal processors as opposed to a general purpose CPU like those in laptop and +Many people confuse "analog mixers" and "hardware mixers", but these are are +not the same. Many hardware mixers process audio digitally with specialized +signal processors as opposed to a general purpose CPU like those in laptop and desktop computers. .. seealso:: :ref:`microphones-record-broadcast-external-mixer` @@ -207,26 +209,26 @@ desktop computers. Turntables ========== -Turntables are mechanical devices that play music recordings cut into vinyl -phonograph records. Before software like Mixxx was available, the art of DJing -originated with turntables and :ref:`DJ mixers `. Special -vinyl records can be used with turntables to control the playback of digital +Turntables are mechanical devices that play music recordings cut into vinyl +phonograph records. Before software like Mixxx was available, the art of DJing +originated with turntables and :ref:`DJ mixers `. Special +vinyl records can be used with turntables to control the playback of digital files in Mixxx as if the digital file was pressed onto the vinyl record. .. seealso:: :ref:`vinyl-control` CDJs ==== -CDJs are devices that play digital audio files and have controls from -manipulating the playback of the audio. Originally CDJs played audio CDs, but -new devices typically use USB storage drives or SD cards. Some CDJs can be -plugged into a computer with a USB cable to function as a :ref:`controller +CDJs are devices that play digital audio files and have controls from +manipulating the playback of the audio. Originally CDJs played audio CDs, but +new devices typically use USB storage drives or SD cards. Some CDJs can be +plugged into a computer with a USB cable to function as a :ref:`controller ` for Mixxx. Microphones =========== -Microphones convert changes in sound pressure in air to changes in voltage (an -analog audio signal). Mixxx can work with any microphone that can be plugged -into your :ref:`audio interface `. +Microphones convert changes in sound pressure in air to changes in voltage (an +analog audio signal). Mixxx can work with any microphone that can be plugged +into your :ref:`audio interface `. .. seealso:: :ref:`microphones` diff --git a/source/chapters/introduction.rst b/source/chapters/introduction.rst index b8991883ba..91329ae292 100644 --- a/source/chapters/introduction.rst +++ b/source/chapters/introduction.rst @@ -1,14 +1,16 @@ +.. include:: /shortcuts.rstext + .. _intro: Introduction to Mixxx ********************* -Mixxx enables you to perform live DJ mixes with your digital music collection. -It helps you rock the party with DJ controllers, vinyl turntables, or even just -your keyboard. It is developed by an international team of volunteers who want -to bring the joy of DJing to everyone. The project is non-profit, open-source -and community driven. Together, we aim to build the best DJ software ever -created. We hope you will join us! +Mixxx enables you to perform live DJ mixes with your digital music collection. +It helps you rock the party with DJ controllers, vinyl turntables, or even just +your keyboard. It is developed by an international team of volunteers who want +to bring the joy of DJing to everyone. The project is non-profit, open-source +and community driven. Together, we aim to build the best DJ software ever +created. We hope you will :ref:`join us `! .. _intro-how-mixxx-works: @@ -22,24 +24,24 @@ different tracks together on the fly. You can use Mixxx to preview the next track in headphones before the audience hears it, also known as headphone cueing. This helps you choose a track that is appropriate for the present moment and that will mix well into the -currently playing track(s). To use headphone cueing, you need at least 2 -separate audio outputs, typically provided by a USB audio interface (also known -as a “sound card”, although most of them are not shaped like cards anymore). +currently playing track(s). To use headphone cueing, you need at least 2 +separate audio outputs, typically provided by a USB audio interface (also known +as a “sound card”, although most of them are not shaped like cards anymore). Mixxx can be used in two different ways for headphone cueing: **Internal Mixing** Mixxx plays multiple audio files on the computer at the same time, mixes them together, and sends the mixed signal to one audio interface - output. A separate signal is sent to another audio interface output - for headphone cueing. Often a DJ controller is used with internal mixing to + output. A separate signal is sent to another audio interface output + for headphone cueing. Often a DJ controller is used with internal mixing to provide easier control over Mixxx than a mouse and keyboard. .. figure:: ../_static/mixxx_setup_midi_integrated_audio_interface.png :align: center :width: 75% :figwidth: 100% - :alt: Using Mixxx together with a DJ controller and integrated audio + :alt: Using Mixxx together with a DJ controller and integrated audio interface :figclass: pretty-figures @@ -49,14 +51,14 @@ Mixxx can be used in two different ways for headphone cueing: **External Mixing** - In this kind of setup, Mixxx plays multiple audio files on the computer at - the same time and sends each track to a separate audio interface output. The - audio interface's outputs are plugged into an external hardware mixer. The - hardware mixer performs the actual mixing of the audio signals. On the - hardware mixer, there are separate outputs for the mixed signal to play to - the audience and for the DJ to use headphone cueing. External mixing is - typically used with turntables and :ref:`special vinyl - records` to manipulate digital music files as if the music was + In this kind of setup, Mixxx plays multiple audio files on the computer at + the same time and sends each track to a separate audio interface output. The + audio interface's outputs are plugged into an external hardware mixer. The + hardware mixer performs the actual mixing of the audio signals. On the + hardware mixer, there are separate outputs for the mixed signal to play to + the audience and for the DJ to use headphone cueing. External mixing is + typically used with turntables and :ref:`special vinyl + records` to manipulate digital music files as if the music was on the vinyl records. .. figure:: ../_static/mixxx_setup_timecode_vc.png @@ -68,3 +70,4 @@ Mixxx can be used in two different ways for headphone cueing: Using Mixxx together with a USB audio interface, external mixer, and timecode vinyl for external mixing + diff --git a/source/chapters/library.rst b/source/chapters/library.rst index 966f6872ea..c28f04ba26 100644 --- a/source/chapters/library.rst +++ b/source/chapters/library.rst @@ -32,11 +32,12 @@ view on the right displays the tracks in those collections. **Sidebar**: * **Search**: Search for tracks in your Mixxx library. -* **Library**: View and edit your whole collection. +* **Tracks**: View and edit your whole collection. * **Auto DJ**: Automatically load and crossfade tracks for unattended mixing. * **Playlists**: Arrange tracks in a set order. * **Crates**: Organize tracks in (unordered) collections. -* **Browse**: Browse and load tracks from your file system and connected devices. +* **Computer**: Navigate, view, and load tracks from folders on your hard disk + and connected devices. * **Recordings**: Record your mix and view previous recordings. * **History**: Browse lists of tracks played in past mixing sessions. * **Analyze**: Generate Mixxx-specific data for tracks before a gig. @@ -49,16 +50,15 @@ view on the right displays the tracks in those collections. * **Load**: Drag tracks you want to play to the waveform display. * **Edit**: Rate tracks and edit track properties. -.. _library-root: +.. _library-tracks: -Library - View and edit your whole collection -============================================= +Tracks - View and edit your whole collection +============================================ .. sectionauthor:: S.Brandt -|ic_lib_library| The Library displays a sortable list of all the tracks in your -music library. +|ic_lib_library| A sortable list of all the tracks in your music library. **Customizing the view** Move columns by clicking a column header and dragging it to another @@ -73,8 +73,6 @@ music library. * **Multi-Column sorting** - .. versionadded:: 2.0 - You can sort multiple columns by clicking *up to three* column headers you wish to sort your tracks by. This makes searching for tracks in a large list more efficient. Clicking twice on a column header will reverse the sort @@ -89,6 +87,25 @@ music library. genre. If genre is equal, it is still sorted by year. If genre and year is equal, then it is sorted by BPM. + * **Random sorting** + + .. versionadded:: 2.1.0 + + Click on the :guilabel:`Preview` column header to randomly sort tracks. + + * **Sort keys by circle of fifths** + + .. versionadded:: 2.1.0 + + Click on the :guilabel:`Key` column header. + The order starts with *C* at the top, then its relative minor (*a*), then + adds 1 sharp (*G*), then *G*'s relative minor (*e*), and so adding + sharps/removing flats around the circle of fifths. + For :ref:`Lancelot ` notation, it starts with + *G#m* at the top, which is *1A* in that notation, and proceeds + alphanumerically (minor keys appear before their relative major keys in this + case). + **Rating tracks** Make sure the :guilabel:`Rating` column is not hidden. Rate tracks by hovering over the rating field and clicking the stars. @@ -140,66 +157,92 @@ music library. Track list context menu ----------------------- -.. versionadded:: 2.0 - :guilabel:`Reload Track Metadata from MusicBrainz`, :guilabel:`Change BPM` - context menu options and :guilabel:`Cover Art` +Right-clicking on selected tracks in the track list reveals the context menu: -.. versionchanged:: 2.0 - All BPM related options are in the :guilabel:`BPM Options` sub-menu. + .. versionadded:: 2.1.0 -Right-clicking on selected tracks in the track list reveals the context menu: + * Add options to replace AutoDJ queue, clear waveforms + * Use checkbox menu in Crates selection + * Add BPM conversions 133,33% and 150% + * Re-organize context menu * **Add to Auto DJ**: Adds the content of the selection to either the :guilabel:`bottom` or :guilabel:`top` of the :ref:`Auto DJ ` - playlist for automatic mixing. -* **Load to Deck/Sampler**: Loads a selected file to a - :ref:`Deck `, :ref:`Sampler ` or + playlist for automatic mixing. The :guilabel:`replace` option deletes the + Auto DJ queue first, and then fills it with the selected tracks. + +* **Load to**: + Loads a selected file to one of the available + :ref:`Decks `, :ref:`Samplers ` or to the :ref:`Previewdeck `. Alternatively - simply drag it to the :ref:`interface-waveform`. Note that you can't load - multiple files at once. -* **Add to playlist/crate**: Add selected tracks to playlists or - crates you have previously created. Alternatively, drag the selection to a - playlist or crate in the sidebar. -* **BPM Options sub-menu**: - - * **Change BPM**: Allows to change the :term:`BPM` to 50%, 66%, 75% or 200% - of the BPM set by Mixxx when :ref:`analyzing ` the - tracks. If many of the detected BPM values are incorrect, you might want - to adjust the :guilabel:`BPM Range` in the + simply drag it to the :ref:`interface-waveform`. The number of available decks + and samplers might differ, depending on the selected skin. Note that you + can't load multiple files at once. +* **Add to Playlist**: Add selected tracks to an existing playlist, or drag the + selection to a playlist crate in the sidebar. Choose :guilabel:`Create new + playlist` to put them into a new playlist. +* **Crates:** The checkbox shows in which existing crates the selection is in. + Changing the crates selection does not collapse the menu, which allows + much easier categorization of tracks without going through the menu from + scratch. Choose :guilabel:`Create new Crate` to put them into a new crate. + +* **Metadata**: + * **Import from File Tags**: If the track's :term:`metadata` changes, + (e.g. if you used iTunes to edit it,) this option lets you save the new + values for the selected tracks to the Mixxx library. See + :ref:`edit metadata `. + * **Import from MusicBrainz**: Look up :term:`metadata` online by searching + the :term:`MusicBrainz` database and apply the search results to your + tracks. See :ref:`edit metadata `. + * **Export to File Tags:** Saves :term:`metadata` to files. Mixxx may wait + to modify files until they are not loaded to any decks or samplers. If you + do not see changed metadata in other programs immediately, eject the track + from all decks and samplers or shutdown Mixxx. + + * **Cover Art**: + + * **Choose New Cover**: Select an image from the file browser as the cover. + * **Clear Cover**: Delete any cover information saved for this track. + * **Reload from track/folder**: Reload the cover from the tracks' ID3v2 + :term:`tags ` or a picture in the track folder if the tags do + not supply any. + +* **Clear**: + * **BPM and Beatgrid**: Removes the :term:`BPM` and :term:`beatgrid` data + from the selected tracks in the Mixxx library. After doing this, we + recommend :ref:`analyzing ` the tracks again. + * **Play Count**: Marks selected tracks as not played in the current + session and sets their play counter to zero. The icon in the + :guilabel:`Played` column changes. + * **Hotcues**: Clears all saved :term:`hotcues ` and + :ref:`hotcue labels `. + * **ReplayGain**: Clears all saved :term:`ReplayGain` values. + * **Waveform**: Clears the saved waveform data from the selected tracks. + This is useful if a file is overwritten by another file of the same name, + or was edited externally (e.g. in a waveform editor). To clear the + waveform cache for all tracks in the library, select + :menuselection:`Preferences --> Waveforms --> Clear cached Waveforms` . + * **All**: Clears all of the data above from the Mixxx library database at + once. + +* **Change BPM**: + + * Allows to change the :term:`BPM` to 50%, 66%, 75%, 133,33%, 150%, or + 200% of the BPM set by Mixxx when :ref:`analyzing ` + the tracks. If many of the detected BPM values are incorrect, you might + want to adjust the :guilabel:`BPM Range` in the :ref:`Analyzer Settings ` and re-run the analysis. * **Lock/Unlock BPM**: Locks/Unlocks the :term:`BPM` of selected tracks so you can't edit them in the track properties. The |ic_lib_bpm_unlocked| icon next to the track's BPM in the library row is a toggle. Clicking it - will set the status to "locked", and the icon changes to |ic_lib_bpm_locked|. - - * **Clear BPM and Beatgrid**: Removes the :term:`BPM` and :term:`beatgrid` - data from the selected tracks in the Mixxx library. After doing this, we - recommend :ref:`analyzing ` the tracks again. - -* **Reload Track Metadata from File**: If the track's :term:`metadata` changes, - (e.g. if you used iTunes to edit it,) this option lets you save the new values - for the selected tracks to the Mixxx library. See - :ref:`edit metadata `. -* **Reload Track Metadata from MusicBrainz**: - Look up :term:`metadata` online by searching the :term:`MusicBrainz` database - and apply the search results to your tracks. See - :ref:`edit metadata `. -* **Cover Art Option sub-menu**: - - * **Choose New Cover**: Select an image from the file browser as the cover. - * **Unset Cover**: Delete any cover information saved for this track. - * **Reload from track/folder**: Reload the cover from the tracks' ID3v2 - :term:`tags` or a picture in the track folder if the tags do not - supply any. + will set the status to "locked", and the icon changes to + |ic_lib_bpm_locked|. * **Hide from Library**: Temporarily hides selected tracks from the track list. Hidden tracks are listed in the :guilabel:`Hidden Tracks` menu item which is explained below. -* **Reset Play Count**: Marks selected tracks as not played in the current - session and sets their play counter to zero. The icon in the :guilabel:`Played` - column changes. * **Open in File Browser**: Brings up the selected files in your file manager. * **Properties**: Similar to inline editing explained above, the properties dialog allows you to view and edit metadata such as title, artist, album, and @@ -241,7 +284,7 @@ The Hidden Tracks view is accessible by expanding the Library tree item in the sidebar. Any tracks that were previously loaded into your library but were later set to be hidden from the library will appear here. Use the :guilabel:`Hide from Library` context menu item in the -:ref:`library ` view to temporarily hide selected tracks. +:ref:`tracks ` view to temporarily hide selected tracks. The features in detail: @@ -263,9 +306,6 @@ The features in detail: Loading Tracks ============== -.. versionadded:: 2.0 - You can drag tracks from deck to deck. - Tracks can be loaded into a deck in several ways: * Right-click the :ref:`library track table `: Right-clicking @@ -282,7 +322,7 @@ Tracks can be loaded into a deck in several ways: * Drag-and-drop from external file browser: Dragging-and-dropping a track from an external file browser directly onto a waveform display in Mixxx will load that track. This function also works with some other applications. For - example, on Mac OS X, dragging-and-dropping a track from iTunes onto one of + example, on macOS, dragging-and-dropping a track from iTunes onto one of Mixxx's waveform displays will load it into that deck. .. _library-finding-tracks: @@ -317,20 +357,14 @@ Using search operators Search operators allow you to form more complex search queries. They allow you to limit certain search terms to particular properties of your tracks. -.. versionadded:: 2.0 - Adds *location*, *album_artist*, and *key* search keywords. Supports - human-readable time suffixes in time-based search query filters, e.g. - ``1:30``, ``1m30s``, ``1m30``, ``90``, ``90s``. Supports negative search - filters. - Mixxx supports the following filters: -* **Text filtering**: artist, album, album_artist, genre, title, composer, - comment, key, location +* **Text filtering**: album_artist, album, artist, comment, composer, crate, + genre, grouping, location, title -* **Numeric filtering**: year, track, bpm, played, rating, bitrate, duration +* **Numeric filtering**: bitrate, bpm, played, rating, track, year -* **Special filtering**: +* **Special filtering**: key, duration, added, dateadded, datetime_added, date_added * Supports fuzzy matching of key searches. The following example list tracks with harmonically compatible keys to C# minor. @@ -401,6 +435,8 @@ and click the :guilabel:`Play` button next to the waveform. To display the Preview deck, press :kbd:`CTRL` + :kbd:`4` (Windows/Linux) or :kbd:`CMD` + :kbd:`4` (Mac). +.. hint:: Click on the :guilabel:`Preview` column header to randomly sort tracks. + .. _library-edit-metadata: Edit metadata of audio files @@ -409,6 +445,10 @@ Edit metadata of audio files .. sectionauthor:: S.Brandt +.. versionadded:: 2.1 + + Option to write audio tags back into files + Mixxx reads relevant :term:`metadata` from the tracks and displays them in the library columns. You are free to edit most metadata, and Mixxx offers a number of different ways to do so. Note that some information can not be edited, such @@ -417,15 +457,19 @@ as bitrate, size, length, type, filename, and location. .. note:: Mixxx does not support editing the metadata of many tracks at a time (bulk editing). -.. warning:: Changes to a track's metadata will be saved to the Mixxx library, - but **not** to the track itself. Mixxx wont touch your audio files - to prevent data loss. +.. warning:: Mixxx wont touch your audio files by default. Changes to a track's + metadata will be saved to the Mixxx library, but **not** to the + track itself. + + If you wish to write modified track metadata from the library into + file tags, check the box in :menuselection:`Preferences --> + Library --> Track Metadata Synchronisation`. Manual Edit ----------- **Track Inline editing**: - Double-click on a field in the :ref:`library `. If the field is + Double-click on a field in the :ref:`library `. If the field is editable, it will become an editable text box. Enter a value and hit :kbd:`Enter` when you are done. @@ -457,17 +501,17 @@ Manual Edit * **Cancel**: Discard the changes and close the editor. * **Previous/Next**: Load the previous or next track in the current library view. - * **Reload Track Metadata from File**: Prompts Mixxx to re-read the metadata + * **Import Metadata from File**: Prompts Mixxx to re-read the metadata of the selected track (such as when you have modified it externally with another application.) - * **Reload Track Metadata from MusicBrainz**: + * **Import Metadata from MusicBrainz**: Look up metadata on-line by searching the :term:`MusicBrainz` database. See below. Using the MusicBrainz online database ------------------------------------- -`Musicbrainz `_ is an :term:`open-source` music +`Musicbrainz `_ is an :term:`open-source` music encyclopedia that collects music :term:`metadata` and makes it available to the public. @@ -513,9 +557,9 @@ application window. This prompts Mixxx to re-read the metadata from **all** tracks in the library. Popular software to edit metadata of audio files include: - * `Mp3tag `_ (Windows) - * `Kid3 `_ (Mac, Windows, Linux) - * `Picard `_ (Mac, Windows, Linux) + * `Mp3tag `_ (Windows) + * `Kid3 `_ (Mac, Windows, Linux) + * `Picard `_ (Mac, Windows, Linux) .. _library-auto-dj: @@ -531,12 +575,19 @@ mixing or for using Mixxx as media player. The Auto DJ features in detail: +.. versionadded:: 2.1 + Selection Info label + * **Shuffle button**: Randomizes the order of tracks in the Auto DJ playlist. -* **Add Random button**: Add random track from Auto DJ track sources. +* **Add Random button**: Adds a random track from track sources (crates) to the + Auto DJ queue. If no track sources are configured, the track is added from the + library instead. * **Skip track button**: Skips the next track in the Auto DJ playlist. * **Fade now button**: Triggers the transition to the next track. * **Transition time spin-box**: Determines the duration of the transition. A negative value will add a pause between tracks. +* **Selection Info label**: Displays the duration and number of selected tracks. + Press :kbd:`Ctrl + A` to get the total duration of the AutoDJ queue. * **Enable Auto DJ button**: Toggles the Auto DJ mode on or off. The :guilabel:`Skip track`, :guilabel:`Add Random` and :guilabel:`Fade now` @@ -550,8 +601,6 @@ again, you can activate the :guilabel:`Auto DJ Requeue` option in **Auto DJ Crates** -.. versionadded:: 2.0 - It is possible to add random tracks to the bottom of the Auto DJ playlist. The tracks are chosen from a set of crates that you have set as a source for Auto DJ, or from the standard library. Mixxx will normally try to select tracks @@ -579,21 +628,21 @@ playlist to queue it to :ref:`Auto DJ `, so in a sense you can "play" it. * **Create a playlist**: Right-click on the :guilabel:`Playlists` sidebar item - and select :guilabel:`New playlist`. Name the playlist and click - :guilabel:`OK`. + and select :guilabel:`Create New Playlist`. Name the playlist and click + :guilabel:`OK`. The total number of tracks and total duration are displayed + next to the name. +* **Import playlists**: + Right-click on the :guilabel:`Playlists` sidebar item + and select :guilabel:`Import Playlist`. Select one or more playlists and click + :guilabel:`OK`. Mixxx creates an import of these existing external playlists + as new Mixxx playlists. * **Add Tracks**: Add tracks to a previously created playlist by dragging-and-dropping a selection of tracks from the library or playlists onto the name of a playlist in the sidebar. Alternatively, use the right-click - context menu in the library's :ref:`track list `. + context menu in the library's :ref:`track list `. -.. versionadded:: 2.0 - -* :guilabel:`Analyze Playlist` option in the context menu. -* Import playlists by dragging-and-dropping them into a playlist in the sidebar. -* :guilabel:`Import playlist` and :guilabel:`Export playlist` context menu - options remember the last selected playlist directory. -* The total number of tracks and total duration are displayed next to the - playlist's name. + .. hint:: If you have a track selected in the library, all of the visible + playlist and crates that it is in are shown in bold. Right-click on an existing playlist name to access the different features in the context menu: @@ -613,11 +662,15 @@ the context menu: * **Analyze entire playlist**: Forces the analysis of the tracks in the playlist in the :ref:`Analyze ` view. * **Import playlist**: Import tracks from external playlists in various file - formats to a new Mixxx playlist. For more information, go to - :ref:`library-3rd-party`. + formats to the selected playlist. For more information, go to + :ref:`library-third-party`. * **Export playlist**: Export a playlist to various file formats such as - :file:`m3u`, :file:`pls`, or :file:`csv`. This allows you to use the data in - other applications. + :file:`m3u`, :file:`m3u8`, :file:`pls`, :file:`txt`, or :file:`csv`. + This allows you to use the data in other applications. +* **Export Track files**: This copies all of the tracks in a playlist into a + folder such as an external USB stick. Only files are copied, not + Mixxx-specific metadata like waveforms or cover art that is not embedded in + the file. .. _library-crates: @@ -631,20 +684,17 @@ Crates - Organizing tracks into collections holding your favorite records. * **Create a crate**: Right-click on the :guilabel:`Crates` sidebar item and - select :guilabel:`New Crate`. Name the crate and click :guilabel:`OK`. + select :guilabel:`Create New Crate`. Name the crate and click :guilabel:`OK`. + The total number of tracks and total duration are displayed next to the name. +* **Import crates**: + Right-click on the :guilabel:`Crates` sidebar item + and select :guilabel:`Import Crate`. Select one or more playlists and click + :guilabel:`OK`. Mixxx creates an import of these existing external playlists + as new Mixxx crates. * **Add Tracks**: Add tracks to a previously created crate by dragging-and-dropping a selection of tracks from the library or playlists onto the name of a crate in the sidebar. Alternatively use the context menu in the - library's :ref:`track list`. - -.. versionadded:: 2.0 - -* :guilabel:`Analyze Crate` and :guilabel:`Auto DJ Track Source` context menu - options. -* :guilabel:`Import crate` and :guilabel:`Export crate` context menu - options remember the last selected playlist directory. -* Displays the total number of tracks and the total duration next to the - crate's name. + library's :ref:`track list`. Right-click on an existing crate's name to access the different features in the context menu: @@ -664,10 +714,13 @@ context menu: * **Analyze entire crate**: Forces the analysis of the crate in the :ref:`Analyze ` view. * **Import crate**: Import tracks from external playlists in various file - formats to a new Mixxx crate. + formats to the selected crate. * **Export crate**: Export a crate to various file formats, such as - :file:`m3u`, :file:`pls`, or :file:`csv`. This allows you to use the data in - other applications. + :file:`m3u`, :file:`m3u8`, :file:`pls`, :file:`txt`, or :file:`csv`. This + allows you to use the data in other applications. +* **Export Track files**: This copies all of the tracks in a crate into a folder + such as an external USB stick. Only files are copied, not Mixxx-specific + metadata like waveforms or cover art that is not embedded in the file. Crates vs. Playlists -------------------- @@ -691,25 +744,22 @@ If however you want to plan out a specific set and practice the transitions, you will want an ordered list of tracks. Playlists serve this purpose. -.. _library-browse: +.. _library-computer: -Browse - Loading remote tracks -============================== +Computer - Loading tracks from anywhere on your computer +======================================================== .. sectionauthor:: S.Brandt -|ic_lib_browse| Browse mode works like a file manager and allows you to load -tracks from anywhere on your computer that are not necessarily already in your -Mixxx library. - -.. versionadded:: 2.0 - Add music directories directly from the Browse sidebar item. +|ic_lib_browse| This mode works like a file manager and allows you to load +tracks from anywhere on your computer and connected devices, that are not +necessarily already in your Mixxx library. -Click the :guilabel:`Browse` sidebar item to navigate the computer and find your -music. Depending on your :term:`operating system`, your music will usually be -found in the “My Music” or “Music” folder. Drag the files you want to import to -the |ic_lib_library| :ref:`Library ` icon or directly to the +Click the :guilabel:`Computer` sidebar item to navigate the computer and find +your music. Depending on your :term:`operating system`, your music will usually +be found in the “My Music” or “Music” folder. Drag the files you want to import +to the |ic_lib_library| :ref:`Tracks ` icon or directly to the :ref:`interface-waveform`. .. note:: Currently you can only drag files (not folders) to the Mixxx library. @@ -754,12 +804,6 @@ tracks during the session, it will be discarded. |ic_lib_history_current| This icon indicates the current session. -.. versionadded:: 2.0 - -* :guilabel:`Create new history playlist` context menu option. -* :guilabel:`Export playlist` context menu option remember the last selected - playlist directory. - Click on the *History* icon in the sidebar to switch to the :guilabel:`History` view, then right-click on a session's name/date to access the different features: @@ -790,7 +834,7 @@ the audio while performing, so it helps to have your tracks analyzed before you play. See :ref:`getting-started-analyze-library` for details. -.. _library-3rd-party: +.. _library-third-party: iTunes, Traktor, Rhythmbox, Banshee - Using external libraries ============================================================== @@ -800,13 +844,10 @@ iTunes, Traktor, Rhythmbox, Banshee - Using external libraries Supported libraries: -* |ic_lib_itunes| `iTunes `_ (Windows, Mac OS X) -* |ic_lib_traktor| `Traktor `_ (Windows, Mac OS X), +* |ic_lib_itunes| `iTunes `_ (Windows, macOS) +* |ic_lib_traktor| `Traktor `_ (Windows, macOS), * |ic_lib_rhythmbox| `Rhythmbox `_ (GNU/Linux) -* |ic_lib_banshee| `Banshee `_ (Windows, Mac OS X, GNU/Linux) - -.. versionadded:: 2.0 - Support for Banshee music player +* |ic_lib_banshee| `Banshee `_ (Windows, macOS, GNU/Linux) The external library views allow you to use music libraries you have created in these third-party applications. You can access music as well as playlists. If @@ -856,39 +897,38 @@ Compatible file formats ======================= Mixxx supports a variety of audio file formats: -Lossless: - -* :term:`FLAC` (flac) -* :term:`Wave ` (wav) -* :term:`Aiff ` (aiff, aif) - -Lossy: - -* :term:`MP3` (mp3) -* :term:`Ogg Vorbis` (ogg) -* :term:`AAC` (aac, m4a, mp4) -* :term:`Opus` (opus) ++----------------------------------------+-------------------------------------+ +| Lossless | Lossy | ++========================================+=====================================+ +| :term:`FLAC` (flac) | :term:`MP3` (mp3) | ++----------------------------------------+-------------------------------------+ +| :term:`Wave ` (wav) | :term:`Ogg Vorbis` (ogg) | ++----------------------------------------+-------------------------------------+ +| :term:`Aiff ` (aiff, aif) | :term:`AAC` (aac, m4a, mp4) | ++----------------------------------------+-------------------------------------+ +| | :term:`Opus` (opus) | ++----------------------------------------+-------------------------------------+ Lossless formats preserve every detail of the original recording and are -recommended for the best sound quality. The FLAC format compresses the +recommended for the best sound quality. The :file:`FLAC` format compresses the files to take less space on your computer without sacrificing audio quality. -WAV and AIFF files are uncompressed and take up much more space. +:file:`WAV` and :file:`AIFF` files are uncompressed and take up much more space. Lossy formats take up less storage space on your computer than lossless -formats at the expense of reducing sound quality. Assuming an average track -length of about 4 minutes, a 1 TB hard drive or solid state drive can store -about 42000 FLAC files or about 115000 MP3 files at 320 kbps. +formats at the expense of reducing sound quality. Assuming an average track +length of about 4 minutes, a 1 TB hard drive or solid state drive can store +about 42000 :file:`FLAC` files or about 115000 :file:`MP3` files at 320 kbps. There is no benefit to converting lossy file to lossless formats. The detail lost when making the lossy file cannot be recovered. -AAC (M4A) is supported on Windows Vista and Mac OS X 10.5 onwards. The -`Platform Update Supplement `_ +:file:`AAC (M4A)` is supported on Windows Vista and macOS 10.8 onwards. The +`Platform Update Supplement `_ is required for Windows Vista. -On Linux, AAC playback is disabled by default due to licensing restrictions. -To enable the playback of AAC files, -`build Mixxx from source with m4a/AAC files support `_. +On Linux, :file:`AAC` playback is disabled by default due to licensing restrictions. +To enable the playback of :file:`AAC` files, +`build Mixxx from source with m4a/AAC files support `_. .. warning:: :term:`DRM` protected files, such as m4p files purchased in the iTunes Store in 2009 or earlier, are not supported. @@ -905,4 +945,4 @@ Mixxx can not play music directly from audio CDs. Use a CD ripping program to copy the audio from the CD to files on your computer. It is recommended to save the ripped files in the :term:`FLAC` format. Many different programs are available to rip CDs, but not every program is capable of saving them to -FLAC. +:file:`FLAC`. diff --git a/source/chapters/livebroadcasting.rst b/source/chapters/livebroadcasting.rst index 13c90e0dd7..360ccfdace 100644 --- a/source/chapters/livebroadcasting.rst +++ b/source/chapters/livebroadcasting.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _live-broadcasting: Live Broadcasting - Start your own Internet radio @@ -9,7 +11,7 @@ Live Broadcasting - Start your own Internet radio Live Broadcasting in Mixxx allow you to stream your mix over the Internet to listeners around the world. -.. seealso:: The :ref:`microphones` chapter has detailed instructions for +.. seealso:: The :ref:`microphones` chapter has detailed instructions for including input from microphones in your broadcasted mixes. Streaming Servers @@ -132,9 +134,6 @@ Live Broadcasting Preferences **Stream Setting** -.. versionadded:: 2.0 - :guilabel:`Dynamically update Ogg Vorbis metadata` option - * **Public stream**: If enabled, this option adds your radio station to the Shoutcast/Icecast directory. * **Enable UTF-8 metadata**: If enabled, this option fixes broken accented and @@ -164,8 +163,6 @@ Live Broadcasting Preferences **Shoutcast metadata format** - .. versionadded:: 2.0 - This allows to set custom metatdata formats for the Shoutcast title field. Previously only ``artist - title`` was allowed. For example if you were broadcasting as part of a station, you could add the station's name or the @@ -213,7 +210,7 @@ Often streaming hosts will run their own directories. Check your host's FAQ to find out. If you want to promote your streaming radio station even more, register at services like `streamfinder.com `_. An overview of different internet radio directories is available at -`shoutcheap.com `_ +`shoutcheap.com `_ Troubleshooting =============== @@ -263,7 +260,7 @@ To activate MP3 streaming on Windows, follow these steps: LAME binaries. #. Unpack the downloaded archive. You need a utility for manipulating archives - like the free `7zip `_. + like the free `7zip `_. #. Copy :file:`libmp3lame.dll` to the location you have installed Mixxx, probably :file:`C:\\Program Files\\Mixxx\\`. #. **Only** if you are running Mixxx 1.11 or earlier, you **must** also rename @@ -283,21 +280,21 @@ Windows Troubleshooting * Make sure you put the correct LAME :file:`*.dll` file in the same folder that contains the installation of Mixxx you are using. -.. warning:: Some websites like `Audacity `_ +.. warning:: Some websites like `Audacity `_ provide lame :term:`binaries` too. Do not use these versions or Mixxx will show an error when activating live broadcasting and your stream will fail. -Activate MP3 streaming support on Mac OS X +Activate MP3 streaming support on macOS ------------------------------------------ Method A: Download ^^^^^^^^^^^^^^^^^^ -To activate MP3 streaming on Mac OS X, follow these steps: +To activate MP3 streaming on macOS, follow these steps: 1. Download `LAME 3.98.4 `_ - Intel (Mac OS X 10.5+ 32-bit & 64-bit) + Intel (macOS 10.8+ 64-bit) #. Double-click on the downloaded zip file to unpack the file and you'll get an installer package file #. Double-click on the installer package file and follow the step-by-step @@ -306,8 +303,8 @@ To activate MP3 streaming on Mac OS X, follow these steps: Method B: Package manager ^^^^^^^^^^^^^^^^^^^^^^^^^ -Another easy way to activate MP3 streaming is to use `Homebrew `_ -or `MacPorts `_, which are package managers like +Another easy way to activate MP3 streaming is to use `Homebrew `_ +or `MacPorts `_, which are package managers like `apt `_ on Debian/Ubuntu Linux. They provide a convenient way to install many Open Source packages. Once Homebrew or Macports is installed, adding MP3 support to Mixxx is rather diff --git a/source/chapters/microphones.rst b/source/chapters/microphones.rst index e817eb5368..4d82b7319c 100644 --- a/source/chapters/microphones.rst +++ b/source/chapters/microphones.rst @@ -4,24 +4,24 @@ Using Microphones ***************** -Mixxx can work with any microphone that can be plugged into your :ref:`audio -interface `. There are three ways to use microphones +Mixxx can work with any microphone that can be plugged into your :ref:`audio +interface `. There are three ways to use microphones with Mixxx, each with their own pros and cons: - * :ref:`microphones-software-monitoring`: Cheapest and simplest to set up, - but you cannot hear yourself without a disorienting delay, referred to as + * :ref:`microphones-software-monitoring`: Cheapest and simplest to set up, + but you cannot hear yourself without a disorienting delay, referred to as "latency". - * :ref:`microphones-direct-monitoring`: Recommended for most users. This is - the cheapest to set up with good sound quality and without the latency of + * :ref:`microphones-direct-monitoring`: Recommended for most users. This is + the cheapest to set up with good sound quality and without the latency of software monitoring. - * :ref:`microphones-hardware-mixers`: Most expensive option to set up with + * :ref:`microphones-hardware-mixers`: Most expensive option to set up with high sound quality. This does not have the latency of software monitoring. -.. warning:: USB microphones are not recommended. These devices have their own - audio interface built in and can only be used with software - monitoring. Some USB microphones have headphone jacks for direct - monitoring, but the music from Mixxx cannot be heard in this - headphone jack. Also, they can be difficult to configure at the +.. warning:: USB microphones are not recommended. These devices have their own + audio interface built in and can only be used with software + monitoring. Some USB microphones have headphone jacks for direct + monitoring, but the music from Mixxx cannot be heard in this + headphone jack. Also, they can be difficult to configure at the same time as a different audio interface for music output. .. seealso:: The `Mixxx DJ Hardware Guide @@ -33,12 +33,12 @@ with Mixxx, each with their own pros and cons: Software Monitoring ------------------- -Software monitoring can be used with the built-in microphone on a laptop or -with a headset plugged into the built-in audio interface on a computer. -However, there is a delay between the time you make sound into the microphone -and hear it in the Master output. Due to the nature of digital audio, it takes -time for input from the audio interface to be available for Mixxx to process, -time for Mixxx to process the audio, and more time to send the audio back out +Software monitoring can be used with the built-in microphone on a laptop or +with a headset plugged into the built-in audio interface on a computer. +However, there is a delay between the time you make sound into the microphone +and hear it in the Master output. Due to the nature of digital audio, it takes +time for input from the audio interface to be available for Mixxx to process, +time for Mixxx to process the audio, and more time to send the audio back out the audio interface. This time is referred to as "latency". .. figure:: ../_static/software-monitor-signal-path.png @@ -50,47 +50,47 @@ the audio interface. This time is referred to as "latency". Microphone input with software monitoring signal path -Mixxx can be configured to run at low latencies by choosing a smaller -:ref:`preferences-audio-buffer`, but there is no way to completely eliminate -latency. Although latency is measured in milliseconds, even a few milliseconds -of latency can be disorienting and distracting to hear, whether you are using -the microphone for spoken announcements, vocals, or playing a musical +Mixxx can be configured to run at low latencies by choosing a smaller +:ref:`preferences-audio-buffer`, but there is no way to completely eliminate +latency. Although latency is measured in milliseconds, even a few milliseconds +of latency can be disorienting and distracting to hear, whether you are using +the microphone for spoken announcements, vocals, or playing a musical instrument. To use software monitoring: #. Open :menuselection:`Preferences --> Sound Hardware`. #. Select the :guilabel:`Input` tab. -#. For :guilabel:`Microphone 1`, select the audio interface that your +#. For :guilabel:`Microphone 1`, select the audio interface that your microphone is plugged into. #. Click the :guilabel:`Apply` button. #. Click the :guilabel:`OK` button. -#. Click the :guilabel:`Mics` button in the main Mixxx window to show the +#. Click the :guilabel:`Mics` button in the main Mixxx window to show the microphone controls. -#. Click the :guilabel:`Talk` button when you are using the microphone. - -.. hint:: If you would prefer to not hear the microphone input, you can set the - :guilabel:`Microphone Monitor Mode` option to :guilabel:`Direct - monitor (recording and broadcasting only)`. This will still mix the - microphone input with your recorded and broadcasted mixes, but it - will not mix the microphone with the Master output. Don't forget to - press the :guilabel:`Talk` button when using the microphone if you +#. Click the :guilabel:`Talk` button when you are using the microphone. + +.. hint:: If you would prefer to not hear the microphone input, you can set the + :guilabel:`Microphone Monitor Mode` option to :guilabel:`Direct + monitor (recording and broadcasting only)`. This will still mix the + microphone input with your recorded and broadcasted mixes, but it + will not mix the microphone with the Master output. Don't forget to + press the :guilabel:`Talk` button when using the microphone if you use this option. .. _microphones-direct-monitoring: Direct Monitoring ----------------- -An audio interface with direct monitoring and a -:ref:`microphones-loopback-input` is the recommended way to use microphones with -Mixxx for most users. Except for audio interfaces built into computers, most -audio interfaces with microphone inputs support direct monitoring. However, not +An audio interface with direct monitoring and a +:ref:`microphones-loopback-input` is the recommended way to use microphones with +Mixxx for most users. Except for audio interfaces built into computers, most +audio interfaces with microphone inputs support direct monitoring. However, not all audio interfaces that support direct monitoring also have a loopback input. Direct monitoring routes the audio from the audio interface's inputs directly -its outputs. This avoids the latency of sending it into the computer and back -out with :ref:`microphones-software-monitoring`. At the same time, the audio -interface sends the input into the computer so Mixxx can record and broadcast +its outputs. This avoids the latency of sending it into the computer and back +out with :ref:`microphones-software-monitoring`. At the same time, the audio +interface sends the input into the computer so Mixxx can record and broadcast it. .. figure:: ../_static/direct-monitor-signal-path.png @@ -106,9 +106,9 @@ it. Loopback Input ^^^^^^^^^^^^^^ -Some audio interfaces that support :ref:`microphones-direct-monitoring` have a -loopback input feature. They add Mixxx's output to the microphone signal before -sending it to the computer. This makes it easier to set up Mixxx with direct +Some audio interfaces that support :ref:`microphones-direct-monitoring` have a +loopback input feature. They add Mixxx's output to the microphone signal before +sending it to the computer. This makes it easier to set up Mixxx with direct monitoring than configuring :ref:`microphones-latency-compensation`. .. figure:: ../_static/direct-monitor-loopback-signal-path.png @@ -124,27 +124,27 @@ To configure Mixxx with a loopback input: #. Open :menuselection:`Preferences --> Sound Hardware`. #. Click the :guilabel:`Input` tab. -#. Select the audio interface for the :guilabel:`Record/Broadcast` input. Do +#. Select the audio interface for the :guilabel:`Record/Broadcast` input. Do not configure anything for the :guilabel:`Microphone 1-4` inputs. #. Click the :guilabel:`Apply` button. #. Click the :guilabel:`OK` button. #. :ref:`Activate direct monitoring and loopback on your audio interface. ` -#. Adjust the microphone volume with the input gain knob on your audio +#. Adjust the microphone volume with the input gain knob on your audio interface. -The microphone controls in Mixxx will not affect your microphones because they +The microphone controls in Mixxx will not affect your microphones because they are mixed by the audio interface and not sent directly to Mixxx. .. _microphones-latency-compensation: Latency Compensation ^^^^^^^^^^^^^^^^^^^^ -When using :ref:`microphones-direct-monitoring`, you will hear the microphone +When using :ref:`microphones-direct-monitoring`, you will hear the microphone mixed with the music from Mixxx without any noticable latency. However, it still -takes time for Mixxx to receive the microphone signal and process it. Without -compensating for this latency or using a :ref:`microphones-loopback-input`, the -microphone inputs will be out of time relative to the music in your recorded +takes time for Mixxx to receive the microphone signal and process it. Without +compensating for this latency or using a :ref:`microphones-loopback-input`, the +microphone inputs will be out of time relative to the music in your recorded and broadcasted mixes. .. figure:: ../_static/direct-monitor-input-latency.png @@ -153,34 +153,34 @@ and broadcasted mixes. :figwidth: 100% :alt: Diagram explaining latency offset with direct monitoring :figclass: pretty-figures - + Diagram explaining latency offset with direct monitoring -Mixxx can compensate for this timing misalignment, but it is complicated to set -up. If you do not want to record your microphone into your mix or broadcast, -you can :ref:`activate direct monitoring on your audio interface -` without configuring latency +Mixxx can compensate for this timing misalignment, but it is complicated to set +up. If you do not want to record your microphone into your mix or broadcast, +you can :ref:`activate direct monitoring on your audio interface +` without configuring latency compensation. .. _microphones-measure-round-trip-latency: Measuring Round Trip Latency """"""""""""""""""""""""""""" -To configure Mixxx to compensate for input latency while using direct -monitoring, first you must measure the round trip latency of your setup. The -round trip latency is different from the size of the -:ref:`preferences-audio-buffer` configured in Mixxx. It is the amount of time -it takes for audio to make a complete trip from your audio interface's input, +To configure Mixxx to compensate for input latency while using direct +monitoring, first you must measure the round trip latency of your setup. The +round trip latency is different from the size of the +:ref:`preferences-audio-buffer` configured in Mixxx. It is the amount of time +it takes for audio to make a complete trip from your audio interface's input, through your computer, and back out the audio interface. -Mixxx cannot calculate the round trip latency because it depends on details of -your audio interface's hardware, your operating system, your audio interface's -driver, and other factors in your computer's hardware. The round trip latency -can only be found by measuring it. To do this, use a physical cable to connect -the audio interface's output to its input. Then, use a third party program to +Mixxx cannot calculate the round trip latency because it depends on details of +your audio interface's hardware, your operating system, your audio interface's +driver, and other factors in your computer's hardware. The round trip latency +can only be found by measuring it. To do this, use a physical cable to connect +the audio interface's output to its input. Then, use a third party program to measure the round trip latency. These programs are recommended on each OS: -* **GNU/Linux**: +* **GNU/Linux**: `jack_iodelay `_ * **Windows**: `RTL Utility `_ * **macOS**: `Audacity `_ @@ -194,81 +194,81 @@ measure the round trip latency. These programs are recommended on each OS: Measuring round trip latency -You must use the same sample rate and audio buffer size in the measurement -program as you do in Mixxx for the measurement to be accurate. If you decide to -change the sample rate or buffer size you use with Mixxx, you will need to -remeasure your round trip latency to have your microphone inputs aligned in +You must use the same sample rate and audio buffer size in the measurement +program as you do in Mixxx for the measurement to be accurate. If you decide to +change the sample rate or buffer size you use with Mixxx, you will need to +remeasure your round trip latency to have your microphone inputs aligned in your recorded and broadcasted mixes. -.. warning:: Make sure direct monitoring is *not* :ref:`activated on your +.. warning:: Make sure direct monitoring is *not* :ref:`activated on your audio interface ` while - you are measuring the round trip latency or you will not get an + you are measuring the round trip latency or you will not get an accurate measurement. .. _microphones-configure-latency-compensation: Configuring Latency Compensation """""""""""""""""""""""""""""""" -#. Before opening Mixxx, :ref:`measure the round trip latency +#. Before opening Mixxx, :ref:`measure the round trip latency `. #. Open Mixxx. #. Open :menuselection:`Preferences --> Sound Hardware`. #. Click the :guilabel:`Input` tab. -#. Select the audio interface input(s) for the :guilabel:`Microphone 1-4` - inputs. Select a single mono channel for each Microphone input unless you +#. Select the audio interface input(s) for the :guilabel:`Microphone 1-4` + inputs. Select a single mono channel for each Microphone input unless you are using stereo microphones. -#. For the :guilabel:`Microphone Monitor Mode` option, select :guilabel:`Direct +#. For the :guilabel:`Microphone Monitor Mode` option, select :guilabel:`Direct monitor (recording and broadcasting only)`. -#. Enter the measured round trip latency in millseceonds for the +#. Enter the measured round trip latency in millseceonds for the :guilabel:`Microphone Latency Compensation` option. #. Click the :guilabel:`Apply` button. #. Click the :guilabel:`OK` button. -#. :ref:`Activate direct monitoring on your audio interface. +#. :ref:`Activate direct monitoring on your audio interface. ` -#. Click the :guilabel:`Mics` button in the main Mixxx window to show the +#. Click the :guilabel:`Mics` button in the main Mixxx window to show the microphone controls. #. Click the :guilabel:`Talk` button when you are using the microphone. -#. Adjust the microphone volume with the input gain knob on your audio - interface. Do not adjust the microphone gain in Mixxx. If you do, the - relative volume of the mics and music will be different in your recorded +#. Adjust the microphone volume with the input gain knob on your audio + interface. Do not adjust the microphone gain in Mixxx. If you do, the + relative volume of the mics and music will be different in your recorded and broadcasted mixes compared to what you hear out of your audio interface. -Mixxx will not record or broadcast your microphone if the :guilabel:`Talk` -button is not active. However, you will still hear the microphone in your main -output because the microphone is mixed by your audio interface, not Mixxx. You -may leave the :guilabel:`Talk` button on to ensure you do not forget it, but -this will record and broadcast background noise when you are not actively using -the microphone. If your microphone has an on/off switch on it, you may leave -the :guilabel:`Talk` button enabled in Mixxx and use the switch on the -microphone to avoid adding background noise to your mix. Alternatively, you can +Mixxx will not record or broadcast your microphone if the :guilabel:`Talk` +button is not active. However, you will still hear the microphone in your main +output because the microphone is mixed by your audio interface, not Mixxx. You +may leave the :guilabel:`Talk` button on to ensure you do not forget it, but +this will record and broadcast background noise when you are not actively using +the microphone. If your microphone has an on/off switch on it, you may leave +the :guilabel:`Talk` button enabled in Mixxx and use the switch on the +microphone to avoid adding background noise to your mix. Alternatively, you can adjust the input gain on your audio interface throughout your mix. - + .. _microphones-activate-direct-monitoring: Activating Direct Monitoring And Loopback On The Audio Interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -General tips for activating direct monitoring and loopback are described below. -However, every audio interface is different, so refer to the audio interface +General tips for activating direct monitoring and loopback are described below. +However, every audio interface is different, so refer to the audio interface manual from the manufacturer for more details. -On stand-alone audio interfaces, there is often a knob on the device that -controls direct monitoring. This knob crossfades the audio interface's output -between the signal from the computer and the directly monitored inputs. If your -audio interface has a knob like this, set the knob to the center. -Alternatively, some audio interfaces have a switch to toggle direct monitoring +On stand-alone audio interfaces, there is often a knob on the device that +controls direct monitoring. This knob crossfades the audio interface's output +between the signal from the computer and the directly monitored inputs. If your +audio interface has a knob like this, set the knob to the center. +Alternatively, some audio interfaces have a switch to toggle direct monitoring instead of a knob. -To hear mono microphone inputs on both sides of the stereo output with +To hear mono microphone inputs on both sides of the stereo output with direct monitoring, you typically need to toggle a switch on the device. -If the audio interface supports :ref:`microphones-loopback-input`, that may +If the audio interface supports :ref:`microphones-loopback-input`, that may be activated by a switch on the device. Audio interfaces with lots of inputs and outputs often have a control panel program provided by the manufacturer that is installed automatically with the -driver. This may be used instead of knobs and switches on the hardware to -control direct monitoring, loopback, stereo/mono switches, and other audio -interface features. On GNU/Linux, you might be able to access these controls +driver. This may be used instead of knobs and switches on the hardware to +control direct monitoring, loopback, stereo/mono switches, and other audio +interface features. On GNU/Linux, you might be able to access these controls with :command:`alsamixer`. Refer to the section below for details about :ref:`microphones-dj-controllers`. @@ -277,42 +277,42 @@ Refer to the section below for details about :ref:`microphones-dj-controllers`. Hardware Mixers ---------------- -Mixxx can be used with a microphone plugged into an external hardware mixer. -This does not have the problem with latency that happens -with :ref:`microphones-software-monitoring`. However, it is generally -recommeded to use an audio interface that supports -:ref:`microphones-direct-monitoring` and a :ref:`microphones-loopback-input` -instead of an external mixer. If you are using :ref:`vinyl-control` and a +Mixxx can be used with a microphone plugged into an external hardware mixer. +This does not have the problem with latency that happens +with :ref:`microphones-software-monitoring`. However, it is generally +recommeded to use an audio interface that supports +:ref:`microphones-direct-monitoring` and a :ref:`microphones-loopback-input` +instead of an external mixer. If you are using :ref:`vinyl-control` and a microphone, you may need an external mixer. -Mixxx can send each deck to separate stereo channels on an external mixer by -using the :guilabel:`Deck 1-4` outputs. This requires an audio interface with -at least 4 output channels (2 stereo pairs). Audio interfaces built into -computers only have one stereo output and they do not have high sound quality. -Thus, another audio interface is recommended. Audio interfaces with at least 4 -output channels typically have microphone inputs and support -:ref:`microphones-direct-monitoring`, so there is no need for the external +Mixxx can send each deck to separate stereo channels on an external mixer by +using the :guilabel:`Deck 1-4` outputs. This requires an audio interface with +at least 4 output channels (2 stereo pairs). Audio interfaces built into +computers only have one stereo output and they do not have high sound quality. +Thus, another audio interface is recommended. Audio interfaces with at least 4 +output channels typically have microphone inputs and support +:ref:`microphones-direct-monitoring`, so there is no need for the external mixer. -However, audio interfaces with phono preamplifiers for :ref:`vinyl-control` do -not have microphone inputs. If you want to use vinyl control with a microphone, +However, audio interfaces with phono preamplifiers for :ref:`vinyl-control` do +not have microphone inputs. If you want to use vinyl control with a microphone, it is recommended to plug the microphone into a DJ mixer. .. warning:: Some mixers that are not designed for DJing have a built-in USB - audio interface. However, the audio interfaces in these mixers - typically send only 2 channels (one stereo pair) to the mixer, so + audio interface. However, the audio interfaces in these mixers + typically send only 2 channels (one stereo pair) to the mixer, so they are not recommended. .. _microphones-record-broadcast-external-mixer: Recording And Broadcasting With An External Hardware Mixer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -To record or broadcast with an external hardware mixer, the output of the mixer -needs to be connected to the input of an audio interface. Most DJ mixers have -an extra output for this which may be labeled "record", "session", "auxiliary", -or "booth". Some audio interfaces for vinyl control have enough input channels -to receive the output of the mixer and timecode from two turntables. If yours -does not, you may use the input of the audio interface built into your +To record or broadcast with an external hardware mixer, the output of the mixer +needs to be connected to the input of an audio interface. Most DJ mixers have +an extra output for this which may be labeled "record", "session", "auxiliary", +or "booth". Some audio interfaces for vinyl control have enough input channels +to receive the output of the mixer and timecode from two turntables. If yours +does not, you may use the input of the audio interface built into your computer, but these do not have high sound quality. .. figure:: ../_static/external-mixing-with-microphone-signal-path.png @@ -322,33 +322,33 @@ computer, but these do not have high sound quality. :alt: Using a microphone with an external mixer :figclass: pretty-figures - Using a microphone with an external DJ mixer and a stand-alone USB audio + Using a microphone with an external DJ mixer and a stand-alone USB audio interface -Alternatively, some DJ mixers have a built-in USB audio interface. These -have inputs with phono preamplifiers for vinyl control and usually can send -the record output back to the computer without a separate audio interface. Many -(but not all) of these mixers are digital mixers, so they can send signals back -and forth to Mixxx without converting them to analog. This results in higher -sound quality for your recorded and broadcasted mixes compared to using a +Alternatively, some DJ mixers have a built-in USB audio interface. These +have inputs with phono preamplifiers for vinyl control and usually can send +the record output back to the computer without a separate audio interface. Many +(but not all) of these mixers are digital mixers, so they can send signals back +and forth to Mixxx without converting them to analog. This results in higher +sound quality for your recorded and broadcasted mixes compared to using a separate audio interface with an external mixer. .. figure:: ../_static/external-mixing-with-microphone-signal-path.png :align: center :width: 80% :figwidth: 100% - :alt: Using a microphone with an external mixer that has a built in USB + :alt: Using a microphone with an external mixer that has a built in USB audio interface :figclass: pretty-figures - Using a microphone with an external mixer that has a built in USB audio + Using a microphone with an external mixer that has a built in USB audio interface - + To configure Mixxx for using a hardware mixer for recording and/or broadcasting: #. Open :menuselection:`Preferences --> Sound Hardware`. -#. In the :guilabel:`Output` tab, select the audio interface for the - :guilabel:`Deck 1-2` outputs (and :guilabel:`Deck 3-4` outputs if your audio +#. In the :guilabel:`Output` tab, select the audio interface for the + :guilabel:`Deck 1-2` outputs (and :guilabel:`Deck 3-4` outputs if your audio interface and mixer support 4 decks). #. Click the :guilabel:`Input` tab. #. For the :guilabel:`Record/Broadcast` input, select the audio interface @@ -360,34 +360,34 @@ To configure Mixxx for using a hardware mixer for recording and/or broadcasting: #. Click the :guilabel:`Apply` button. #. Click the :guilabel:`OK` button. -Do not configure anything for the :guilabel:`Microphone 1-4` inputs when using -an external mixer. The microphone controls in Mixxx will not affect your +Do not configure anything for the :guilabel:`Microphone 1-4` inputs when using +an external mixer. The microphone controls in Mixxx will not affect your microphones because the microphone is mixed by the external mixer. -DJ mixers typically do not supply phantom power required for condenser +DJ mixers typically do not supply phantom power required for condenser microphones. Stand-alone audio interfaces typically do supply phantom power. .. _microphones-dj-controllers: DJ Controllers With Microphone Inputs -------------------------------------- -DJ controllers with microphone inputs typically mix the microphone input with -the master output without sending it to the computer. This does not have the -problem with latency that happens with -:ref:`microphones-software-monitoring`. However, many cheap DJ controllers do -not digitize the signal to make it available to the computer. Refer to the -controller's page on the `Mixxx wiki -`_ or the manual from +DJ controllers with microphone inputs typically mix the microphone input with +the master output without sending it to the computer. This does not have the +problem with latency that happens with +:ref:`microphones-software-monitoring`. However, many cheap DJ controllers do +not digitize the signal to make it available to the computer. Refer to the +controller's page on the `Mixxx wiki +`_ or the manual from the controller manufacturer for details about your particular controller. -If the controller does not digitize the microphone input, you cannot use -Mixxx's microphone input to record or broadcast with the microphone using -Mixxx's :guilabel:`Microphone 1-4` inputs. It is still possible to record and -broadcast the microphone by connecting the booth output of the controller to an -audio interface input and configuring this for Mixxx's -:guilabel:`Record/Broadcast` input. If the controller does not have a booth -output, a Y splitter cable can be used on each side of the stereo main output to -connect the main output to both the speakers and to another audio interface's +If the controller does not digitize the microphone input, you cannot use +Mixxx's microphone input to record or broadcast with the microphone using +Mixxx's :guilabel:`Microphone 1-4` inputs. It is still possible to record and +broadcast the microphone by connecting the booth output of the controller to an +audio interface input and configuring this for Mixxx's +:guilabel:`Record/Broadcast` input. If the controller does not have a booth +output, a Y splitter cable can be used on each side of the stereo main output to +connect the main output to both the speakers and to another audio interface's input. .. figure:: ../_static/dj-controller-with-mic-and-splitter-cables.png @@ -398,8 +398,8 @@ input. broadcast the mix with a microphone :figclass: pretty-figures - Using a DJ controller with Y splitter cables to record and/or broadcast the + Using a DJ controller with Y splitter cables to record and/or broadcast the mix with a microphone - -DJ controllers typically do not supply phantom power required for condenser + +DJ controllers typically do not supply phantom power required for condenser microphones. Stand-alone audio interfaces typically do supply phantom power. diff --git a/source/chapters/preferences.rst b/source/chapters/preferences.rst index 16d0b68b58..8e5e396d63 100644 --- a/source/chapters/preferences.rst +++ b/source/chapters/preferences.rst @@ -112,10 +112,10 @@ It is best to use the ASIO Sound API that bypassses the sound processing of the Windows kernel. Using ASIO requires a driver for your audio interface from the manufacturer. Check the manufacturer's website to see if a driver download is available. Soundcards designed for musicians almost always have an ASIO -driver available, but audio interfaces built into computers and very cheap -audio interfaces typically do not have an ASIO driver. If there is no ASIO -driver available for your audio interface, use the WDM-KS API. There is -generally no advantage to using `ASIO4ALL `_, a wrapper +driver available, but audio interfaces built into computers and very cheap +audio interfaces typically do not have an ASIO driver. If there is no ASIO +driver available for your audio interface, use the WDM-KS API. There is +generally no advantage to using `ASIO4ALL `_, a wrapper around the WDM-KS API. GNU/Linux @@ -154,7 +154,7 @@ console rather than clicking the launcher icon in a menu or on your desktop. Since the sound stream is routed from ALSA to Pulse and back to ALSA, this adds an additional latency of ~2 x the selected audio buffer size. -OSS is an Sound API that predates ALSA. Few modern audio interfaces have OSS +OSS is an Sound API that predates ALSA. Few modern audio interfaces have OSS drivers. macOS @@ -178,9 +178,9 @@ Other Sound Hardware options you do not use the Master output, recording or live broadcasting. * **Master Output Mode**: In Mono mode, the left and right channel are combined - into a mono signal which is passed to both channels of your master audio - interface. This is useful for setups where the audience cannot hear your mix - in stereo because of speaker placement or playing in a space with lots of + into a mono signal which is passed to both channels of your master audio + interface. This is useful for setups where the audience cannot hear your mix + in stereo because of speaker placement or playing in a space with lots of reverberation. * **Buffer Underflow Count**: Underflows (data is not available when needed) @@ -198,10 +198,6 @@ Library Changing music directories -------------------------- -.. versionadded:: 2.0 - Handles multiple music library folders and adds an option to move them to - another location without data loss. - You can manually add, relink, and remove Mixxx music directories in :menuselection:`Preferences --> Library`. @@ -211,10 +207,10 @@ You can manually add, relink, and remove Mixxx music directories in directory and its subdirectories for new tracks. If you add a directory that is already in your library, or you are currently - :ref:`rescanning your library `, the operation is canceled. + :ref:`rescanning your library `, the operation is canceled. - Directories can also be added from the :ref:`Browse ` sidebar - item inside the library. + Directories can also be added from the :ref:`Computer ` + sidebar item inside the library. **Relink a existing music directory** If an existing music directory is moved, Mixxx doesn't know where to find the diff --git a/source/chapters/quickstart.rst b/source/chapters/quickstart.rst index 0f08d1b827..d344c799db 100644 --- a/source/chapters/quickstart.rst +++ b/source/chapters/quickstart.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + Quickstart ********** @@ -5,7 +7,7 @@ If you're new to DJing, this is the section for you. We've got some tutorials for you that cover the basics of DJing with Mixxx. If you already you already know how to DJ and are just looking for an overview of how to get your groove on with Mixxx, you can skip to the `Table of Contents`_. - + .. note:: Example of a note diff --git a/source/chapters/user_interface.rst b/source/chapters/user_interface.rst index e3c5c9a60b..4f5836f5ee 100644 --- a/source/chapters/user_interface.rst +++ b/source/chapters/user_interface.rst @@ -1,3 +1,5 @@ +.. include:: /shortcuts.rstext + .. _interface-overview: An Overview of the Mixxx Interface @@ -56,15 +58,12 @@ Track Information Display The track information section of the deck -.. versionadded:: 2.0 - Parse the title and the artist from the file name when the corresponding - :term:`metadata` is missing. - **Track Title** The title of the track that was loaded into a deck is displayed on top. This is the same as the title listed under the :guilabel:`Title` column heading in the Mixxx library. This information is initially loaded from the track's - :term:`metadata`. + :term:`metadata`. If the metadata is missing, the title and artist are guessed + from the filename. **Track Artist** The artist of the track is listed below. It is the same as listed under the @@ -80,12 +79,18 @@ Track Information Display to the speed you are tapping, go to :ref:`control-keyboard` for more information. -**Time Elapsed/Remaining** +**Time Elapsed/Remaining/Both** + + .. versionadded:: 2.1.0 + Option to show elapsed and remaining time simultaneously + By default it displays the total elapsed time in the track up to the millisecond. Clicking on the display switches to the *Time Remaining* view, which indicates how much time is left before the track reaches the end. + Clicking the display again, both the elapsed and remaining time are shown + simultaneously in the format *elapsed time / remaining time*. You can change the default in :menuselection:`Preferences --> Interface --> - Position Display`. + Track Time Display`. .. _interface-waveform: @@ -135,8 +140,8 @@ separate waveforms. Select your preferred appearance in Mixxx alternative skin (Deere) - Separate waveforms .. warning :: If you have a slower computer and notice performance issues with - Mixxx, try to lower the frame rate or change the waveform type in - :menuselection:`Preferences --> Waveforms`. + Mixxx, try lowering the frame rate or changing the waveform type + in :menuselection:`Preferences --> Interface --> Waveforms`. **Waveform summary** The big waveform summary shows the waveform envelope of the track near the @@ -147,22 +152,23 @@ separate waveforms. Select your preferred appearance in .. hint :: You can select from different types of displays for the waveform, which differ primarily in the level of detail shown in the - waveform, in :menuselection:`Preferences --> Waveforms --> - Summary type`. + waveform, in :menuselection:`Preferences --> Interface --> + Waveforms --> Summary type`. **Waveform overview** - .. versionadded:: 2.0 - - Like with the Waveform summary, you can now select from different types - of displays for the overview in :menuselection:`Preferences --> Waveforms - --> Overview type`. + .. versionadded:: 2.1.0 + Darken played part of track in decks and samplers The smaller, zoomed-out version of the waveform shows the various markers within the track as well as the waveform envelope of the entire track. This is - useful because they allow DJs to see breakdowns far in advance. Clicking - somewhere on the waveform allows you to jump to an arbitrary position in the - track. + useful because they allow DJs to see breakdowns far in advance. As visual aid, + the part of the track that has already been played is darkened. + + Clicking somewhere on the waveform allows you to jump to an arbitrary position + in the track. Like with the Waveform summary, you can select from different + types of displays for the overview in + :menuselection:`Preferences --> Interface --> Waveforms --> Overview type`. **Vinyl Widget** The line on the vinyl widget rotates if the track moves. It is similar to the @@ -180,13 +186,14 @@ separate waveforms. Select your preferred appearance in **Waveform Zoom** Using the mouse-wheel everywhere in the waveform summary will zoom the waveform in or out. You can choose whether to synchronize the zoom level - between the decks in :menuselection:`Preferences --> Waveforms`. + between the decks in :menuselection:`Preferences --> Interface --> Waveforms`. **Waveform Marker** While mixing, various additional markers can appear on the waveforms: * **Position marker**: The static vertical line in the center of the waveform - summary indicates the playback point of the deck. + summary indicates the playback point of the deck. The waveform overview + includes a vertical line to show the current position within the track. * **Beat marker**: The regular white lines on the waveform summary indicate the locations of beats in the audio, also called the :term:`beatgrid`. * **Cue marker**: Indicates the position of the :term:`cue point `. @@ -301,21 +308,18 @@ Auto Cue Mixxx automatically seeks to the saved Cue point on track load. If none exists, seeks to the beginning of the track. -Uncheck :menuselection:`Preferences --> Interface --> Auto Cue` to always -seek to the beginning of the track. +Uncheck :menuselection:`Preferences --> Interface --> Auto Cue --> Jump to main +cue point on track load` to always seek to the beginning of the track. .. _interface-cue-modes: Using Cue Modes ^^^^^^^^^^^^^^^ -.. versionadded:: 2.0 - The Mixxx/Pioneer/Denon/Numark Cue modes gives users now even more flexibility. - Mixxx supports various Cue modes that adapt to fit other devices in your setup, or your personal preferences. The actual behavior of the Play, Pause, and Cue buttons depends on the selected Cue mode. To change the Cue mode, go to -:menuselection:`Preferences --> Interface`. +:menuselection:`Preferences --> Interface --> Cue mode`. **Mixxx mode (default)** @@ -376,6 +380,24 @@ Cue buttons depends on the selected Cue mode. To change the Cue mode, go to * This mode is useful if you want to implement a custom skin with 3-button decks, featuring a Cue button, a dedicated Pause button, and a Play/Stutter button. +**CUP (Cue + Play) mode** + +* **While paused at Cue point (Cue button lit):** + + * Continue playback by releasing the Cue button. + +* **While paused not at Cue point (Cue button flashing)**: + + * Tapping the Cue button stores the current position as new Cue point. + Continue playback by releasing the Cue button. + +* **While playing:** + + * Tapping the Cue button causes the track to instantly jump to the location of + the Cue point where it pauses the playback. Continue playback by releasing + the Cue button. + * Tapping the Play/Pause button pauses the track at the current position. + .. hint:: Use the :ref:`interface-hotcues` to place more reference points on a track. @@ -400,9 +422,6 @@ Transport Controls The transport controls of the deck -.. versionadded:: 2.0 - Right-click on the Reverse button activates Reverse Roll (Censor) - **Fast-Rewind button** As long as the button is pressed, the track will play in reverse with increased speed. Right-clicking on the button will seek the play position to @@ -534,7 +553,8 @@ sync targets for decks are chosen with the new master sync feature, see .. seealso:: To customize the amount by which the buttons alter the pitch of the track, the slider range as well as the direction, go to - :menuselection:`Preferences --> Interface`. + :menuselection:`Preferences --> Interface --> + Adjustment buttons --> Permanent / Temporary`. .. hint:: If the tempo of a track changes, you'll notice that the tone changes based on the pitch used (e.g. playing at faster pitch gives a chipmunk @@ -647,6 +667,18 @@ Playing Hotcues Press the :ref:`Play ` keyboard shortcut while the hotcue button is pressed to continue playback, then release the hotcue button. +Hotcue labels +^^^^^^^^^^^^^ + +.. versionadded:: 2.1.0 + +You can add custom names to hotcues. Right-clicking on a selected track in the +:ref:`track list ` reveals the context menu. +Choose :menuselection:`Properties --> Cuepoints --> Label` and add a label for +the hotcue. Press :kbd:`Enter` , then click :guilabel:`OK` to save. + +The hotcue indicator on the waveform changes to the format ``#:label``. + Deleting Hotcues ^^^^^^^^^^^^^^^^ @@ -756,28 +788,23 @@ Headphone and Master Mix Controls The headphone and master mix knobs -.. todo:: There is no Head-Split Button in Latenight as of v2.0.0. - -.. versionadded:: 2.0 - Headphone split cue option - **Pre/Main Knob** Allows you to control how much of the master output you hear in the - :guilabel:`Headphones` output. It works like a crossfader between the stereo - Master and stereo :term:`PFL` signal. If the knob is set to the left, you + :guilabel:`Headphones` output. It works like a crossfader between the stereo + Master and stereo :term:`PFL` signal. If the knob is set to the left, you only hear the PFL signal, which is the usual position for prelistening tracks. - - This can be used to practice DJing with only one stereo output and a set + + This can be used to practice DJing with only one stereo output and a set of either speakers or headphones. - - Additionally, this can be used to mix in headphones when you cannot hear the - speakers connected to the :guilabel:`Master` output and there are no booth - monitor speakers. Some DJs prefer to use this knob to mix in headphones all - the time, but many find it to be a difficult way to play. If there is only one - set of speakers and no booth monitors, you can avoid the need to mix in - headphones by setting up the speakers behind you so both you and your + + Additionally, this can be used to mix in headphones when you cannot hear the + speakers connected to the :guilabel:`Master` output and there are no booth + monitor speakers. Some DJs prefer to use this knob to mix in headphones all + the time, but many find it to be a difficult way to play. If there is only one + set of speakers and no booth monitors, you can avoid the need to mix in + headphones by setting up the speakers behind you so both you and your audience can hear them. - + .. note:: Don't forget to activate the :guilabel:`PFL` button on the deck you want to listen to in your headphones. @@ -1057,13 +1084,14 @@ Sample Deck Controls The Effects Section =================== - .. figure:: ../_static/effect-unit-collapsed.png - :align: center - :figwidth: 100% - :alt: An effect unit - :figclass: pretty-figures - An effect unit +.. figure:: ../_static/effect-unit-collapsed.png + :align: center + :figwidth: 100% + :alt: An effect unit + :figclass: pretty-figures + + An effect unit Mixxx comes with some built in sound effects that can be chained together in effect units. Effect units can be freely assigned to different decks as well @@ -1090,12 +1118,12 @@ The Microphone Section The Microphone section -The microphone section is **hidden** in the default :ref:`Mixxx user interface -`. Click the :ref:`MIC ` -button in the mixer section, or use the specific :ref:`appendix-shortcuts` to +The microphone section is **hidden** in the default :ref:`Mixxx user interface +`. Click the :ref:`MIC ` +button in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section. -.. seealso:: The :ref:`microphones` chapter has detailed instructions for +.. seealso:: The :ref:`microphones` chapter has detailed instructions for setting up microphones with various hardware. Microphone Controls diff --git a/source/chapters/vinyl_control.rst b/source/chapters/vinyl_control.rst index f323a68961..e6eb1bec33 100644 --- a/source/chapters/vinyl_control.rst +++ b/source/chapters/vinyl_control.rst @@ -1,4 +1,3 @@ - .. include:: /shortcuts.rstext .. _vinyl-control: @@ -45,9 +44,9 @@ with timecode control. The basic setups for timecode control are: 2-4 timecode vinyls, 2-4 turntables with phono pre-amplifiers (or line-level output), and 2-4 stereo sound inputs. - Your audio interface inputs must match the turntable outputs. Turntables + Your audio interface inputs must match the turntable outputs. Turntables output very quiet phono-level outputs that must be amplified for Mixxx to use. - You should either find a audio interface that has phono pre-amplifiers built + You should either find a audio interface that has phono pre-amplifiers built in (one for each deck), use standalone phono pre-amplifiers, or use turntables with built in phono pre-amplifiers. @@ -56,7 +55,7 @@ with timecode control. The basic setups for timecode control are: Line-level signals are preferred and recommended. For turntables a typical setup is depicted in the figure below. First, - connect the RCA cables from the turntables to the inputs on your audio + connect the RCA cables from the turntables to the inputs on your audio interface. Second, connect the outputs of your audio interface to the inputs on your mixer. @@ -84,7 +83,7 @@ with timecode control. The basic setups for timecode control are: Setting up CDJs for use with timecode CDs is similar to setting up turntables. The figure below outlines a typical configuration. First, connect the RCA cables of the CDJs to inputs of your audio interface. Second, - connect the inputs of your mixer to the outputs of your audio interface. Make + connect the inputs of your mixer to the outputs of your audio interface. Make sure the input mode of your audio interface is set to *Line*. .. figure:: ../_static/mixxx_setup_timecode_cdj.png @@ -100,16 +99,16 @@ with timecode control. The basic setups for timecode control are: * It is recommended to use a DJ audio interface that has **multiple** stereo line inputs on it. -* Alternatively you can use multiple audio interfaces, each with a single stereo +* Alternatively you can use multiple audio interfaces, each with a single stereo line in, but this is strongly discouraged. -Mixxx supports vinyl control input through a single audio interface with at +Mixxx supports vinyl control input through a single audio interface with at least 4-channels of input (two stereo line-in jacks), or through multiple separate -audio interfaces which each have 2-channels of input (a single stereo line-in +audio interfaces which each have 2-channels of input (a single stereo line-in jack). Vinyl control requires the use of stereo line-in jacks - Mono or microphone inputs will not work. -It is strongly recommended to use a audio interface that comes with native low +It is strongly recommended to use a audio interface that comes with native low latency drivers such as ASIO (Windows) or CoreAudio (Mac). Linux users depend on the quality of the corresponding open source driver. @@ -167,10 +166,10 @@ timecoded CDs. #. Open :menuselection:`Preferences --> Sound Hardware` #. Select the :guilabel:`Input` tab #. From the :guilabel:`Vinyl Control 1` - :guilabel:`Vinyl Control 4` - drop-down menus, select the audio interface(s) which your decks are plugged + drop-down menus, select the audio interface(s) which your decks are plugged into. #. In the channel selection drop-down menu, select the channel pairs - corresponding to the plug on your audio interface that your deck(s) are + corresponding to the plug on your audio interface that your deck(s) are plugged into, typically :guilabel:`Channels 1-2` and :guilabel:`Channels 3-4` etc. #. Click :guilabel:`Apply` to save the changes. @@ -200,7 +199,7 @@ Turntable Input Signal Boost Many turntables provide unamplified “phono level” output which must be boosted to a “line level” signal. Normally, a mixer or audio interface provides this amplification, but if you're plugging a turntable's phono output directly into -a audio interface that doesn't support phono input, Mixxx can do the +a audio interface that doesn't support phono input, Mixxx can do the amplification. The :guilabel:`Turntable Input Signal Boost` slider allows you to adjust the level of preamplification applied to your decks' signal. However, it is always preferable to use a proper phono preamplifier if you have one. @@ -441,7 +440,7 @@ Signal Meaning Troubleshooting -------------- ------------------------------------ ------------------------------------ |too_loud| Timecode signal too loud. Lower the amplification, either on Mixxx receives a signal which has your external mixer, audio - too much amplification. interface, or with the `Turntable + too much amplification. interface, or with the `Turntable Input Signal Boost`_. -------------- ------------------------------------ ------------------------------------ |too_quiet| Timecode signal too quiet. Boost the amplification, either on diff --git a/source/conf.py b/source/conf.py index 11433bdee0..05c776caba 100644 --- a/source/conf.py +++ b/source/conf.py @@ -33,7 +33,7 @@ 'sphinx.ext.graphviz', ] -todo_include_todos = False +todo_include_todos = True # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -49,7 +49,7 @@ # General information about the project. project = u'Mixxx' -copyright = u'2011-2015, The Mixxx Development Team' +copyright = u'2011-2018, The Mixxx Development Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -286,7 +286,7 @@ epub_title = u'Mixxx User Manual' epub_author = u'The Mixxx Development Team' epub_publisher = u'The Mixxx Development Team' -epub_copyright = u'2011-2015, The Mixxx Development Team' +epub_copyright = u'2011-2018, The Mixxx Development Team' # The basename for the epub file. It defaults to the project name. #epub_basename = u'Mixxx' diff --git a/source/glossary.rst b/source/glossary.rst index ce96c990bd..ef1b2d49bf 100644 --- a/source/glossary.rst +++ b/source/glossary.rst @@ -20,9 +20,9 @@ Glossary of Terms The headphone output is what you hear in your headphones. PFL - ``PFL`` or “pre-fader listen” is the headphone signal that is not affected - by the deck volume faders. This allows for pre-listening tracks in - headphones by lowering the volume fader so the deck plays only to + ``PFL`` or “pre-fader listen” is the headphone signal that is not affected + by the deck volume faders. This allows for pre-listening tracks in + headphones by lowering the volume fader so the deck plays only to headphones but not to the audience. See also: :term:`headphone button`. waveform summary @@ -45,14 +45,14 @@ Glossary of Terms operating system Your operating system (OS) is the computing environment on your - computer. For example, Windows, Mac OS X, or GNU/Linux are the three + computer. For example, Windows, macOS, or GNU/Linux are the three operating systems that Mixxx supports. file manager A computer program that organizes data files into groups and shows you where they are when you need to find them again. Popular file managers for the :term:`operating systems ` Mixxx supports are - Explorer on Windows, Finder on Mac OS X and Nautilus on GNU/Linux. + Explorer on Windows, Finder on macOS and Nautilus on GNU/Linux. head/mix button The head/mix button is used to control how much you mix the :term:`master @@ -70,9 +70,16 @@ Glossary of Terms play it. IRC - Internet Relay Chat (IRC) is a an online chat network. The Mixxx IRC - channel can be found on the `FreeNode IRC Network `_ - in the #mixxx channel. + Internet Relay Chat (IRC) is an online chat network. The Mixxx IRC channel + was on the `FreeNode IRC Network `_ in the ``#mixxx`` + channel. The channel was replaced in 2018 by the + :term:`Mixxx Zulip Chat `. + + Zulip + `Zulip `_ is a powerful, open source group chat + application that combines the immediacy of real-time chat with the + productivity benefits of threaded conversations. The ``Mixxx Zulip Chat`` + at can be found at ``_ . BPM Beats per minute (BPM) is used as a measure of tempo in music. @@ -330,12 +337,13 @@ Glossary of Terms are relieved of the task of having to compile the code by yourself. audio interface - An audio interface is a device that facilitates the input and output of - audio signals to and from a computer, typically connected by USB. Almost + audio interfaces + An audio interface is a device that facilitates the input and output of + audio signals to and from a computer, typically connected by USB. Almost all computers come with a basic audio interface built in, but a higher quality audio interface with at least 4 output channels is recommended for Mixxx. - + soundcard soundcards Another name for an :term:`audio interface`, although few audio interfaces @@ -383,7 +391,7 @@ Glossary of Terms way authorized by copyright holders or marks content with a digital watermark or similar method so that the content can not be freely distributed. For information about how you can get involved in activism - against DRM, see `Defective by Design `_. + against DRM, see `Defective by Design `_. shoutcast Shoutcast is proprietary software that allows digital audio content to be @@ -411,7 +419,7 @@ Glossary of Terms Uniform Resource Locator. The address that defines the route to a file on an Internet server. URLs are typed into a Web browser to access Web pages and files, and URLs are embedded within the pages themselves as hypertext - links. One example of a URL is ``_ . + links. One example of a URL is ``_ . quantization Quantization is the process of aligning notes and other events like loops @@ -444,7 +452,7 @@ Glossary of Terms MusicBrainz A open-source music encyclopedia that collects music :term:`metadata` and makes it available to the public. For more information, see - ``_. + ``_. AcoustID An acoustic fingerprint system built entirely on :term:`open-source` @@ -459,3 +467,21 @@ Glossary of Terms this is the Sound API that Mixxx uses to communicate with the :term:`Operating System` to make use of the :term:`soundcards` connected to the computer. + + macOS + macOS (originally named "Mac OS X" until 2012 and then "OS X" until 2016) + is the current Mac operating system that officially succeeded the classic + Mac OS in 2001. + + EQ + Equalizer + An equalizer allows the sound in specified frequency bands to be amplified + or reduced, in order to adjust the quality and character of the sound. + + A simple graphic equalizer consists of multiple controls for boosting or + cutting bands or frequencies of sound. + + A parametric equalizer controls more parameters of the sound than a graphic + equalizer. It can control three aspects of each frequency: level (boost or + cut), the center or primary frequency, and the bandwidth or range of each + frequency. diff --git a/source/index.rst b/source/index.rst index bd4671b713..807f857e01 100644 --- a/source/index.rst +++ b/source/index.rst @@ -3,22 +3,25 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. +.. include:: /shortcuts.rstext + Mixxx |version| User Manual *************************** -Mixxx is a `free `_ DJ software for -Windows, Mac OS X and Linux. It's easy to use, even if you've never DJed. +Mixxx is a `free `_ DJ software for +Windows, macOS and Linux. It's easy to use, even if you've never DJed. Mixxx offers a variety of features to help beginners get started and help experienced DJs get creative: + * beat, tempo, and musical key detection * master sync * hotcues * looping * 4 decks * effects -You can use Mixxx to perform with :term:`MIDI` and :term:`HID` -controllers, CD players, vinyl turntables or even just your -computer's keyboard and mouse. + +You can use Mixxx to perform with :term:`MIDI` and :term:`HID` controllers, +CD players, vinyl turntables or even just your computer's keyboard and mouse. Table of Contents ----------------- diff --git a/source/locale/pot/chapters/advanced_topics.pot b/source/locale/pot/chapters/advanced_topics.pot index 9940457c91..006c82f61e 100644 --- a/source/locale/pot/chapters/advanced_topics.pot +++ b/source/locale/pot/chapters/advanced_topics.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,339 +16,339 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/advanced_topics.rst:5 +#: ../../chapters/advanced_topics.rst:5 msgid "Advanced Topics" msgstr "" -#: ../../source/chapters/advanced_topics.rst:10 +#: ../../chapters/advanced_topics.rst:10 msgid "Adding support for your MIDI/HID Controller" msgstr "" -#: ../../source/chapters/advanced_topics.rst:12 -msgid "With several dozens DJ controllers supported out-of-the-box, Mixxx gives you comprehensive hardware control for your DJ mixes, see :ref:`control-midi`." +#: ../../chapters/advanced_topics.rst:12 +msgid "With several dozens of DJ controllers supported out-of-the-box, Mixxx gives you comprehensive hardware control for your DJ mixes, see :ref:`control-midi`." msgstr "" -#: ../../source/chapters/advanced_topics.rst:15 +#: ../../chapters/advanced_topics.rst:15 msgid "Support for additional devices can be added to Mixxx by creating a new preset file. This file tells Mixxx how to translate, or map, :term:`MIDI`/:term:`HID` messages from a controller into commands that Mixxx understands." msgstr "" -#: ../../source/chapters/advanced_topics.rst:19 +#: ../../chapters/advanced_topics.rst:19 msgid "You can download and share custom controller presets in the `Mixxx User customizations forums `_." msgstr "" -#: ../../source/chapters/advanced_topics.rst:26 +#: ../../chapters/advanced_topics.rst:26 msgid "Controller Wizard" msgstr "" -#: ../../source/chapters/advanced_topics.rst:35 +#: ../../chapters/advanced_topics.rst:35 msgid "Mixxx Controller Wizard - Mapping a control" msgstr "" -#: ../../source/chapters/advanced_topics.rst:37 +#: ../../chapters/advanced_topics.rst:37 msgid "By far, the easiest way to create a new MIDI preset is by using the Controller Wizard." msgstr "" -#: ../../source/chapters/advanced_topics.rst:40 +#: ../../chapters/advanced_topics.rst:40 msgid "Connect your controller(s) to your computer" msgstr "" -#: ../../source/chapters/advanced_topics.rst:41 +#: ../../chapters/advanced_topics.rst:41 msgid "Start Mixxx" msgstr "" -#: ../../source/chapters/advanced_topics.rst:42 +#: ../../chapters/advanced_topics.rst:42 msgid "Go to :menuselection:`Preferences --> Controllers`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:43 +#: ../../chapters/advanced_topics.rst:43 msgid "Select your device from the list of available devices on the left, and the right pane will change" msgstr "" -#: ../../source/chapters/advanced_topics.rst:45 +#: ../../chapters/advanced_topics.rst:45 msgid "Activate the :guilabel:`Enabled` checkbox" msgstr "" -#: ../../source/chapters/advanced_topics.rst:46 +#: ../../chapters/advanced_topics.rst:46 msgid "Click on :guilabel:`Learning Wizard` to open the selection dialog" msgstr "" -#: ../../source/chapters/advanced_topics.rst:47 +#: ../../chapters/advanced_topics.rst:47 msgid "Click any control in the Mixxx :term:`GUI`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:48 +#: ../../chapters/advanced_topics.rst:48 msgid "Alternatively, click the :guilabel:`Choose Control` button and choose one from the selection list" msgstr "" -#: ../../source/chapters/advanced_topics.rst:50 +#: ../../chapters/advanced_topics.rst:50 msgid "Push :guilabel:`Learn` and then move a control or push a button on your controller to map it. You can also move a control without pushing the :guilabel:`Learn` button if you are learning many controls." msgstr "" -#: ../../source/chapters/advanced_topics.rst:53 +#: ../../chapters/advanced_topics.rst:53 msgid "If you are learning a button, just push it once. If you are learning a knob or a slider, try to move it throughout its range." msgstr "" -#: ../../source/chapters/advanced_topics.rst:55 -msgid "After Mixxx detects the control, you may click :guilabel:`Learn Another` or you can just click on another button in the Mixxx :term:`GUI` to learn another control." +#: ../../chapters/advanced_topics.rst:55 +msgid "After Mixxx detects the control, you may click :guilabel:`Learn Another` or you can click on another button in the Mixxx :term:`GUI` to learn another control." msgstr "" -#: ../../source/chapters/advanced_topics.rst:58 +#: ../../chapters/advanced_topics.rst:58 msgid "When you are finished mapping controls, click :guilabel:`Done`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:60 +#: ../../chapters/advanced_topics.rst:60 msgid "There are also some advanced options in the Midi Wizard you may need to use:" msgstr "" -#: ../../source/chapters/advanced_topics.rst:62 -msgid "Soft Takeover: Use this option for knobs or sliders to avoid sudden jumps in value when the knob in the term:`GUI` doesn't match the physical knob. If you select this option, you won't be able to perform super-fast motions as easily. (Recommended off)" +#: ../../chapters/advanced_topics.rst:62 +msgid "Soft Takeover: Use this option for knobs or sliders to avoid sudden jumps in when the knob in the :term:`GUI` doesn't match the physical knob. If you select this option, you won't be able to perform super-fast motions as easily. (Recommended off)" msgstr "" -#: ../../source/chapters/advanced_topics.rst:66 -msgid "Invert: Use this option for controls that you want to work backwards from how they were detected." +#: ../../chapters/advanced_topics.rst:66 +msgid "Invert: Use this option for controls that you want to work backwards from how they were detected." msgstr "" -#: ../../source/chapters/advanced_topics.rst:68 +#: ../../chapters/advanced_topics.rst:68 msgid "Switch Mode: Use this option on controllers that have controls that act like switches and emit one value on the first press, and a different value on the next press. (Think an actual hardware toggle switch, or a button that lights up on the first press and turns off on the second press)." msgstr "" -#: ../../source/chapters/advanced_topics.rst:72 +#: ../../chapters/advanced_topics.rst:72 msgid "Jog Wheel / Select Knob: Use this for knobs that don't have a beginning or an end, but spin continuously." msgstr "" -#: ../../source/chapters/advanced_topics.rst:75 +#: ../../chapters/advanced_topics.rst:75 msgid "The Controller wizard saves the new preset to the following file paths:" msgstr "" -#: ../../source/chapters/advanced_topics.rst:77 +#: ../../chapters/advanced_topics.rst:77 msgid "Linux: :file:`/home//.mixxx/controllers`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:78 +#: ../../chapters/advanced_topics.rst:78 msgid "Mac OS X: :file:`/Users//Library/Application\\ Support/Mixxx/controllers`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:79 +#: ../../chapters/advanced_topics.rst:79 msgid "Windows: :file:`%LOCALAPPDATA%\\\\Mixxx\\\\controllers`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:81 +#: ../../chapters/advanced_topics.rst:81 msgid "You can then modify the XML file it creates (or any of the ones that ship with Mixxx) if you'd like to fine-tune it or add more presets. For more information, go to ``_." msgstr "" -#: ../../source/chapters/advanced_topics.rst:86 +#: ../../chapters/advanced_topics.rst:86 msgid "The Controller Wizard works only for :term:`MIDI` devices. Currently you can't map modifier (shift) keys and platter rotations. Use :ref:`MIDI Scripting ` instead." msgstr "" -#: ../../source/chapters/advanced_topics.rst:93 +#: ../../chapters/advanced_topics.rst:93 msgid "MIDI Scripting" msgstr "" -#: ../../source/chapters/advanced_topics.rst:95 +#: ../../chapters/advanced_topics.rst:95 msgid "In order to support the advanced features of many :term:`MIDI`/:term:`HID` controllers, Mixxx offers what we call MIDI Scripting." msgstr "" -#: ../../source/chapters/advanced_topics.rst:98 -msgid "It enables MIDI controls to be mapped to `QtScript `_ (aka Javascript/EMCAScript) functions stored in function library files, freeing Mixxx from a one-to-one MIDI mapping ideology. These user-created functions can then do anything desired with the MIDI event info such as have a single controller button simultaneously affect two or more Mixxx properties (“controls”,) adjust incoming control values to work better with Mixxx (scratching,) display a complex LED sequence, or even send messages to text displays on the controller." +#: ../../chapters/advanced_topics.rst:98 +msgid "It enables MIDI controls to be mapped to `QtScript `_ (aka Javascript/EMCAScript) functions stored in function library files, freeing Mixxx from a one-to-one MIDI mapping ideology. These user-created functions can then do anything desired with the MIDI event such as have a single controller button simultaneously affect two or more Mixxx properties (“controls”), adjust incoming control values to work better with Mixxx (scratching), display a complex LED sequence, or even send messages to text displays on the controller." msgstr "" -#: ../../source/chapters/advanced_topics.rst:107 +#: ../../chapters/advanced_topics.rst:107 msgid "For more information, go to ``_ and ``_." msgstr "" -#: ../../source/chapters/advanced_topics.rst:113 +#: ../../chapters/advanced_topics.rst:113 msgid "Making a Custom Keyboard Mapping" msgstr "" -#: ../../source/chapters/advanced_topics.rst:115 +#: ../../chapters/advanced_topics.rst:115 msgid "The :ref:`default keyboard mappings` are defined in a text file which can be found at the following location:" msgstr "" -#: ../../source/chapters/advanced_topics.rst:118 +#: ../../chapters/advanced_topics.rst:118 msgid "Linux: :file:`/usr/local/share/mixxx/keyboard/en_US.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:119 +#: ../../chapters/advanced_topics.rst:119 msgid "Mac OS X: :file:`/Applications/Mixxx.app/Contents/Resources/keyboard/en_US.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:120 +#: ../../chapters/advanced_topics.rst:120 msgid "Windows: :file:`\\\\keyboard\\\\en_US.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:122 -msgid "Depending on your systems language settings, Mixxx might use a different file as default, e.g. :file:`de_DE.kbd.cfg` for German or :file:`es_ES.kbd.cfg` for Spanish." +#: ../../chapters/advanced_topics.rst:122 +msgid "Depending on your system's language settings, Mixxx might use a different file as default, e.g. :file:`de_DE.kbd.cfg` for German or :file:`es_ES.kbd.cfg` for Spanish." msgstr "" -#: ../../source/chapters/advanced_topics.rst:126 -msgid "It is not recommended to modify the system-wide keyboard mapping file because all your changes can be lost if you uninstall or upgrade Mixxx. Instead, copy the default mapping file to the following location:" +#: ../../chapters/advanced_topics.rst:126 +msgid "It is not recommended that you modify the system-wide keyboard mapping file because all your changes may be lost if you uninstall or upgrade Mixxx. Instead, copy the default mapping file to the following location:" msgstr "" -#: ../../source/chapters/advanced_topics.rst:130 +#: ../../chapters/advanced_topics.rst:130 msgid "Linux: :file:`~/.mixxx/Custom.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:131 +#: ../../chapters/advanced_topics.rst:131 msgid "Mac OS X: :file:`~/Library/Application\\ Support/Mixxx/Custom.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:132 -msgid "Windows: :file:`%USERPROFILE%\\\\Local Settings\\\\Application Data\\\\Mixxx\\\\Custom.kbd.cfg`" +#: ../../chapters/advanced_topics.rst:132 +msgid "Windows: :file:`%LOCALAPPDATA%\\\\Mixxx\\\\Custom.kbd.cfg`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:134 -msgid "Then edit this file and save the changes. On the next startup, Mixxx will check if :file:`Custom.kbd.cfg` is present and load that file instead of the default mapping file. This has the advantage, that you can always revert back to the default mapping, just by deleting :file:`Custom.kbd.cfg`." +#: ../../chapters/advanced_topics.rst:134 +msgid "Then edit this file and save the changes. On the next startup, Mixxx will check if :file:`Custom.kbd.cfg` is present and load that file instead of the default mapping file. This has the advantage that you can always revert back to the default mapping by deleting :file:`Custom.kbd.cfg`." msgstr "" -#: ../../source/chapters/advanced_topics.rst:139 +#: ../../chapters/advanced_topics.rst:139 msgid "For a list of controls that can be used in a keyboard mapping, see ``_." msgstr "" -#: ../../source/chapters/advanced_topics.rst:142 +#: ../../chapters/advanced_topics.rst:142 msgid "You can download and share custom keyboard mappings in the `Mixxx User customizations forums `_." msgstr "" -#: ../../source/chapters/advanced_topics.rst:148 +#: ../../chapters/advanced_topics.rst:148 msgid "Additional Effects via external Mixer Mode" msgstr "" -#: ../../source/chapters/advanced_topics.rst:150 -msgid "Mixxx does not have an effects engine yet (work on one is in progress). To hold you over you can use some external tools. Using the :ref:`external mixer mode ` you route each deck directly to 3rd party effect hosts." +#: ../../chapters/advanced_topics.rst:150 +msgid "Mixxx comes with a set of :ref:`native effects `. Additionally, using the :ref:`external mixer mode ` you can route each deck directly to 3rd party effect hosts." msgstr "" -#: ../../source/chapters/advanced_topics.rst:155 -msgid "The following examples are only intended to encourage experimentation, they are no definitive guidance." +#: ../../chapters/advanced_topics.rst:154 +msgid "The following examples are only intended to encourage experimentation, they are not definitive guidance." msgstr "" -#: ../../source/chapters/advanced_topics.rst:159 +#: ../../chapters/advanced_topics.rst:158 msgid "Effects via AU Lab on Mac OS X" msgstr "" -#: ../../source/chapters/advanced_topics.rst:168 +#: ../../chapters/advanced_topics.rst:167 msgid "The Au Lab routing for external effects on Mac OS X" msgstr "" -#: ../../source/chapters/advanced_topics.rst:170 -msgid "On Mac OS X there is a pretty simple and free way to give Mixxx access to the collection of AU/VST/MAS plugins that are installed on your system." +#: ../../chapters/advanced_topics.rst:169 +msgid "On Mac OS X there is a simple and free way to give Mixxx access to the collection of AU/VST/MAS plugins that are installed on your system." msgstr "" -#: ../../source/chapters/advanced_topics.rst:173 +#: ../../chapters/advanced_topics.rst:172 msgid "Install the free `Soundflower `_, a system extension for inter-application audio routing." msgstr "" -#: ../../source/chapters/advanced_topics.rst:175 +#: ../../chapters/advanced_topics.rst:174 msgid "Download AU Lab.app standalone from Apple (you will need an free Apple Developer Login though), go to the `Downloads for Developers `_ page and search for “AU Lab” to get it." msgstr "" -#: ../../source/chapters/advanced_topics.rst:180 +#: ../../chapters/advanced_topics.rst:179 msgid "**In Mixxx**" msgstr "" -#: ../../source/chapters/advanced_topics.rst:182 +#: ../../chapters/advanced_topics.rst:181 msgid "Go to :menuselection:`Preferences --> Sound Hardware--> Output`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:183 +#: ../../chapters/advanced_topics.rst:182 msgid "Select for :guilabel:`Deck 1` the :guilabel:`Soundflower 16` device with :guilabel:`Channel 1-2`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:185 +#: ../../chapters/advanced_topics.rst:184 msgid "Select for :guilabel:`Deck 2` the :guilabel:`Soundflower 16` device with :guilabel:`Channel 3-4`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:187 +#: ../../chapters/advanced_topics.rst:186 msgid "Click the :guilabel:`Apply` button" msgstr "" -#: ../../source/chapters/advanced_topics.rst:189 +#: ../../chapters/advanced_topics.rst:188 msgid "**In AU Lab**" msgstr "" -#: ../../source/chapters/advanced_topics.rst:191 +#: ../../chapters/advanced_topics.rst:190 msgid "Click on the :guilabel:`+` button to create a new configuration" msgstr "" -#: ../../source/chapters/advanced_topics.rst:192 -msgid "Add 2 stereo inputs tracks in the :guilabel:`Audio Input Tab`" +#: ../../chapters/advanced_topics.rst:191 +msgid "Add 2 stereo input tracks in the :guilabel:`Audio Input Tab`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:193 +#: ../../chapters/advanced_topics.rst:192 msgid "Add 2 stereo output tracks in the :guilabel:`Audio Output Tab`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:194 +#: ../../chapters/advanced_topics.rst:193 msgid "Click :guilabel:`OK`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:195 +#: ../../chapters/advanced_topics.rst:194 msgid "Change the audio input device to :guilabel:`Soundflower 16`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:196 +#: ../../chapters/advanced_topics.rst:195 msgid "Change the audio output device for example to :guilabel:`Built-in Output`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:197 +#: ../../chapters/advanced_topics.rst:196 msgid "Click :guilabel:`Create document`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:198 +#: ../../chapters/advanced_topics.rst:197 msgid "In the :guilabel:`Output 1` channel, select an effect from the drop-down menu, for example :guilabel:`Apple > AUCompressor`" msgstr "" -#: ../../source/chapters/advanced_topics.rst:201 +#: ../../chapters/advanced_topics.rst:200 msgid "The effect should now react if you play a track in Mixxx." msgstr "" -#: ../../source/chapters/advanced_topics.rst:204 +#: ../../chapters/advanced_topics.rst:203 msgid "Effects via JACK Rack on GNU/Linux" msgstr "" -#: ../../source/chapters/advanced_topics.rst:213 +#: ../../chapters/advanced_topics.rst:212 msgid "The Jack routing for external effects on GNU/Linux" msgstr "" -#: ../../source/chapters/advanced_topics.rst:215 -msgid "Use `Jack `_ to route each deck directly through `JACK Rack `_ effect racks, or for more control you can use Ardour (or other DAW) using sends for effects. This gives Mixxx access to the extensive collection of LADSPA plugins." +#: ../../chapters/advanced_topics.rst:214 +msgid "Use `Jack `_ to route each deck directly through `JACK Rack `_ effect racks, or for more control you can use Ardour (or another DAW) using sends for effects. This gives Mixxx access to the extensive collection of LADSPA plugins." msgstr "" -#: ../../source/chapters/advanced_topics.rst:221 +#: ../../chapters/advanced_topics.rst:220 msgid "Make sure the correct multichannel sound card has been selected in Jack (Jack settings visible bottom left). Note that Mixxx possibly labels its Jack ports as “Portaudio”." msgstr "" -#: ../../source/chapters/advanced_topics.rst:226 +#: ../../chapters/advanced_topics.rst:225 msgid "Deleting Your Library" msgstr "" -#: ../../source/chapters/advanced_topics.rst:228 +#: ../../chapters/advanced_topics.rst:227 msgid "The library file is stored in the following places depending on your :term:`operating system`:" msgstr "" -#: ../../source/chapters/advanced_topics.rst:235 +#: ../../chapters/advanced_topics.rst:234 msgid "**Windows**" msgstr "" -#: ../../source/chapters/advanced_topics.rst:232 +#: ../../chapters/advanced_topics.rst:231 msgid "The Mixxx library is stored in the :file:`%USERPROFILE%\\\\Local Settings\\\\Application Data\\\\Mixxx\\\\` folder. To delete your library on Windows, delete the :file:`mixxxdb.sqlite` file in this folder." msgstr "" -#: ../../source/chapters/advanced_topics.rst:242 +#: ../../chapters/advanced_topics.rst:241 msgid "**Mac OS X**" msgstr "" -#: ../../source/chapters/advanced_topics.rst:238 +#: ../../chapters/advanced_topics.rst:237 msgid "The Mixxx library is stored in the :file:`Library/Application Support/Mixxx` folder in your home directory. To delete your library on Mac OS X type the following command into a terminal: ::" msgstr "" -#: ../../source/chapters/advanced_topics.rst:248 +#: ../../chapters/advanced_topics.rst:247 msgid "**GNU/Linux**" msgstr "" -#: ../../source/chapters/advanced_topics.rst:245 +#: ../../chapters/advanced_topics.rst:244 msgid "The Mixxx library is stored in the ``.mixxx`` folder in your home directory. To delete your library on GNU/Linux type the following command into a terminal: ::" msgstr "" -#: ../../source/chapters/advanced_topics.rst:250 +#: ../../chapters/advanced_topics.rst:249 msgid "Deleting your library will lose all of your :term:`metadata`. This includes saved hotcues, loops, comments, ratings, and other library related metadata. Only delete your library if you are fine with losing these." msgstr "" diff --git a/source/locale/pot/chapters/appendix.pot b/source/locale/pot/chapters/appendix.pot index 65b0fc1570..7828d57dee 100644 --- a/source/locale/pot/chapters/appendix.pot +++ b/source/locale/pot/chapters/appendix.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,1316 +16,1320 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/appendix.rst:3 +#: ../../chapters/appendix.rst:3 msgid "Appendix" msgstr "" -#: ../../source/chapters/appendix.rst:8 +#: ../../chapters/appendix.rst:8 msgid "Keyboard mapping table" msgstr "" -#: ../../source/chapters/appendix.rst:10 +#: ../../chapters/appendix.rst:10 msgid "Shortcuts let you work more efficiently. This table lists the default keyboard shortcuts for accessing Mixxx with an English keyboard layout. Depending on your language settings the defaults may be different." msgstr "" -#: ../../source/chapters/appendix.rst:14 +#: ../../chapters/appendix.rst:14 msgid "*Passthrough*, *Vinylcontrol Mode*, *Vinylcontrol Cueing*, and *Single Deck Vinylcontrol Toggle* shortcuts" msgstr "" -#: ../../source/chapters/appendix.rst:18 +#: ../../chapters/appendix.rst:18 msgid "*Auto DJ* shortcuts, :kbd:`Esc` key exit search and leave focus" msgstr "" -#: ../../source/chapters/appendix.rst:22 -#: ../../source/chapters/appendix.rst:180 +#: ../../chapters/appendix.rst:22 +#: ../../chapters/appendix.rst:180 msgid "Function" msgstr "" -#: ../../source/chapters/appendix.rst:22 +#: ../../chapters/appendix.rst:22 msgid "Deck 1" msgstr "" -#: ../../source/chapters/appendix.rst:22 +#: ../../chapters/appendix.rst:22 msgid "Deck 2" msgstr "" -#: ../../source/chapters/appendix.rst:22 +#: ../../chapters/appendix.rst:22 msgid "Master" msgstr "" -#: ../../source/chapters/appendix.rst:24 +#: ../../chapters/appendix.rst:24 msgid "**Mixer**" msgstr "" -#: ../../source/chapters/appendix.rst:26 +#: ../../chapters/appendix.rst:26 msgid "Crossfade Left" msgstr "" -#: ../../source/chapters/appendix.rst:26 +#: ../../chapters/appendix.rst:26 msgid "G" msgstr "" -#: ../../source/chapters/appendix.rst:28 +#: ../../chapters/appendix.rst:28 msgid "Crossfade Right" msgstr "" -#: ../../source/chapters/appendix.rst:28 +#: ../../chapters/appendix.rst:28 msgid "H" msgstr "" -#: ../../source/chapters/appendix.rst:30 +#: ../../chapters/appendix.rst:30 msgid "Small Crossfade Left" msgstr "" -#: ../../source/chapters/appendix.rst:30 +#: ../../chapters/appendix.rst:30 msgid "Shift + G" msgstr "" -#: ../../source/chapters/appendix.rst:32 +#: ../../chapters/appendix.rst:32 msgid "Small Crossfade Right" msgstr "" -#: ../../source/chapters/appendix.rst:32 +#: ../../chapters/appendix.rst:32 msgid "Shift + H" msgstr "" -#: ../../source/chapters/appendix.rst:34 +#: ../../chapters/appendix.rst:34 msgid "Activate/Disable Effects Unit" msgstr "" -#: ../../source/chapters/appendix.rst:34 +#: ../../chapters/appendix.rst:34 msgid "5" msgstr "" -#: ../../source/chapters/appendix.rst:34 +#: ../../chapters/appendix.rst:34 msgid "0" msgstr "" -#: ../../source/chapters/appendix.rst:36 +#: ../../chapters/appendix.rst:36 msgid "Headphone Cue (Pre-fader listen)" msgstr "" -#: ../../source/chapters/appendix.rst:36 +#: ../../chapters/appendix.rst:36 msgid "T" msgstr "" -#: ../../source/chapters/appendix.rst:36 +#: ../../chapters/appendix.rst:36 msgid "Y" msgstr "" -#: ../../source/chapters/appendix.rst:38 +#: ../../chapters/appendix.rst:38 msgid "Bass Kill" msgstr "" -#: ../../source/chapters/appendix.rst:38 +#: ../../chapters/appendix.rst:38 msgid "B" msgstr "" -#: ../../source/chapters/appendix.rst:38 +#: ../../chapters/appendix.rst:38 msgid "N" msgstr "" -#: ../../source/chapters/appendix.rst:40 +#: ../../chapters/appendix.rst:40 msgid "**Playback**" msgstr "" -#: ../../source/chapters/appendix.rst:42 +#: ../../chapters/appendix.rst:42 msgid "Load selected track to deck" msgstr "" -#: ../../source/chapters/appendix.rst:42 +#: ../../chapters/appendix.rst:42 msgid "Shift + left" msgstr "" -#: ../../source/chapters/appendix.rst:42 +#: ../../chapters/appendix.rst:42 msgid "Shift + right" msgstr "" -#: ../../source/chapters/appendix.rst:44 +#: ../../chapters/appendix.rst:44 msgid "Unload track from deck" msgstr "" -#: ../../source/chapters/appendix.rst:44 +#: ../../chapters/appendix.rst:44 msgid "Alt + Shift + left" msgstr "" -#: ../../source/chapters/appendix.rst:44 +#: ../../chapters/appendix.rst:44 msgid "Alt + Shift + right" msgstr "" -#: ../../source/chapters/appendix.rst:46 +#: ../../chapters/appendix.rst:46 msgid "Playback" msgstr "" -#: ../../source/chapters/appendix.rst:46 +#: ../../chapters/appendix.rst:46 msgid "D" msgstr "" -#: ../../source/chapters/appendix.rst:46 +#: ../../chapters/appendix.rst:46 msgid "L" msgstr "" -#: ../../source/chapters/appendix.rst:48 -#: ../../source/chapters/appendix.rst:130 +#: ../../chapters/appendix.rst:48 +#: ../../chapters/appendix.rst:130 msgid "Seek Backwards" msgstr "" -#: ../../source/chapters/appendix.rst:48 +#: ../../chapters/appendix.rst:48 msgid "A" msgstr "" -#: ../../source/chapters/appendix.rst:48 +#: ../../chapters/appendix.rst:48 msgid "J" msgstr "" -#: ../../source/chapters/appendix.rst:50 +#: ../../chapters/appendix.rst:50 msgid "Reverse Playback" msgstr "" -#: ../../source/chapters/appendix.rst:50 +#: ../../chapters/appendix.rst:50 msgid "Shift + A" msgstr "" -#: ../../source/chapters/appendix.rst:50 +#: ../../chapters/appendix.rst:50 msgid "Shift + J" msgstr "" -#: ../../source/chapters/appendix.rst:52 -#: ../../source/chapters/appendix.rst:132 +#: ../../chapters/appendix.rst:52 +#: ../../chapters/appendix.rst:132 msgid "Seek Forwards" msgstr "" -#: ../../source/chapters/appendix.rst:52 +#: ../../chapters/appendix.rst:52 msgid "S" msgstr "" -#: ../../source/chapters/appendix.rst:52 +#: ../../chapters/appendix.rst:52 msgid "K" msgstr "" -#: ../../source/chapters/appendix.rst:54 +#: ../../chapters/appendix.rst:54 msgid "Tempo Adjust Down" msgstr "" -#: ../../source/chapters/appendix.rst:54 +#: ../../chapters/appendix.rst:54 msgid "F1" msgstr "" -#: ../../source/chapters/appendix.rst:54 +#: ../../chapters/appendix.rst:54 msgid "F5" msgstr "" -#: ../../source/chapters/appendix.rst:56 +#: ../../chapters/appendix.rst:56 msgid "Tempo Adjust Up" msgstr "" -#: ../../source/chapters/appendix.rst:56 +#: ../../chapters/appendix.rst:56 msgid "F2" msgstr "" -#: ../../source/chapters/appendix.rst:56 +#: ../../chapters/appendix.rst:56 msgid "F6" msgstr "" -#: ../../source/chapters/appendix.rst:58 +#: ../../chapters/appendix.rst:58 msgid "Small Tempo Adjust Down" msgstr "" -#: ../../source/chapters/appendix.rst:58 +#: ../../chapters/appendix.rst:58 msgid "Shift + F1" msgstr "" -#: ../../source/chapters/appendix.rst:58 +#: ../../chapters/appendix.rst:58 msgid "Shift + F5" msgstr "" -#: ../../source/chapters/appendix.rst:60 +#: ../../chapters/appendix.rst:60 msgid "Small Tempo Adjust Up" msgstr "" -#: ../../source/chapters/appendix.rst:60 +#: ../../chapters/appendix.rst:60 msgid "Shift + F2" msgstr "" -#: ../../source/chapters/appendix.rst:60 +#: ../../chapters/appendix.rst:60 msgid "Shift + F6" msgstr "" -#: ../../source/chapters/appendix.rst:62 +#: ../../chapters/appendix.rst:62 msgid "Temporary Tempo Adjust Down" msgstr "" -#: ../../source/chapters/appendix.rst:62 +#: ../../chapters/appendix.rst:62 msgid "F3" msgstr "" -#: ../../source/chapters/appendix.rst:62 +#: ../../chapters/appendix.rst:62 msgid "F7" msgstr "" -#: ../../source/chapters/appendix.rst:64 +#: ../../chapters/appendix.rst:64 msgid "Temporary Tempo Adjust Up" msgstr "" -#: ../../source/chapters/appendix.rst:64 +#: ../../chapters/appendix.rst:64 msgid "F4" msgstr "" -#: ../../source/chapters/appendix.rst:64 +#: ../../chapters/appendix.rst:64 msgid "F8" msgstr "" -#: ../../source/chapters/appendix.rst:66 +#: ../../chapters/appendix.rst:66 msgid "Small Temporary Tempo Adjust Down" msgstr "" -#: ../../source/chapters/appendix.rst:66 +#: ../../chapters/appendix.rst:66 msgid "Shift + F3" msgstr "" -#: ../../source/chapters/appendix.rst:66 +#: ../../chapters/appendix.rst:66 msgid "Shift + F7" msgstr "" -#: ../../source/chapters/appendix.rst:68 +#: ../../chapters/appendix.rst:68 msgid "Small Temporary Tempo Adjust Up" msgstr "" -#: ../../source/chapters/appendix.rst:68 +#: ../../chapters/appendix.rst:68 msgid "Shift + F4" msgstr "" -#: ../../source/chapters/appendix.rst:68 +#: ../../chapters/appendix.rst:68 msgid "Shift + F8" msgstr "" -#: ../../source/chapters/appendix.rst:70 +#: ../../chapters/appendix.rst:70 msgid "Tempo (BPM) Sync" msgstr "" -#: ../../source/chapters/appendix.rst:70 +#: ../../chapters/appendix.rst:70 msgid "1" msgstr "" -#: ../../source/chapters/appendix.rst:70 +#: ../../chapters/appendix.rst:70 msgid "6" msgstr "" -#: ../../source/chapters/appendix.rst:72 +#: ../../chapters/appendix.rst:72 msgid "BPM Tap Tempo Adjust" msgstr "" -#: ../../source/chapters/appendix.rst:72 +#: ../../chapters/appendix.rst:72 msgid "Shift + !" msgstr "" -#: ../../source/chapters/appendix.rst:72 +#: ../../chapters/appendix.rst:72 msgid "Shift + ^" msgstr "" -#: ../../source/chapters/appendix.rst:74 +#: ../../chapters/appendix.rst:74 msgid "**Cue and Loop**" msgstr "" -#: ../../source/chapters/appendix.rst:76 +#: ../../chapters/appendix.rst:76 msgid "Set Cuepoint" msgstr "" -#: ../../source/chapters/appendix.rst:76 +#: ../../chapters/appendix.rst:76 msgid "Shift + D" msgstr "" -#: ../../source/chapters/appendix.rst:76 +#: ../../chapters/appendix.rst:76 msgid "Shift + L" msgstr "" -#: ../../source/chapters/appendix.rst:78 +#: ../../chapters/appendix.rst:78 msgid "Cue" msgstr "" -#: ../../source/chapters/appendix.rst:78 +#: ../../chapters/appendix.rst:78 msgid "F" msgstr "" -#: ../../source/chapters/appendix.rst:78 +#: ../../chapters/appendix.rst:78 msgid ";" msgstr "" -#: ../../source/chapters/appendix.rst:80 +#: ../../chapters/appendix.rst:80 msgid "Cue Go-to-and-stop" msgstr "" -#: ../../source/chapters/appendix.rst:80 +#: ../../chapters/appendix.rst:80 msgid "Shift + F" msgstr "" -#: ../../source/chapters/appendix.rst:80 +#: ../../chapters/appendix.rst:80 msgid "Shift + :" msgstr "" -#: ../../source/chapters/appendix.rst:82 +#: ../../chapters/appendix.rst:82 msgid "Activate 4 Beat Loop" msgstr "" -#: ../../source/chapters/appendix.rst:82 +#: ../../chapters/appendix.rst:82 msgid "Q" msgstr "" -#: ../../source/chapters/appendix.rst:82 +#: ../../chapters/appendix.rst:82 msgid "U" msgstr "" -#: ../../source/chapters/appendix.rst:84 +#: ../../chapters/appendix.rst:84 msgid "Halve Beat Loop Size" msgstr "" -#: ../../source/chapters/appendix.rst:84 +#: ../../chapters/appendix.rst:84 msgid "W" msgstr "" -#: ../../source/chapters/appendix.rst:84 +#: ../../chapters/appendix.rst:84 msgid "I" msgstr "" -#: ../../source/chapters/appendix.rst:86 +#: ../../chapters/appendix.rst:86 msgid "Double Beat Loop Size" msgstr "" -#: ../../source/chapters/appendix.rst:86 +#: ../../chapters/appendix.rst:86 msgid "E" msgstr "" -#: ../../source/chapters/appendix.rst:86 +#: ../../chapters/appendix.rst:86 msgid "O" msgstr "" -#: ../../source/chapters/appendix.rst:88 +#: ../../chapters/appendix.rst:88 msgid "Set Loop In Point" msgstr "" -#: ../../source/chapters/appendix.rst:88 +#: ../../chapters/appendix.rst:88 msgid "2" msgstr "" -#: ../../source/chapters/appendix.rst:88 +#: ../../chapters/appendix.rst:88 msgid "7" msgstr "" -#: ../../source/chapters/appendix.rst:90 +#: ../../chapters/appendix.rst:90 msgid "Set Loop Out Point (Activates Loop)" msgstr "" -#: ../../source/chapters/appendix.rst:90 +#: ../../chapters/appendix.rst:90 msgid "3" msgstr "" -#: ../../source/chapters/appendix.rst:90 +#: ../../chapters/appendix.rst:90 msgid "8" msgstr "" -#: ../../source/chapters/appendix.rst:92 +#: ../../chapters/appendix.rst:92 msgid "Toggle Loop On/Off" msgstr "" -#: ../../source/chapters/appendix.rst:92 +#: ../../chapters/appendix.rst:92 msgid "4" msgstr "" -#: ../../source/chapters/appendix.rst:92 +#: ../../chapters/appendix.rst:92 msgid "9" msgstr "" -#: ../../source/chapters/appendix.rst:94 +#: ../../chapters/appendix.rst:94 msgid "Set Hot cue 1" msgstr "" -#: ../../source/chapters/appendix.rst:94 +#: ../../chapters/appendix.rst:94 msgid "Z" msgstr "" -#: ../../source/chapters/appendix.rst:94 +#: ../../chapters/appendix.rst:94 msgid "M" msgstr "" -#: ../../source/chapters/appendix.rst:96 +#: ../../chapters/appendix.rst:96 msgid "Set Hot cue 2" msgstr "" -#: ../../source/chapters/appendix.rst:96 +#: ../../chapters/appendix.rst:96 msgid "X" msgstr "" -#: ../../source/chapters/appendix.rst:96 +#: ../../chapters/appendix.rst:96 msgid "," msgstr "" -#: ../../source/chapters/appendix.rst:98 +#: ../../chapters/appendix.rst:98 msgid "Set Hot cue 3" msgstr "" -#: ../../source/chapters/appendix.rst:98 +#: ../../chapters/appendix.rst:98 msgid "C" msgstr "" -#: ../../source/chapters/appendix.rst:98 +#: ../../chapters/appendix.rst:98 msgid "." msgstr "" -#: ../../source/chapters/appendix.rst:100 +#: ../../chapters/appendix.rst:100 msgid "Set Hot cue 4" msgstr "" -#: ../../source/chapters/appendix.rst:100 +#: ../../chapters/appendix.rst:100 msgid "V" msgstr "" -#: ../../source/chapters/appendix.rst:100 +#: ../../chapters/appendix.rst:100 msgid "/" msgstr "" -#: ../../source/chapters/appendix.rst:102 +#: ../../chapters/appendix.rst:102 msgid "Clear Hot cue 1" msgstr "" -#: ../../source/chapters/appendix.rst:102 +#: ../../chapters/appendix.rst:102 msgid "Shift + Z" msgstr "" -#: ../../source/chapters/appendix.rst:102 +#: ../../chapters/appendix.rst:102 msgid "Shift + M" msgstr "" -#: ../../source/chapters/appendix.rst:104 +#: ../../chapters/appendix.rst:104 msgid "Clear Hot cue 2" msgstr "" -#: ../../source/chapters/appendix.rst:104 +#: ../../chapters/appendix.rst:104 msgid "Shift + X" msgstr "" -#: ../../source/chapters/appendix.rst:104 +#: ../../chapters/appendix.rst:104 msgid "Shift + <" msgstr "" -#: ../../source/chapters/appendix.rst:106 +#: ../../chapters/appendix.rst:106 msgid "Clear Hot cue 3" msgstr "" -#: ../../source/chapters/appendix.rst:106 +#: ../../chapters/appendix.rst:106 msgid "Shift + C" msgstr "" -#: ../../source/chapters/appendix.rst:106 +#: ../../chapters/appendix.rst:106 msgid "Shift + >" msgstr "" -#: ../../source/chapters/appendix.rst:108 +#: ../../chapters/appendix.rst:108 msgid "Clear Hot cue 4" msgstr "" -#: ../../source/chapters/appendix.rst:108 +#: ../../chapters/appendix.rst:108 msgid "Shift + V" msgstr "" -#: ../../source/chapters/appendix.rst:108 +#: ../../chapters/appendix.rst:108 msgid "Shift + ?" msgstr "" -#: ../../source/chapters/appendix.rst:110 +#: ../../chapters/appendix.rst:110 msgid "**Microphone**" msgstr "" -#: ../../source/chapters/appendix.rst:112 +#: ../../chapters/appendix.rst:112 msgid "Microphone Talkover" msgstr "" -#: ../../source/chapters/appendix.rst:112 +#: ../../chapters/appendix.rst:112 msgid "\\`" msgstr "" -#: ../../source/chapters/appendix.rst:114 +#: ../../chapters/appendix.rst:114 msgid "**Auto DJ**" msgstr "" -#: ../../source/chapters/appendix.rst:116 +#: ../../chapters/appendix.rst:116 msgid "Shuffle Auto DJ playlist" msgstr "" -#: ../../source/chapters/appendix.rst:116 +#: ../../chapters/appendix.rst:116 msgid "Shift + F9" msgstr "" -#: ../../source/chapters/appendix.rst:118 +#: ../../chapters/appendix.rst:118 msgid "Skip next track in Auto DJ" msgstr "" -#: ../../source/chapters/appendix.rst:118 +#: ../../chapters/appendix.rst:118 msgid "Shift + F10" msgstr "" -#: ../../source/chapters/appendix.rst:120 +#: ../../chapters/appendix.rst:120 msgid "Fade to next track in Auto DJ" msgstr "" -#: ../../source/chapters/appendix.rst:120 +#: ../../chapters/appendix.rst:120 msgid "Shift + F11" msgstr "" -#: ../../source/chapters/appendix.rst:122 +#: ../../chapters/appendix.rst:122 msgid "Toggle Auto DJ on/Off" msgstr "" -#: ../../source/chapters/appendix.rst:122 +#: ../../chapters/appendix.rst:122 msgid "Shift + F12" msgstr "" -#: ../../source/chapters/appendix.rst:124 +#: ../../chapters/appendix.rst:124 msgid "**Preview Deck**" msgstr "" -#: ../../source/chapters/appendix.rst:126 +#: ../../chapters/appendix.rst:126 msgid "Load Selected Track And Play" msgstr "" -#: ../../source/chapters/appendix.rst:126 +#: ../../chapters/appendix.rst:126 msgid "Alt + Return" msgstr "" -#: ../../source/chapters/appendix.rst:128 +#: ../../chapters/appendix.rst:128 msgid "Start/Stop" msgstr "" -#: ../../source/chapters/appendix.rst:128 +#: ../../chapters/appendix.rst:128 msgid "Return" msgstr "" -#: ../../source/chapters/appendix.rst:130 +#: ../../chapters/appendix.rst:130 msgid "Alt + Left" msgstr "" -#: ../../source/chapters/appendix.rst:132 +#: ../../chapters/appendix.rst:132 msgid "Alt + Right" msgstr "" -#: ../../source/chapters/appendix.rst:134 +#: ../../chapters/appendix.rst:134 msgid "**Vinyl Control**" msgstr "" -#: ../../source/chapters/appendix.rst:136 +#: ../../chapters/appendix.rst:136 msgid "Passthrough" msgstr "" -#: ../../source/chapters/appendix.rst:136 +#: ../../chapters/appendix.rst:136 msgid "Ctrl + J" msgstr "" -#: ../../source/chapters/appendix.rst:136 +#: ../../chapters/appendix.rst:136 msgid "Ctrl + K" msgstr "" -#: ../../source/chapters/appendix.rst:138 +#: ../../chapters/appendix.rst:138 msgid "Vinylcontrol Mode" msgstr "" -#: ../../source/chapters/appendix.rst:138 +#: ../../chapters/appendix.rst:138 msgid "Ctrl + Shift + Y" msgstr "" -#: ../../source/chapters/appendix.rst:138 +#: ../../chapters/appendix.rst:138 msgid "Ctrl + Shift + U" msgstr "" -#: ../../source/chapters/appendix.rst:140 +#: ../../chapters/appendix.rst:140 msgid "Vinylcontrol Cueing" msgstr "" -#: ../../source/chapters/appendix.rst:140 +#: ../../chapters/appendix.rst:140 msgid "Ctrl + Alt+ Y" msgstr "" -#: ../../source/chapters/appendix.rst:140 +#: ../../chapters/appendix.rst:140 msgid "Ctrl + Alt + U" msgstr "" -#: ../../source/chapters/appendix.rst:142 +#: ../../chapters/appendix.rst:142 msgid "Single Deck Toggle / Swap Decks" msgstr "" -#: ../../source/chapters/appendix.rst:142 -#: ../../source/chapters/appendix.rst:142 -#: ../../source/chapters/appendix.rst:216 +#: ../../chapters/appendix.rst:142 +#: ../../chapters/appendix.rst:142 +#: ../../chapters/appendix.rst:216 msgid "Ctrl + T" msgstr "" -#: ../../source/chapters/appendix.rst:144 +#: ../../chapters/appendix.rst:144 msgid "**Search bar**" msgstr "" -#: ../../source/chapters/appendix.rst:146 +#: ../../chapters/appendix.rst:146 msgid "Focus" msgstr "" -#: ../../source/chapters/appendix.rst:146 +#: ../../chapters/appendix.rst:146 msgid "Ctrl + F" msgstr "" -#: ../../source/chapters/appendix.rst:148 +#: ../../chapters/appendix.rst:148 msgid "Clear input" msgstr "" -#: ../../source/chapters/appendix.rst:148 +#: ../../chapters/appendix.rst:148 msgid "Ctrl + Back" msgstr "" -#: ../../source/chapters/appendix.rst:150 +#: ../../chapters/appendix.rst:150 msgid "Exit search and leave focus" msgstr "" -#: ../../source/chapters/appendix.rst:150 +#: ../../chapters/appendix.rst:150 msgid "ESC" msgstr "" -#: ../../source/chapters/appendix.rst:152 +#: ../../chapters/appendix.rst:152 msgid "**Library**" msgstr "" -#: ../../source/chapters/appendix.rst:154 +#: ../../chapters/appendix.rst:154 msgid "Select all files in current list" msgstr "" -#: ../../source/chapters/appendix.rst:154 +#: ../../chapters/appendix.rst:154 msgid "Ctrl + A" msgstr "" -#: ../../source/chapters/appendix.rst:156 +#: ../../chapters/appendix.rst:156 msgid "Select group of files in current list" msgstr "" -#: ../../source/chapters/appendix.rst:156 +#: ../../chapters/appendix.rst:156 msgid "Click first item, hold Shift key, click last item" msgstr "" -#: ../../source/chapters/appendix.rst:159 +#: ../../chapters/appendix.rst:159 msgid "Mixxx allows you to customize the keyboard shortcuts. For more information, and to download a keyboard mapping image, go to :ref:`control-keyboard`." msgstr "" -#: ../../source/chapters/appendix.rst:166 +#: ../../chapters/appendix.rst:166 msgid "Application shortcuts" msgstr "" -#: ../../source/chapters/appendix.rst:168 +#: ../../chapters/appendix.rst:168 msgid "Use these shortcuts to access features available in the menu on top of the application window." msgstr "" -#: ../../source/chapters/appendix.rst:171 +#: ../../chapters/appendix.rst:171 msgid "Added *Show Effect Rack*, *Maximize Library*, and *Show Cover Art* shortcuts. Added a :guilabel:`Developer Tools` option to the :guilabel:`Developer` menu which provides various useful debugging tools." msgstr "" -#: ../../source/chapters/appendix.rst:176 +#: ../../chapters/appendix.rst:176 msgid "Shortcuts for *Enable Vinyl Control 1-4*." msgstr "" -#: ../../source/chapters/appendix.rst:180 +#: ../../chapters/appendix.rst:180 msgid "Key" msgstr "" -#: ../../source/chapters/appendix.rst:182 +#: ../../chapters/appendix.rst:182 msgid "**File menu**" msgstr "" -#: ../../source/chapters/appendix.rst:184 +#: ../../chapters/appendix.rst:184 msgid "Load Track to Deck 1" msgstr "" -#: ../../source/chapters/appendix.rst:184 +#: ../../chapters/appendix.rst:184 msgid "Ctrl + O" msgstr "" -#: ../../source/chapters/appendix.rst:186 +#: ../../chapters/appendix.rst:186 msgid "Load Track to Deck 2" msgstr "" -#: ../../source/chapters/appendix.rst:186 +#: ../../chapters/appendix.rst:186 msgid "Ctrl + Shift + O" msgstr "" -#: ../../source/chapters/appendix.rst:188 +#: ../../chapters/appendix.rst:188 msgid "**Library menu**" msgstr "" -#: ../../source/chapters/appendix.rst:190 +#: ../../chapters/appendix.rst:190 msgid "Add new Playlist" msgstr "" -#: ../../source/chapters/appendix.rst:190 +#: ../../chapters/appendix.rst:190 msgid "Ctrl + N" msgstr "" -#: ../../source/chapters/appendix.rst:192 +#: ../../chapters/appendix.rst:192 msgid "Add new Crate" msgstr "" -#: ../../source/chapters/appendix.rst:192 +#: ../../chapters/appendix.rst:192 msgid "Ctrl + Shift + N" msgstr "" -#: ../../source/chapters/appendix.rst:194 +#: ../../chapters/appendix.rst:194 msgid "**View menu**" msgstr "" -#: ../../source/chapters/appendix.rst:196 +#: ../../chapters/appendix.rst:196 msgid "Show Samplers" msgstr "" -#: ../../source/chapters/appendix.rst:196 +#: ../../chapters/appendix.rst:196 msgid "Ctrl + 1" msgstr "" -#: ../../source/chapters/appendix.rst:198 +#: ../../chapters/appendix.rst:198 msgid "Show Microphone Section" msgstr "" -#: ../../source/chapters/appendix.rst:198 +#: ../../chapters/appendix.rst:198 msgid "Ctrl + 2" msgstr "" -#: ../../source/chapters/appendix.rst:200 +#: ../../chapters/appendix.rst:200 msgid "Show Vinyl Control Section" msgstr "" -#: ../../source/chapters/appendix.rst:200 +#: ../../chapters/appendix.rst:200 msgid "Ctrl + 3" msgstr "" -#: ../../source/chapters/appendix.rst:202 +#: ../../chapters/appendix.rst:202 msgid "Show Preview Deck" msgstr "" -#: ../../source/chapters/appendix.rst:202 +#: ../../chapters/appendix.rst:202 msgid "Ctrl + 4" msgstr "" -#: ../../source/chapters/appendix.rst:204 +#: ../../chapters/appendix.rst:204 msgid "Show Effect Rack" msgstr "" -#: ../../source/chapters/appendix.rst:204 +#: ../../chapters/appendix.rst:204 msgid "Ctrl + 5" msgstr "" -#: ../../source/chapters/appendix.rst:206 +#: ../../chapters/appendix.rst:206 msgid "Show Cover Art" msgstr "" -#: ../../source/chapters/appendix.rst:206 +#: ../../chapters/appendix.rst:206 msgid "Ctrl + 6" msgstr "" -#: ../../source/chapters/appendix.rst:208 +#: ../../chapters/appendix.rst:208 msgid "Maximize Library" msgstr "" -#: ../../source/chapters/appendix.rst:208 +#: ../../chapters/appendix.rst:208 msgid "Space" msgstr "" -#: ../../source/chapters/appendix.rst:210 +#: ../../chapters/appendix.rst:210 msgid "Full Screen (Windows & Linux)" msgstr "" -#: ../../source/chapters/appendix.rst:210 +#: ../../chapters/appendix.rst:210 msgid "F11" msgstr "" -#: ../../source/chapters/appendix.rst:212 +#: ../../chapters/appendix.rst:212 msgid "Full Screen (Mac OS X)" msgstr "" -#: ../../source/chapters/appendix.rst:212 +#: ../../chapters/appendix.rst:212 msgid "Shift + Command + F" msgstr "" -#: ../../source/chapters/appendix.rst:214 +#: ../../chapters/appendix.rst:214 msgid "**Options menu**" msgstr "" -#: ../../source/chapters/appendix.rst:216 +#: ../../chapters/appendix.rst:216 msgid "Enable Vinyl Control 1" msgstr "" -#: ../../source/chapters/appendix.rst:218 +#: ../../chapters/appendix.rst:218 msgid "Enable Vinyl Control 2" msgstr "" -#: ../../source/chapters/appendix.rst:218 +#: ../../chapters/appendix.rst:218 msgid "Ctrl + Y" msgstr "" -#: ../../source/chapters/appendix.rst:220 +#: ../../chapters/appendix.rst:220 msgid "Enable Vinyl Control 3" msgstr "" -#: ../../source/chapters/appendix.rst:220 +#: ../../chapters/appendix.rst:220 msgid "Ctrl + U" msgstr "" -#: ../../source/chapters/appendix.rst:222 +#: ../../chapters/appendix.rst:222 msgid "Enable Vinyl Control 4" msgstr "" -#: ../../source/chapters/appendix.rst:222 +#: ../../chapters/appendix.rst:222 msgid "Ctrl + I" msgstr "" -#: ../../source/chapters/appendix.rst:224 +#: ../../chapters/appendix.rst:224 msgid "Enable Live Broadcasting" msgstr "" -#: ../../source/chapters/appendix.rst:224 +#: ../../chapters/appendix.rst:224 msgid "Ctrl + L" msgstr "" -#: ../../source/chapters/appendix.rst:226 +#: ../../chapters/appendix.rst:226 msgid "Record Mix" msgstr "" -#: ../../source/chapters/appendix.rst:226 +#: ../../chapters/appendix.rst:226 msgid "Ctrl + R" msgstr "" -#: ../../source/chapters/appendix.rst:228 +#: ../../chapters/appendix.rst:228 msgid "Enable Keyboard Shortcuts" msgstr "" -#: ../../source/chapters/appendix.rst:228 +#: ../../chapters/appendix.rst:228 msgid "Ctrl + \\`" msgstr "" -#: ../../source/chapters/appendix.rst:230 +#: ../../chapters/appendix.rst:230 msgid "Open Preferences (Windows & Linux)" msgstr "" -#: ../../source/chapters/appendix.rst:230 +#: ../../chapters/appendix.rst:230 msgid "Ctrl + P" msgstr "" -#: ../../source/chapters/appendix.rst:232 +#: ../../chapters/appendix.rst:232 msgid "Open Preferences (Mac OS X)" msgstr "" -#: ../../source/chapters/appendix.rst:232 +#: ../../chapters/appendix.rst:232 msgid "Ctrl + ," msgstr "" -#: ../../source/chapters/appendix.rst:234 +#: ../../chapters/appendix.rst:234 msgid "Exit Mixxx" msgstr "" -#: ../../source/chapters/appendix.rst:234 +#: ../../chapters/appendix.rst:234 msgid "Ctrl + Q" msgstr "" -#: ../../source/chapters/appendix.rst:236 +#: ../../chapters/appendix.rst:236 msgid "**Developer menu**" msgstr "" -#: ../../source/chapters/appendix.rst:238 +#: ../../chapters/appendix.rst:238 msgid "Reload skin" msgstr "" -#: ../../source/chapters/appendix.rst:238 +#: ../../chapters/appendix.rst:238 msgid "Ctrl + Shift + R" msgstr "" -#: ../../source/chapters/appendix.rst:240 +#: ../../chapters/appendix.rst:240 msgid "Developer Tools" msgstr "" -#: ../../source/chapters/appendix.rst:240 +#: ../../chapters/appendix.rst:240 msgid "Ctrl + Shift + T" msgstr "" -#: ../../source/chapters/appendix.rst:242 +#: ../../chapters/appendix.rst:242 msgid "Stats: Base Bucket" msgstr "" -#: ../../source/chapters/appendix.rst:242 +#: ../../chapters/appendix.rst:242 msgid "Ctrl + Shift + B" msgstr "" -#: ../../source/chapters/appendix.rst:244 +#: ../../chapters/appendix.rst:244 msgid "Stats: Experiment Bucket" msgstr "" -#: ../../source/chapters/appendix.rst:244 +#: ../../chapters/appendix.rst:244 msgid "Ctrl + Shift + E" msgstr "" -#: ../../source/chapters/appendix.rst:246 +#: ../../chapters/appendix.rst:246 msgid "Debugger Enabled" msgstr "" -#: ../../source/chapters/appendix.rst:246 +#: ../../chapters/appendix.rst:246 msgid "Ctrl + Shift + D" msgstr "" -#: ../../source/chapters/appendix.rst:249 +#: ../../chapters/appendix.rst:249 msgid "The :kbd:`Ctrl` key on Windows & Linux is equivalent to the :kbd:`Command` key on Mac OS X. The :kbd:`Alt` key on Windows & Linux is equivalent to the :kbd:`Option` key on Mac OS X. Application shortcuts are not customizable." msgstr "" -#: ../../source/chapters/appendix.rst:254 +#: ../../chapters/appendix.rst:254 msgid "The Developer menu is available if Mixxx is started using the :ref:`appendix-command-line-options`." msgstr "" -#: ../../source/chapters/appendix.rst:260 +#: ../../chapters/appendix.rst:260 msgid "Command line options" msgstr "" -#: ../../source/chapters/appendix.rst:262 +#: ../../chapters/appendix.rst:262 msgid "Mixxx is designed to be as user-friendly as possible. As such, its command line options are only useful for development or debugging, as they make these tasks easier. Command line options are case-sensitive." msgstr "" -#: ../../source/chapters/appendix.rst:268 +#: ../../chapters/appendix.rst:268 msgid "Show debug tooltips" msgstr "" -#: ../../source/chapters/appendix.rst:269 +#: ../../chapters/appendix.rst:269 msgid "Provide extra skins when developer mode is enabled." msgstr "" -#: ../../source/chapters/appendix.rst:270 +#: ../../chapters/appendix.rst:270 msgid "Adds the debugger during skin parsing in ``--developer`` mode" msgstr "" -#: ../../source/chapters/appendix.rst:271 +#: ../../chapters/appendix.rst:271 msgid "Adds \"Enable Base\" and \"Enable Experiment\" option in ``--developer`` mode" msgstr "" -#: ../../source/chapters/appendix.rst:272 +#: ../../chapters/appendix.rst:272 msgid "Added ``--safeMode`` option." msgstr "" -#: ../../source/chapters/appendix.rst:275 +#: ../../chapters/appendix.rst:275 msgid "Option" msgstr "" -#: ../../source/chapters/appendix.rst:275 +#: ../../chapters/appendix.rst:275 msgid "Description" msgstr "" -#: ../../source/chapters/appendix.rst:277 +#: ../../chapters/appendix.rst:277 msgid "[FILE]" msgstr "" -#: ../../source/chapters/appendix.rst:277 +#: ../../chapters/appendix.rst:277 msgid "Load the specified music file(s) at start-up. Each file you specify will be loaded into the next virtual deck. Supported file types: mp3, ogg, aiff, aif, wav, flac, and optional unprotected aac (m4a)" msgstr "" -#: ../../source/chapters/appendix.rst:283 +#: ../../chapters/appendix.rst:283 msgid "--resourcePath PATH" msgstr "" -#: ../../source/chapters/appendix.rst:283 +#: ../../chapters/appendix.rst:283 msgid "Top-level directory where Mixxx should look for its resource files such as MIDI mappings, overriding the default installation location." msgstr "" -#: ../../source/chapters/appendix.rst:287 +#: ../../chapters/appendix.rst:287 msgid "--pluginPath PATH" msgstr "" -#: ../../source/chapters/appendix.rst:287 +#: ../../chapters/appendix.rst:287 msgid "Top-level directory where Mixxx should look for sound source plugins in addition to default locations." msgstr "" -#: ../../source/chapters/appendix.rst:291 +#: ../../chapters/appendix.rst:291 msgid "--settingsPath PATH" msgstr "" -#: ../../source/chapters/appendix.rst:291 +#: ../../chapters/appendix.rst:291 msgid "Top-level directory where Mixxx should look for user settings files such as the library database and preferences configuration file." msgstr "" -#: ../../source/chapters/appendix.rst:295 +#: ../../chapters/appendix.rst:295 msgid "--controllerDebug" msgstr "" -#: ../../source/chapters/appendix.rst:295 +#: ../../chapters/appendix.rst:295 msgid "Causes Mixxx to display/log all controller data it receives and script functions it loads." msgstr "" -#: ../../source/chapters/appendix.rst:298 +#: ../../chapters/appendix.rst:298 msgid "--developer" msgstr "" -#: ../../source/chapters/appendix.rst:298 +#: ../../chapters/appendix.rst:298 msgid "Enables developer-mode. Includes extra log info, stats on performance, a Developer tools menu, extra developer skins, and provides useful information for skin writers in widget tooltips and logs ." msgstr "" -#: ../../source/chapters/appendix.rst:304 +#: ../../chapters/appendix.rst:304 msgid "--safeMode" msgstr "" -#: ../../source/chapters/appendix.rst:304 +#: ../../chapters/appendix.rst:304 msgid "Disables risky things at start up. This should help troubleshoot crashes at startup or if Mixxx won't boot." msgstr "" -#: ../../source/chapters/appendix.rst:308 +#: ../../chapters/appendix.rst:308 msgid "Automatically loads empty waveforms" msgstr "" -#: ../../source/chapters/appendix.rst:309 +#: ../../chapters/appendix.rst:309 msgid "Disables spinning vinyl widgets" msgstr "" -#: ../../source/chapters/appendix.rst:310 +#: ../../chapters/appendix.rst:310 msgid "Disables synchronization polling" msgstr "" -#: ../../source/chapters/appendix.rst:311 +#: ../../chapters/appendix.rst:311 msgid "Doesn't open controllers by default" msgstr "" -#: ../../source/chapters/appendix.rst:313 +#: ../../chapters/appendix.rst:313 msgid "--locale LOCALE" msgstr "" -#: ../../source/chapters/appendix.rst:313 +#: ../../chapters/appendix.rst:313 msgid "Use a custom locale for loading translations (e.g 'fr')" msgstr "" -#: ../../source/chapters/appendix.rst:316 +#: ../../chapters/appendix.rst:316 msgid "-f, --fullScreen" msgstr "" -#: ../../source/chapters/appendix.rst:316 +#: ../../chapters/appendix.rst:316 msgid "Starts Mixxx in full-screen mode" msgstr "" -#: ../../source/chapters/appendix.rst:318 +#: ../../chapters/appendix.rst:318 msgid "-h, --help" msgstr "" -#: ../../source/chapters/appendix.rst:318 +#: ../../chapters/appendix.rst:318 msgid "Display this help message and exit" msgstr "" -#: ../../source/chapters/appendix.rst:322 +#: ../../chapters/appendix.rst:322 msgid "Developer tools" msgstr "" -#: ../../source/chapters/appendix.rst:324 +#: ../../chapters/appendix.rst:324 msgid "To start Mixxx in Developer mode from a custom resource directory with :term:`MIDI` and :term:`HID` logging enabled, type the following line into the terminal and hit return: ::" msgstr "" -#: ../../source/chapters/appendix.rst:332 +#: ../../chapters/appendix.rst:332 msgid "Experiment modes for rapid development and testing" msgstr "" -#: ../../source/chapters/appendix.rst:336 +#: ../../chapters/appendix.rst:336 msgid "Adds a static Experiment class with a tri-state mode flag that indicates whether the experiment mode is OFF, BASE, or EXPERIMENT." msgstr "" -#: ../../source/chapters/appendix.rst:339 +#: ../../chapters/appendix.rst:339 msgid "Adds :menuselection:`Developer-->Stats:Experiment Bucket` and :menuselection:`Developer-->Stats:Base Bucket`. Each one toggles between OFF and BASE/EXPERIMENT so you can choose exactly what time spans you would like to collect in your base and experiment buckets." msgstr "" -#: ../../source/chapters/appendix.rst:344 +#: ../../chapters/appendix.rst:344 msgid "Updates StatsManager to segment collected stats into a base and experiment bucket. This allows you to quickly measure the difference a code change has on relevant counters / timers within the same execution of Mixxx." msgstr "" -#: ../../source/chapters/appendix.rst:348 +#: ../../chapters/appendix.rst:348 msgid "This is useful for quickly enabling and disabling a code change without a re-compile/re-run cycle to get an anecdotal sense of how it \"feels\" as well as a quantified sense of how it differs in terms of stats Mixxx collects." msgstr "" -#: ../../source/chapters/appendix.rst:353 +#: ../../chapters/appendix.rst:353 msgid "All stats collected via the usual Counter/Timer/ScopedTimer/etc. tools are segmented into a BASE STATS and EXPERIMENT STATS section printed to the log on exit." msgstr "" -#: ../../source/chapters/appendix.rst:361 +#: ../../chapters/appendix.rst:361 msgid "Version History" msgstr "" -#: ../../source/chapters/appendix.rst:363 +#: ../../chapters/appendix.rst:363 msgid "**v2.0.0** (2015-12-31)" msgstr "" -#: ../../source/chapters/appendix.rst:365 +#: ../../chapters/appendix.rst:365 msgid "4 Decks with Master Sync" msgstr "" -#: ../../source/chapters/appendix.rst:366 +#: ../../chapters/appendix.rst:366 msgid "New Effects Framework with 4 Effect Units and 5 Built-in Effects: * Flanger, Bit Crusher, Reverb, Echo, Filter * More to come!" msgstr "" -#: ../../source/chapters/appendix.rst:369 +#: ../../chapters/appendix.rst:369 msgid "Configurable, Resizeable User Interface with 3 Brand New Skins" msgstr "" -#: ../../source/chapters/appendix.rst:370 +#: ../../chapters/appendix.rst:370 msgid "Cover Art Display" msgstr "" -#: ../../source/chapters/appendix.rst:371 +#: ../../chapters/appendix.rst:371 msgid "Music Key Detection and Shifting" msgstr "" -#: ../../source/chapters/appendix.rst:372 +#: ../../chapters/appendix.rst:372 msgid "Vinyl Audio Pass-Through" msgstr "" -#: ../../source/chapters/appendix.rst:373 +#: ../../chapters/appendix.rst:373 msgid "4 Microphone inputs and 4 Auxiliary inputs" msgstr "" -#: ../../source/chapters/appendix.rst:374 +#: ../../chapters/appendix.rst:374 msgid "MIDI Mapping GUI and Improved Learning Wizard" msgstr "" -#: ../../source/chapters/appendix.rst:375 +#: ../../chapters/appendix.rst:375 +msgid "MusicBrainz metadata fetching" +msgstr "" + +#: ../../chapters/appendix.rst:376 msgid "RGB Musical Waveforms" msgstr "" -#: ../../source/chapters/appendix.rst:376 +#: ../../chapters/appendix.rst:377 msgid "Hundreds of Bug Fixes and Improvements" msgstr "" -#: ../../source/chapters/appendix.rst:377 +#: ../../chapters/appendix.rst:378 msgid "New Pitch-Independent Algorithm for Better-Sounding Key-lock" msgstr "" -#: ../../source/chapters/appendix.rst:379 +#: ../../chapters/appendix.rst:380 msgid "For a full list of new features and bugfixes, go to: `https://launchpad.net/mixxx/2.0 `_." msgstr "" -#: ../../source/chapters/appendix.rst:382 +#: ../../chapters/appendix.rst:383 msgid "**v1.11.0** (2013-05-09)" msgstr "" -#: ../../source/chapters/appendix.rst:384 +#: ../../chapters/appendix.rst:385 msgid "Completely revamped Waveforms" msgstr "" -#: ../../source/chapters/appendix.rst:385 +#: ../../chapters/appendix.rst:386 msgid "Direct :term:`HID` controller support" msgstr "" -#: ../../source/chapters/appendix.rst:386 +#: ../../chapters/appendix.rst:387 msgid "Point & Click Controller Mapping" msgstr "" -#: ../../source/chapters/appendix.rst:387 +#: ../../chapters/appendix.rst:388 msgid "Next Generation Beat Detection" msgstr "" -#: ../../source/chapters/appendix.rst:388 +#: ../../chapters/appendix.rst:389 msgid "Library History Feature" msgstr "" -#: ../../source/chapters/appendix.rst:389 +#: ../../chapters/appendix.rst:390 msgid "Improved AutoDJ" msgstr "" -#: ../../source/chapters/appendix.rst:390 +#: ../../chapters/appendix.rst:391 msgid "Beatloop Rolls" msgstr "" -#: ../../source/chapters/appendix.rst:391 +#: ../../chapters/appendix.rst:392 msgid "Preview Deck" msgstr "" -#: ../../source/chapters/appendix.rst:392 +#: ../../chapters/appendix.rst:393 msgid "Advanced Search" msgstr "" -#: ../../source/chapters/appendix.rst:393 +#: ../../chapters/appendix.rst:394 msgid "New and Improved User Manual" msgstr "" -#: ../../source/chapters/appendix.rst:394 +#: ../../chapters/appendix.rst:395 msgid "New Controller Support" msgstr "" -#: ../../source/chapters/appendix.rst:396 +#: ../../chapters/appendix.rst:397 msgid "For a full list of new features and bugfixes, go to: `https://launchpad.net/mixxx/1.11.0 `_." msgstr "" -#: ../../source/chapters/appendix.rst:399 +#: ../../chapters/appendix.rst:400 msgid "**v1.10.1** (2012-06-30)" msgstr "" -#: ../../source/chapters/appendix.rst:401 +#: ../../chapters/appendix.rst:402 msgid "Bugfixes" msgstr "" -#: ../../source/chapters/appendix.rst:403 +#: ../../chapters/appendix.rst:404 msgid "For a full list of bugfixes, go to: `https://launchpad.net/mixxx/1.10.1 `_." msgstr "" -#: ../../source/chapters/appendix.rst:406 +#: ../../chapters/appendix.rst:407 msgid "**v1.10.0** (2011-12-25)" msgstr "" -#: ../../source/chapters/appendix.rst:408 +#: ../../chapters/appendix.rst:409 msgid "Rewritten and Improved Vinyl Control Support" msgstr "" -#: ../../source/chapters/appendix.rst:409 +#: ../../chapters/appendix.rst:410 msgid "4 Sampler Decks" msgstr "" -#: ../../source/chapters/appendix.rst:410 +#: ../../chapters/appendix.rst:411 msgid "Quantized Loops, Hotcues and Beatloops" msgstr "" -#: ../../source/chapters/appendix.rst:411 +#: ../../chapters/appendix.rst:412 msgid "Phase Synchronization" msgstr "" -#: ../../source/chapters/appendix.rst:412 +#: ../../chapters/appendix.rst:413 msgid "Beatgrid Adjust Feature" msgstr "" -#: ../../source/chapters/appendix.rst:413 +#: ../../chapters/appendix.rst:414 msgid "Microphone Support" msgstr "" -#: ../../source/chapters/appendix.rst:414 +#: ../../chapters/appendix.rst:415 msgid "Spinning Turntable Widgets and Waveform Scratching" msgstr "" -#: ../../source/chapters/appendix.rst:415 +#: ../../chapters/appendix.rst:416 msgid "M4A Support for Windows Vista and Windows 7 users" msgstr "" -#: ../../source/chapters/appendix.rst:416 +#: ../../chapters/appendix.rst:417 msgid "Brand New and Updated Skins" msgstr "" -#: ../../source/chapters/appendix.rst:417 +#: ../../chapters/appendix.rst:418 msgid "Accessibility Improvements" msgstr "" -#: ../../source/chapters/appendix.rst:418 +#: ../../chapters/appendix.rst:419 msgid "Limited Support for Internationalization" msgstr "" -#: ../../source/chapters/appendix.rst:419 +#: ../../chapters/appendix.rst:420 msgid "Revamped and Rewritten User Manual" msgstr "" -#: ../../source/chapters/appendix.rst:420 +#: ../../chapters/appendix.rst:421 msgid "Mixing engine improvements" msgstr "" -#: ../../source/chapters/appendix.rst:421 +#: ../../chapters/appendix.rst:422 msgid "Updated MIDI Mappings" msgstr "" -#: ../../source/chapters/appendix.rst:423 +#: ../../chapters/appendix.rst:424 msgid "For a full list of new features and bugfixes, go to: `https://launchpad.net/mixxx/1.10.0 `_." msgstr "" -#: ../../source/chapters/appendix.rst:426 +#: ../../chapters/appendix.rst:427 msgid "For an overview of previous versions, `take a look `_ at the timeline." msgstr "" diff --git a/source/locale/pot/chapters/configuration.pot b/source/locale/pot/chapters/configuration.pot index 2b3b0bb924..f65a13e862 100644 --- a/source/locale/pot/chapters/configuration.pot +++ b/source/locale/pot/chapters/configuration.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,577 +16,802 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/configuration.rst:6 +#: ../../chapters/configuration.rst:6 msgid "Mixxx Setup" msgstr "" -#: ../../source/chapters/configuration.rst:11 +#: ../../chapters/configuration.rst:11 msgid "Opening Mixxx" msgstr "" -#: ../../source/chapters/configuration.rst:12 -msgid "|logo| Once you've :ref:`installed Mixxx `, start by opening Mixxx and import your music to the Mixxx library." +#: ../../chapters/configuration.rst:12 +msgid "|logo| Once you've :ref:`installed Mixxx `, start by opening Mixxx and importing your music to the Mixxx library." msgstr "" -#: ../../source/chapters/configuration.rst:18 +#: ../../chapters/configuration.rst:18 msgid "**Windows**" msgstr "" -#: ../../source/chapters/configuration.rst:16 +#: ../../chapters/configuration.rst:16 msgid "Double-click the Mixxx icon on the Desktop. Alternatively, browse your Windows start menu and click the Mixxx icon, or perform a search for :file:`Mixxx.exe`." msgstr "" -#: ../../source/chapters/configuration.rst:23 +#: ../../chapters/configuration.rst:23 msgid "**Mac OSX**" msgstr "" -#: ../../source/chapters/configuration.rst:21 -msgid "Double-click the Mixxx icon in the :file:`Applications` folder. Alternatively, drag the Mixxx icon to the dock and double-click it there or search for \"Mixxx\" in Spotlight." +#: ../../chapters/configuration.rst:21 +msgid "Double-click the Mixxx icon in the :file:`Applications` folder. Alternatively, drag the Mixxx icon to the dock and double-click it there or search for :command:`mixxx` in Spotlight." msgstr "" -#: ../../source/chapters/configuration.rst:28 +#: ../../chapters/configuration.rst:32 msgid "**GNU/Linux**" msgstr "" -#: ../../source/chapters/configuration.rst:26 -msgid "Simply type :command:`mixxx` into the terminal, then hit :kbd:`Return`. With some distributions like Ubuntu you can also double-click the Mixxx icon in the launcher. Alternatively, perform a search for :file:`mixxx`." +#: ../../chapters/configuration.rst:26 +msgid "Click the Mixxx icon in the applications menu or launcher of your desktop environment or perform a search for :file:`mixxx`. Alternatively type :command:`mixxx` into the terminal, then hit :kbd:`Return`. If your :term:`soundcard` is not accessible from Mixxx because it is used by other applications via PulseAudio, you may close and restart Mixxx using :command:`pasuspender mixxx`. See :ref:`appendix-command-line-options` for an overview of Mixxx's command line options." msgstr "" -#: ../../source/chapters/configuration.rst:31 +#: ../../chapters/configuration.rst:35 msgid "Sound Hardware Preferences" msgstr "" -#: ../../source/chapters/configuration.rst:40 +#: ../../chapters/configuration.rst:44 msgid "Mixxx Sound Hardware Preferences" msgstr "" -#: ../../source/chapters/configuration.rst:42 -msgid ":menuselection:`Preferences --> Sound Hardware` allows you to select the audio in- and outputs to be used." +#: ../../chapters/configuration.rst:46 +msgid ":menuselection:`Preferences --> Sound Hardware` allows you to select the audio inputs and outputs to be used." msgstr "" -#: ../../source/chapters/configuration.rst:45 -msgid "**Sound API**: Depending your :term:`Operating System`, select the :term:`API` that Mixxx uses to deliver audio to your audio device. Your choice can drastically affect how smooth Mixxx performs on your computer." +#: ../../chapters/configuration.rst:49 +msgid "**Sound API**: Depending on your :term:`Operating System`, select the :term:`API` that Mixxx uses to deliver audio to your audio device. Your choice can drastically affect how well Mixxx performs on your computer." msgstr "" -#: ../../source/chapters/configuration.rst:49 +#: ../../chapters/configuration.rst:53 msgid "**Sample Rate**: Allows you to manually select the sample rate for the audio input. The sample rate value should be set to the sample rate of your audio interface. By default, Mixxx tries the system default first, which is most likely 44.1 kHz. Otherwise, Mixxx will pick a different default." msgstr "" -#: ../../source/chapters/configuration.rst:54 +#: ../../chapters/configuration.rst:58 msgid "**Audio buffer**: Also known as latency, this is the lag time in milliseconds that it takes for Mixxx to process your input. Lower latency means Mixxx will be more responsive but on slower computers and cheaper sound cards it might cause glitches." msgstr "" -#: ../../source/chapters/configuration.rst:59 -msgid "**Buffer Underflow Count**: Underflows (no data is available when needed) indicate that some of the subsystems in Mixxx can't keep up with real-time deadlines. This is useful to tune the latency settings. If the counter increases, then increase your audio buffer setting, decrease the sample rate setting or change the sound API setting if available." +#: ../../chapters/configuration.rst:63 +msgid "**Multi-Soundcard Synchronization**: Mixxx is able to use two or more :term:`soundcards` at a time, each with its own clock. When multiple soundcards are in use, the Mixxx engine is driven by the Master soundcard. Here you can select the synchronization used for the other soundcards to avoid buffer overflows or underflows." msgstr "" -#: ../../source/chapters/configuration.rst:68 +#: ../../chapters/configuration.rst:69 +msgid "**Keylock/Pitch-Bending Engine**: This allows you to select the engine used for independent tempo and pitch changes (e.g. :term:`keylock`). Use :menuselection:`Soundtouch` on lower power machines (such as netbooks) or if you experience buffer underflows while using :term:`keylock`." +msgstr "" + +#: ../../chapters/configuration.rst:74 +msgid "**Master Mix**: You may disable the master mix to reduce Mixxx's CPU usage if you do not use the Master output, recording or live broadcasting." +msgstr "" + +#: ../../chapters/configuration.rst:77 +msgid "**Master Output Mode**: In Mono mode, the left and right channel are combined into a mono signal which is passed to both channels of your master sound card. This is useful for setups where you can only hear the right or the left speaker." +msgstr "" + +#: ../../chapters/configuration.rst:82 +msgid "**Microphone/Talkover Mix**: This setting controls whether microphone outputs are mixed into the Master output or only into the broadcasting output. This is useful for preventing echo in broadcasting setups." +msgstr "" + +#: ../../chapters/configuration.rst:86 +msgid "**Headphone/Master Delay**: This setting allows you to compensate for the delay between what you hear in your headphones and the master speakers." +msgstr "" + +#: ../../chapters/configuration.rst:89 +msgid "Switch to mono mode (see above)." +msgstr "" + +#: ../../chapters/configuration.rst:90 +msgid "Listen to your headphones with one ear and the master speakers with the other ear." +msgstr "" + +#: ../../chapters/configuration.rst:92 +msgid "Adjust the delays until the sound seems to be centered and the stereo effect is gone." +msgstr "" + +#: ../../chapters/configuration.rst:94 +msgid "Switch back to stereo mode." +msgstr "" + +#: ../../chapters/configuration.rst:96 +msgid "**Buffer Underflow Count**: Underflows (data is not available when needed) indicate that some of the subsystems in Mixxx can't keep up with real-time deadlines imposed by the current audio buffer size. This is useful to tune the latency settings. If the counter increases, then increase your audio buffer size, decrease the sample rate setting or change the sound API setting if available." +msgstr "" + +#: ../../chapters/configuration.rst:106 msgid "Audio Outputs" msgstr "" -#: ../../source/chapters/configuration.rst:70 -msgid "Mixxx's mixing engine can be used two ways:" +#: ../../chapters/configuration.rst:108 +msgid "Mixxx's mixing engine can be used in two ways:" msgstr "" -#: ../../source/chapters/configuration.rst:82 +#: ../../chapters/configuration.rst:120 msgid "**Internal Mixer Mode**" msgstr "" -#: ../../source/chapters/configuration.rst:73 -msgid "In this mode, Mixxx performs the mixing of the decks, microphone, and samplers in software and outputs them to a single output. To enable internal mixer mode assign a valid audio output to the :guilabel:`Master` output in :menuselection:`Preferences --> Sound Hardware --> Output`." +#: ../../chapters/configuration.rst:111 +msgid "In this mode, Mixxx performs the mixing of the decks, microphone, and samplers in software and outputs them to a single output. To enable internal mixer mode, assign a valid audio output to the :guilabel:`Master` output in :menuselection:`Preferences --> Sound Hardware --> Output`." msgstr "" -#: ../../source/chapters/configuration.rst:78 +#: ../../chapters/configuration.rst:116 msgid "Internal mode is used in the following configurations:" msgstr "" -#: ../../source/chapters/configuration.rst:80 +#: ../../chapters/configuration.rst:118 msgid ":ref:`setup-laptop-only`" msgstr "" -#: ../../source/chapters/configuration.rst:81 +#: ../../chapters/configuration.rst:119 msgid ":ref:`setup-laptop-and-external-card`" msgstr "" -#: ../../source/chapters/configuration.rst:82 +#: ../../chapters/configuration.rst:120 msgid ":ref:`setup-controller-and-external-card`" msgstr "" -#: ../../source/chapters/configuration.rst:93 +#: ../../chapters/configuration.rst:131 msgid "**External Mixer Mode**" msgstr "" -#: ../../source/chapters/configuration.rst:85 -msgid "In this mode, Mixxx outputs the audio from each deck to a separate soundcard output. This allows you to route the deck outputs through a hardware mixer. Similarly, to enable external mixer mode, simply select a valid audio output for the :guilabel:`Deck` outputs in :menuselection:`Preferences --> Sound Hardware --> Output`." +#: ../../chapters/configuration.rst:123 +msgid "In this mode, Mixxx outputs the audio from each deck to a separate soundcard output. This allows you to route the deck outputs through a hardware mixer. To enable external mixer mode, select a valid audio output for the :guilabel:`Deck` outputs in :menuselection:`Preferences --> Sound Hardware --> Output`." msgstr "" -#: ../../source/chapters/configuration.rst:91 +#: ../../chapters/configuration.rst:129 msgid "External mode is used in the following configuration:" msgstr "" -#: ../../source/chapters/configuration.rst:93 +#: ../../chapters/configuration.rst:131 msgid ":ref:`setup-vinyl-control`" msgstr "" -#: ../../source/chapters/configuration.rst:96 +#: ../../chapters/configuration.rst:134 msgid "Headphone Output" msgstr "" -#: ../../source/chapters/configuration.rst:98 +#: ../../chapters/configuration.rst:136 msgid "In both internal and external mixer mode, you can choose a headphone output for :term:`pre-fader listening ` or :term:`headphone cueing ` in :menuselection:`Preferences --> Sound Hardware --> Output --> Headphone`. This allows you to listen and synchronize the track you will play next in your headphones before your audience hears the track. See also :ref:`interface-pfl`." msgstr "" -#: ../../source/chapters/configuration.rst:107 +#: ../../chapters/configuration.rst:145 msgid "Latency, Sample Rate, and Audio API" msgstr "" -#: ../../source/chapters/configuration.rst:109 +#: ../../chapters/configuration.rst:147 msgid "To achieve the best performance with Mixxx it is essential to configure your *audio buffer*, *sample rate*, and *audio API*. These three factors largely determine Mixxx's responsiveness and audio quality and the optimal settings will vary based on your computer and hardware quality." msgstr "" -#: ../../source/chapters/configuration.rst:117 +#: ../../chapters/configuration.rst:155 msgid "Audio Buffer" msgstr "" -#: ../../source/chapters/configuration.rst:119 +#: ../../chapters/configuration.rst:157 msgid "The audio buffer, also known as latency, is the lag time in milliseconds that it takes for Mixxx to process your input (turning knobs, sliding the crossfader, etc.). For example, with an audio buffer of 36 ms, it will take approximately 36 milliseconds for Mixxx to stop the audio after you toggle the play button. Additionally, the audio buffer setting determines how quickly your :term:`Operating System` expects Mixxx to react. A smaller audio buffer means Mixxx will be more responsive. On the other hand, setting your audio buffer too low may be too much for your computer and sound card to handle. In this situation, Mixxx playback will be choppy and very clearly distorted as your computer will not be able to keep up with how frequently Mixxx is processing audio." msgstr "" -#: ../../source/chapters/configuration.rst:131 +#: ../../chapters/configuration.rst:169 msgid "An audio buffer between 36-64 ms is acceptable if you are using Mixxx with a keyboard/mouse or a controller. An audio buffer below 10 ms is recommended when vinyl control is used because Mixxx will feel unresponsive otherwise." msgstr "" -#: ../../source/chapters/configuration.rst:135 +#: ../../chapters/configuration.rst:173 msgid "Keep in mind that *lower latencies require better soundcards and faster CPUs* and that zero latency DJ software is a myth (although Mixxx is capable of sub-1ms operation)." msgstr "" -#: ../../source/chapters/configuration.rst:140 +#: ../../chapters/configuration.rst:178 msgid "Sample Rate" msgstr "" -#: ../../source/chapters/configuration.rst:142 +#: ../../chapters/configuration.rst:180 msgid "The sample rate setting in Mixxx controls how many samples per second are produced by Mixxx. This determines the maximum frequency in Mixxx's signal, which is half the sample rate. Humans can only hear up to 20 kHz, so there is generally no need to use more than a 44.1 kHz (44100 Hz) sample rate for playback. Most music is published with a 44100 Hz sample rate." msgstr "" -#: ../../source/chapters/configuration.rst:148 +#: ../../chapters/configuration.rst:186 msgid "A sample rate of 96kHz takes Mixxx over twice as long to compute. Keep in mind that increasing the sample rate will increase CPU usage and likely raise the minimum audio buffer size you can use." msgstr "" -#: ../../source/chapters/configuration.rst:154 +#: ../../chapters/configuration.rst:192 msgid "Audio API" msgstr "" -#: ../../source/chapters/configuration.rst:156 +#: ../../chapters/configuration.rst:194 msgid "The Audio :term:`API` that Mixxx uses is the method by which Mixxx talks to your :term:`Operating System` in order to deliver audio to your soundcard. Your choice of Audio API can drastically affect Mixxx's performance on your computer. **Therefore it is important to take care to choose the best Audio API available to you.** Refer to the following table of Audio APIs to see what the best choice is for your operating system." msgstr "" -#: ../../source/chapters/configuration.rst:164 +#: ../../chapters/configuration.rst:202 msgid "OS / Audio API" msgstr "" -#: ../../source/chapters/configuration.rst:164 +#: ../../chapters/configuration.rst:202 msgid "Quality" msgstr "" -#: ../../source/chapters/configuration.rst:166 -msgid "Windows / WMME" +#: ../../chapters/configuration.rst:204 +msgid "Windows / ASIO" msgstr "" -#: ../../source/chapters/configuration.rst:166 -#: ../../source/chapters/configuration.rst:168 -msgid "Poor" +#: ../../chapters/configuration.rst:204 +#: ../../chapters/configuration.rst:206 +#: ../../chapters/configuration.rst:214 +#: ../../chapters/configuration.rst:216 +#: ../../chapters/configuration.rst:218 +msgid "Good" msgstr "" -#: ../../source/chapters/configuration.rst:168 -msgid "Windows / DirectSound" +#: ../../chapters/configuration.rst:206 +msgid "Windows / WDM-KS" msgstr "" -#: ../../source/chapters/configuration.rst:170 +#: ../../chapters/configuration.rst:208 msgid "Windows / WASAPI" msgstr "" -#: ../../source/chapters/configuration.rst:170 -#: ../../source/chapters/configuration.rst:172 -#: ../../source/chapters/configuration.rst:174 -#: ../../source/chapters/configuration.rst:176 -#: ../../source/chapters/configuration.rst:180 -#: ../../source/chapters/configuration.rst:182 -msgid "Good" -msgstr "" - -#: ../../source/chapters/configuration.rst:172 -msgid "Windows / ASIO" +#: ../../chapters/configuration.rst:208 +#: ../../chapters/configuration.rst:220 +msgid "Acceptable" msgstr "" -#: ../../source/chapters/configuration.rst:174 -msgid "Windows / WDDKMS" +#: ../../chapters/configuration.rst:210 +msgid "Windows / DirectSound" msgstr "" -#: ../../source/chapters/configuration.rst:176 -msgid "Mac OS X / CoreAudio" +#: ../../chapters/configuration.rst:210 +#: ../../chapters/configuration.rst:212 +msgid "Poor" msgstr "" -#: ../../source/chapters/configuration.rst:178 -msgid "GNU Linux / OSS" +#: ../../chapters/configuration.rst:212 +msgid "Windows / MME" msgstr "" -#: ../../source/chapters/configuration.rst:178 -msgid "OK" +#: ../../chapters/configuration.rst:214 +msgid "Mac OS X / CoreAudio" msgstr "" -#: ../../source/chapters/configuration.rst:180 +#: ../../chapters/configuration.rst:216 msgid "GNU Linux / ALSA" msgstr "" -#: ../../source/chapters/configuration.rst:182 +#: ../../chapters/configuration.rst:218 msgid "GNU Linux / JACK (Advanced)" msgstr "" -#: ../../source/chapters/configuration.rst:185 -msgid "On Windows, if an ASIO driver is not available for your operating system, you can try installing `ASIO4ALL `_, a low-latency audio driver for WDM audio devices." +#: ../../chapters/configuration.rst:220 +msgid "GNU Linux / OSS" +msgstr "" + +#: ../../chapters/configuration.rst:223 +msgid "For low latency on Windows, it is best to use an ASIO driver that bypassses the sound processing of the Windows kernel. If there is no such ASIO driver available for your soundcard, use the WDM-KS API. There is generally no advantage to using `ASIO4ALL `_, a wrapper around the WDM-KS API." msgstr "" -#: ../../source/chapters/configuration.rst:189 +#: ../../chapters/configuration.rst:229 msgid "On GNU/Linux, ALSA is the simplest sound API to configure. Using ALSA will prevent any other programs from using the sound card(s) that Mixxx is using." msgstr "" -#: ../../source/chapters/configuration.rst:192 +#: ../../chapters/configuration.rst:232 msgid "JACK allows you to route audio between JACK-compatible applications in flexible ways and output sound from multiple programs at the same time. However, JACK can be complicated to set up. To use JACK, start the JACK daemon *before* running Mixxx. Otherwise JACK will not appear as a Sound API in the preferences." msgstr "" -#: ../../source/chapters/configuration.rst:197 +#: ../../chapters/configuration.rst:237 msgid "Most modern GNU/Linux distributions use PulseAudio by default. When launched from a GUI menu entry or icon, Mixxx suspends PulseAudio while it is running so that Mixxx can use ALSA directly. Like JACK, PulseAudio allows multiple programs to access one sound card, but PulseAudio and JACK have opposite design goals. PulseAudio is designed to make ordinary computer usage such as watching videos online and listening to music easy whereas JACK is designed for demanding low latency audio programs like Mixxx. It can be difficult to setup JACK and PulseAudio to work well together. So, unless you already use JACK, it is easiest to let Mixxx suspend PulseAudio and use ALSA." msgstr "" -#: ../../source/chapters/configuration.rst:207 -msgid "On GNU/Linux it is not recommended to use the ``pulse`` device with the ALSA Audio API. This is an emulation layer for ALSA provided by PulseAudio. It has poor performance, but may be suitable for basic playback." +#: ../../chapters/configuration.rst:247 +msgid "If the PulseAudio plugin for alsalibs is installed on GNU/Linux, you can choose the virtual device ``pulse``. This allows Mixxx to share the default system sound card with other media players. This only works if you start Mixxx without pasuspender, which you can do by running :command:`mixxx` from a console rather than clicking the launcher icon in a menu or on your desktop. Since the sound stream is routed from ALSA to Pulse and back to ALSA, this adds an additional latency of ~2 x the selected audio buffer size." +msgstr "" + +#: ../../chapters/configuration.rst:256 +#: ../../chapters/configuration.rst:268 +msgid "Equalizer Preferences" +msgstr "" + +#: ../../chapters/configuration.rst:270 +msgid ":menuselection:`Preferences --> Equalizer` allows you to setup the equalizers." +msgstr "" + +#: ../../chapters/configuration.rst:272 +msgid "**Equalizer Rack**: The Equalizer Rack is a special effect rack that is connected to the deck's equalizer and filter controls." +msgstr "" + +#: ../../chapters/configuration.rst:275 +msgid "In this section you can select the equalizers and quick effects that are used with the decks." +msgstr "" + +#: ../../chapters/configuration.rst:278 +msgid "**Equalizer Plugin**: Here you can select the effect that is used as the mixing EQ in each deck. By default only built-in equalizers are displayed. Unchecking :menuselection:`Only allow EQ knobs to control EQ specific effects` allows you to select any other effect." +msgstr "" + +#: ../../chapters/configuration.rst:283 +msgid "**Quick Effect**: Here you can select the effect that is controlled by the dedicated filter knob in each deck. By default only built-in filter effects are selected for all decks, but that can be changed as above." +msgstr "" + +#: ../../chapters/configuration.rst:287 +msgid "**High/Low Shelf EQ**: This slider sets the crossover frequencies of the mixing EQ. It controls which frequency range is affected by the low, mid, and high channel EQ knobs. By default the low knob controls the bass and sub bass range up to 246 Hz. The mid knob controls the mid range up to 2.5 kHz. The remaining treble range is controlled by the high knob." +msgstr "" + +#: ../../chapters/configuration.rst:293 +msgid "**Master EQ**: This section allows you to setup an EQ that affects the master output." +msgstr "" + +#: ../../chapters/configuration.rst:298 +msgid "Mixing Equalizers" +msgstr "" + +#: ../../chapters/configuration.rst:300 +msgid "Mixxx offers three types of mixing equalizers with a full kill option. These equalizers are \"isolators\", adapted from analog crossover networks. Each EQ is combination of a high shelf filter, a band pass filter, and a low shelf filter. Each EQ type has a unique sound, so try them out to find out which one you prefer." +msgstr "" + +#: ../../chapters/configuration.rst:306 +msgid "The Bessel EQs with Lipshitz and Vanderkooy Mix (LV-Mix) do not alter the sound or take any processing time when their knobs are in the center position. They activate once you adjust an EQ knob." +msgstr "" + +#: ../../chapters/configuration.rst:310 +msgid "The Linkwitz-Riley EQ on the other hand always applies a minimum, natural sounding phase shift to the sound. Their processing time does not change when you adjust the EQ knobs." +msgstr "" + +#: ../../chapters/configuration.rst:314 +msgid "The following table compares some technical parameters:" +msgstr "" + +#: ../../chapters/configuration.rst:317 +msgid "Type" msgstr "" -#: ../../source/chapters/configuration.rst:215 +#: ../../chapters/configuration.rst:317 +msgid "cut" +msgstr "" + +#: ../../chapters/configuration.rst:317 +msgid "roll-off" +msgstr "" + +#: ../../chapters/configuration.rst:317 +msgid "phase shift" +msgstr "" + +#: ../../chapters/configuration.rst:317 +msgid "bit perfect" +msgstr "" + +#: ../../chapters/configuration.rst:317 +msgid "CPU usage" +msgstr "" + +#: ../../chapters/configuration.rst:319 +msgid "Bessel4 LV-Mix" +msgstr "" + +#: ../../chapters/configuration.rst:319 +msgid "soft" +msgstr "" + +#: ../../chapters/configuration.rst:319 +msgid "-24 db/Oct" +msgstr "" + +#: ../../chapters/configuration.rst:319 +#: ../../chapters/configuration.rst:321 +msgid "linear" +msgstr "" + +#: ../../chapters/configuration.rst:319 +#: ../../chapters/configuration.rst:321 +msgid "yes" +msgstr "" + +#: ../../chapters/configuration.rst:319 +msgid "low" +msgstr "" + +#: ../../chapters/configuration.rst:321 +msgid "Bessel8 LV-Mix" +msgstr "" + +#: ../../chapters/configuration.rst:321 +#: ../../chapters/configuration.rst:321 +msgid "medium" +msgstr "" + +#: ../../chapters/configuration.rst:321 +#: ../../chapters/configuration.rst:323 +msgid "-48 db/Oct" +msgstr "" + +#: ../../chapters/configuration.rst:323 +msgid "Linkwitz-Riley" +msgstr "" + +#: ../../chapters/configuration.rst:323 +msgid "sharp" +msgstr "" + +#: ../../chapters/configuration.rst:323 +msgid "minimum" +msgstr "" + +#: ../../chapters/configuration.rst:323 +msgid "no" +msgstr "" + +#: ../../chapters/configuration.rst:323 +msgid "high" +msgstr "" + +#: ../../chapters/configuration.rst:326 +msgid "cut: the frequency response (curve form) at the cross over frequency." +msgstr "" + +#: ../../chapters/configuration.rst:327 +msgid "roll-off: The steepness of the EQ bands." +msgstr "" + +#: ../../chapters/configuration.rst:328 +msgid "linear phase: No phase distortion, all frequencies are processed with the same group delay." +msgstr "" + +#: ../../chapters/configuration.rst:330 +msgid "minimum phase: A natural phase distortion, the group delay changes by the frequency." +msgstr "" + +#: ../../chapters/configuration.rst:332 +msgid "bit perfect: Whether the EQ leaves the original samples untouched when the EQ is at unity." +msgstr "" + +#: ../../chapters/configuration.rst:334 +msgid "CPU usage: Processing time needed to calculate the EQ output." +msgstr "" + +#: ../../chapters/configuration.rst:339 msgid "Importing your audio files" msgstr "" -#: ../../source/chapters/configuration.rst:227 -msgid "Mixxx running on Windows 8 - Choose music library directory dialog" +#: ../../chapters/configuration.rst:351 +msgid "Mixxx running on Windows 10 - Choose music library directory dialog" msgstr "" -#: ../../source/chapters/configuration.rst:247 +#: ../../chapters/configuration.rst:371 msgid "**Setup the music library**" msgstr "" -#: ../../source/chapters/configuration.rst:231 +#: ../../chapters/configuration.rst:355 msgid "The first time you run Mixxx, you are asked to select a directory where your music is stored. By default, the dialog points to a location where music files are typically held, but you can select any location on your computer." msgstr "" -#: ../../source/chapters/configuration.rst:235 +#: ../../chapters/configuration.rst:359 msgid "Click :guilabel:`Select Folder` and Mixxx will scan your music library. Depending on the size of your library this could take some time. All the supported music files Mixxx detects will be listed in the :ref:`library-root`." msgstr "" -#: ../../source/chapters/configuration.rst:239 +#: ../../chapters/configuration.rst:363 msgid "If you want to refresh your library (for example because you added or moved files), you can do this with :menuselection:`Library --> Rescan Library` in the menu. If you want to rescan at every launch, select :menuselection:`Preferences --> Library --> Rescan on startup`." msgstr "" -#: ../../source/chapters/configuration.rst:244 +#: ../../chapters/configuration.rst:368 msgid "On Windows 7 and 8 the import dialog points to your Windows “Music“ Library, a special-purpose virtual folder. You can **not** use these virtual folders. Select a regular folder instead, usually “My Music“, like pictured above." msgstr "" -#: ../../source/chapters/configuration.rst:249 +#: ../../chapters/configuration.rst:373 msgid "**Compatible files**" msgstr "" -#: ../../source/chapters/configuration.rst:251 +#: ../../chapters/configuration.rst:375 msgid "Support for the Opus audio format." msgstr "" -#: ../../source/chapters/configuration.rst:254 -msgid "Mixxx supports a variety of audio file formats: :term:`Wave ` (wav), :term:`Aiff ` (aiff, aif), :term:`MP3` (mp3), :term:`Ogg Vorbis` (ogg), :term:`FLAC` (flac), :term:`OPUS` (opus), and :term:`AAC` (aac, m4a) if supported by your :term:`OS `. :term:`DRM` protected files, such as m4p files purchased in the iTunes Store, are not supported." +#: ../../chapters/configuration.rst:378 +msgid "Mixxx supports a variety of audio file formats: :term:`Wave ` (wav), :term:`Aiff ` (aiff, aif), :term:`MP3` (mp3), :term:`Ogg Vorbis` (ogg), :term:`FLAC` (flac), :term:`Opus` (opus), and :term:`AAC` (aac, m4a) if supported by your :term:`OS `. :term:`DRM` protected files, such as m4p files purchased in the iTunes Store, are not supported." msgstr "" -#: ../../source/chapters/configuration.rst:260 -msgid "AAC (M4A) is supported on Windows Vista and Mac OSX 10.5 onwards. The `Platform Update Supplement `_ is required for Windows Vista." +#: ../../chapters/configuration.rst:384 +msgid "AAC (M4A) is supported on Windows Vista and Mac OS X 10.8 onwards. The `Platform Update Supplement `_ is required for Windows Vista." msgstr "" -#: ../../source/chapters/configuration.rst:264 -msgid "On Linux, AAC playback is disabled by default due to licensing restrictions. To enable the playback of AAC files, `build Mixxx from source with m4a/AAC files support `_." +#: ../../chapters/configuration.rst:388 +msgid "On Linux, AAC playback is disabled by default due to licensing restrictions. To enable the playback of AAC files, `build Mixxx from source with m4a/AAC files support `_." msgstr "" -#: ../../source/chapters/configuration.rst:271 +#: ../../chapters/configuration.rst:395 msgid "**Import external libraries**" msgstr "" -#: ../../source/chapters/configuration.rst:269 +#: ../../chapters/configuration.rst:393 msgid "If you have iTunes, Traktor, Rhythmbox, or Banshee installed, Mixxx allows you to access your tracks and playlists in the Mixxx library, see :ref:`library-3rd-party`." msgstr "" -#: ../../source/chapters/configuration.rst:280 +#: ../../chapters/configuration.rst:404 msgid "**Import remote files**" msgstr "" -#: ../../source/chapters/configuration.rst:274 +#: ../../chapters/configuration.rst:398 msgid "To import audio files which are not in your music library directory, drag them directly from an external :term:`file manager` or from the :ref:`Browse section ` to the track list. Importing files into Mixxx does not change the location of the files on the hard disk." msgstr "" -#: ../../source/chapters/configuration.rst:279 +#: ../../chapters/configuration.rst:403 msgid "You can not drag complete folders to the library because currently Mixxx can not recursively scan folders for compatible music files." msgstr "" -#: ../../source/chapters/configuration.rst:284 +#: ../../chapters/configuration.rst:408 msgid "**Import playlists**" msgstr "" -#: ../../source/chapters/configuration.rst:283 +#: ../../chapters/configuration.rst:407 msgid "You can import existing :file:`m3u`, :file:`pls` , :file:`m3u8`, :file:`pls` playlist files from products other than Mixxx, see :ref:`library-playlists`." msgstr "" -#: ../../source/chapters/configuration.rst:289 +#: ../../chapters/configuration.rst:413 msgid "**Import music from CDs**" msgstr "" -#: ../../source/chapters/configuration.rst:287 +#: ../../chapters/configuration.rst:411 msgid "Mixxx can not play music from Audio CDs. Convert the content to compatible files in good quality and add them to the Mixxx library. See ``_" msgstr "" -#: ../../source/chapters/configuration.rst:294 +#: ../../chapters/configuration.rst:418 msgid "Changing music directories" msgstr "" -#: ../../source/chapters/configuration.rst:296 +#: ../../chapters/configuration.rst:420 msgid "Handles multiple music library folders and adds an option to move them to another location without data loss." msgstr "" -#: ../../source/chapters/configuration.rst:300 +#: ../../chapters/configuration.rst:424 msgid "You can manually add, relink, and remove Mixxx music directories in :menuselection:`Preferences --> Library`." msgstr "" -#: ../../source/chapters/configuration.rst:312 +#: ../../chapters/configuration.rst:436 msgid "**Add a new music directory**" msgstr "" -#: ../../source/chapters/configuration.rst:304 +#: ../../chapters/configuration.rst:428 msgid "Mixxx handles multiple music library folders. Click :guilabel:`Add` to browse to a directory where your music is stored. Mixxx will watch this directory and its subdirectories for new tracks." msgstr "" -#: ../../source/chapters/configuration.rst:308 +#: ../../chapters/configuration.rst:432 msgid "If you add a directory that is already in your library, or you are currently :ref:`rescanning your library `, the operation is canceled." msgstr "" -#: ../../source/chapters/configuration.rst:311 +#: ../../chapters/configuration.rst:435 msgid "Directories can also be added from the :ref:`Browse ` sidebar item inside the library." msgstr "" -#: ../../source/chapters/configuration.rst:318 +#: ../../chapters/configuration.rst:442 msgid "**Relink a existing music directory**" msgstr "" -#: ../../source/chapters/configuration.rst:315 +#: ../../chapters/configuration.rst:439 msgid "If an existing music directory is moved, Mixxx doesn't know where to find the audio files in it. Click :guilabel:`Relink` to select the music directory in its new location. This will re-establish the links to the audio files in the Mixxx library." msgstr "" -#: ../../source/chapters/configuration.rst:336 +#: ../../chapters/configuration.rst:460 msgid "**Remove a music directory**" msgstr "" -#: ../../source/chapters/configuration.rst:321 +#: ../../chapters/configuration.rst:445 msgid "Click :guilabel:`Remove`, and Mixxx will no longer watch a directory and its subdirectories for new tracks, and asks what would you like to do with the tracks from these directories." msgstr "" -#: ../../source/chapters/configuration.rst:325 +#: ../../chapters/configuration.rst:449 msgid "Select :guilabel:`Hide Tracks` to hide all tracks from this directory and subdirectories." msgstr "" -#: ../../source/chapters/configuration.rst:327 +#: ../../chapters/configuration.rst:451 msgid "Select :guilabel:`Delete Track Metadata` to delete all metadata for these tracks from Mixxx permanently" msgstr "" -#: ../../source/chapters/configuration.rst:329 +#: ../../chapters/configuration.rst:453 msgid "Select :guilabel:`Leave Tracks Unchanged` to leave the tracks unchanged in your library." msgstr "" -#: ../../source/chapters/configuration.rst:332 +#: ../../chapters/configuration.rst:456 msgid "Hiding tracks saves their metadata in case you re-add them in the future." msgstr "" -#: ../../source/chapters/configuration.rst:334 +#: ../../chapters/configuration.rst:458 msgid "Metadata means all track details (artist, title, playcount, etc.) as well as beatgrids, hotcues, and loops. This choice only affects the Mixxx library. No files on disk will be changed or deleted." msgstr "" -#: ../../source/chapters/configuration.rst:338 +#: ../../chapters/configuration.rst:462 msgid "When changing music directories, you might want to run a library rescan afterwards. Select :menuselection:`Library --> Rescan Library` in the menu." msgstr "" -#: ../../source/chapters/configuration.rst:345 -msgid "BPM and Beat Detection Preferences" +#: ../../chapters/configuration.rst:469 +msgid "Removing tracks from the library" +msgstr "" + +#: ../../chapters/configuration.rst:471 +msgid "Removing tracks from the Mixxx library will **not** physically delete them from your drive. However it does delete extra metadata Mixxx might have (such as hotcues and the beatgrids), and removes links to playlists or crates." +msgstr "" + +#: ../../chapters/configuration.rst:475 +msgid "Click the :guilabel:`Library` item in the sidebar." +msgstr "" + +#: ../../chapters/configuration.rst:476 +msgid "Find and select the tracks you want to remove, perform a right-click on them and select :guilabel:`Hide from Library` from the context menu." +msgstr "" + +#: ../../chapters/configuration.rst:478 +msgid "Expand the :guilabel:`Library` item in the sidebar and click on the :guilabel:`Hidden tracks` sub-item. All tracks that were set to be hidden from the library will appear here." +msgstr "" + +#: ../../chapters/configuration.rst:481 +msgid "Select the tracks you want to remove, or use the :guilabel:`Select All` button." +msgstr "" + +#: ../../chapters/configuration.rst:483 +msgid "To confirm you want to permanently remove these tracks from the library, click :guilabel:`Purge`." msgstr "" -#: ../../source/chapters/configuration.rst:0 -msgid "Todo" +#: ../../chapters/configuration.rst:486 +msgid "If you later decide to add some of the deleted tracks back, import them to the Mixxx library again, see :ref:`configuration-import`." msgstr "" -#: ../../source/chapters/configuration.rst:351 -msgid "Update this section to explain the differences between the beatgrid and beatmap options." +#: ../../chapters/configuration.rst:492 +msgid "BPM and Beat Detection Preferences" msgstr "" -#: ../../source/chapters/configuration.rst:354 +#: ../../chapters/configuration.rst:501 msgid "Mixxx uses an ultra-precise BPM and beat detector. Manual adjustments are redundant in many cases because Mixxx knows where the beats are." msgstr "" -#: ../../source/chapters/configuration.rst:358 -#: ../../source/chapters/configuration.rst:434 +#: ../../chapters/configuration.rst:505 +#: ../../chapters/configuration.rst:581 msgid "Analyzer Settings" msgstr "" -#: ../../source/chapters/configuration.rst:360 +#: ../../chapters/configuration.rst:507 msgid "BPM and beat detection is a complex operation. Depending on your computer and the track's bitrate and duration this may take some time. By default Mixxx analyzes the complete track. To accelerate beat detection on slower computers, a “Fast Analysis” option is available. If enabled, the BPM is computed by analyzing the first minute of the track. In most cases this does not affect the beat detection negatively because most of today's dance music is written in a 4/4 signature with a fixed tempo." msgstr "" -#: ../../source/chapters/configuration.rst:375 +#: ../../chapters/configuration.rst:522 msgid "Mixxx preferences - BPM settings" msgstr "" -#: ../../source/chapters/configuration.rst:377 +#: ../../chapters/configuration.rst:524 msgid "The table below summarizes the beat detection settings:" msgstr "" -#: ../../source/chapters/configuration.rst:380 -#: ../../source/chapters/configuration.rst:454 +#: ../../chapters/configuration.rst:527 +#: ../../chapters/configuration.rst:601 msgid "Option" msgstr "" -#: ../../source/chapters/configuration.rst:380 -#: ../../source/chapters/configuration.rst:454 +#: ../../chapters/configuration.rst:527 +#: ../../chapters/configuration.rst:601 msgid "Description" msgstr "" -#: ../../source/chapters/configuration.rst:382 -#: ../../source/chapters/configuration.rst:456 +#: ../../chapters/configuration.rst:529 +#: ../../chapters/configuration.rst:603 msgid "Enable Fast Analysis" msgstr "" -#: ../../source/chapters/configuration.rst:382 -msgid "If enabled, BPM will be detected by only using the first minute of audio." +#: ../../chapters/configuration.rst:529 +msgid "If enabled, BPM will be detected by only using the first minute of audio." msgstr "" -#: ../../source/chapters/configuration.rst:385 +#: ../../chapters/configuration.rst:532 msgid "Assume constant tempo" msgstr "" -#: ../../source/chapters/configuration.rst:385 +#: ../../chapters/configuration.rst:532 msgid "If enabled, Mixxx assumes that the distances between the beats are constant. If disabled, the raw beat grid obtained by the analyzer is presented. The latter is appropriate for tracks with variable tempo." msgstr "" -#: ../../source/chapters/configuration.rst:392 +#: ../../chapters/configuration.rst:539 msgid "Enable Offset Correction" msgstr "" -#: ../../source/chapters/configuration.rst:392 +#: ../../chapters/configuration.rst:539 msgid "Prevents beat markers from being placed incorrectly." msgstr "" -#: ../../source/chapters/configuration.rst:395 +#: ../../chapters/configuration.rst:542 msgid "Re-analyze beats when settings change or beat detection data is outdated" msgstr "" -#: ../../source/chapters/configuration.rst:395 -msgid "If enabled, Mixxx over-writes old beat grids from Mixxx before v1.11. Moreover, it will re-analyze the BPM if your beat detection preferences change or BPM data from 3rd party programs are present." +#: ../../chapters/configuration.rst:542 +msgid "If enabled, Mixxx over-writes old beat grids from prior versions. Moreover, it will re-analyze the BPM if your beat detection preferences change or BPM data from 3rd party programs are present." msgstr "" -#: ../../source/chapters/configuration.rst:404 +#: ../../chapters/configuration.rst:551 msgid "Correcting Beat Grids" msgstr "" -#: ../../source/chapters/configuration.rst:406 +#: ../../chapters/configuration.rst:553 msgid "There may be situations where BPM and beat detection do not result in a proper beat grid." msgstr "" -#: ../../source/chapters/configuration.rst:409 -msgid "Typically, the detected BPM is correct but the analyzer has failed to detect the location of the first beat. Consequently, the beat markers are shifted, i.e. the beat markers are always a fixed distance from the true beat. To adjust the beat grid, cue the track before a real beat and click the :guilabel:`Beat-grid Adjust` button in the :ref:`interface-button-grid`." +#: ../../chapters/configuration.rst:556 +msgid "Typically, the detected BPM is correct but the analyzer has failed to detect the location of the first beat. Consequently, the beat markers are shifted, i.e. the beat markers are a fixed distance from the true beat. To adjust the beat grid, cue the track before a real beat and click the :guilabel:`Beat-grid Adjust` button in the :ref:`interface-button-grid`." msgstr "" -#: ../../source/chapters/configuration.rst:415 +#: ../../chapters/configuration.rst:562 msgid "If the detected BPM is not accurate, the corresponding beat grid will also be inaccurate. A deviation of 0.02 BPM units from the correct BPM will cause beatgrid alignment issues on long tracks (e.g. a club mix). If this happens, your beatgrid may look aligned for the few minutes but you will notice a slight drift as the song goes on. Finding the correct BPM is easy in many cases - just follow the note below." msgstr "" -#: ../../source/chapters/configuration.rst:422 +#: ../../chapters/configuration.rst:569 msgid "If the detected BPM value is not sufficiently accurate but very close to an integer value, try to set the BPM value manually to the integer." msgstr "" -#: ../../source/chapters/configuration.rst:428 +#: ../../chapters/configuration.rst:575 msgid "Key Detection Preferences" msgstr "" -#: ../../source/chapters/configuration.rst:430 -msgid "Mixxx comes with a high precision key detection to help you making smooth mixes by ensuring that your tracks are musically compatible." +#: ../../chapters/configuration.rst:577 +msgid "Mixxx comes with a high precision musical key detector to help you make smooth mixes by ensuring that your tracks are musically compatible." msgstr "" -#: ../../source/chapters/configuration.rst:436 +#: ../../chapters/configuration.rst:583 msgid "Key detection is a complex operation. Depending on your computer and the track's bitrate and duration this may take some time. By default Mixxx analyzes the complete track. To accelerate key detection on slower computers, a “Fast Analysis” option is available. If enabled, the key is computed by analyzing the first minute of the track." msgstr "" -#: ../../source/chapters/configuration.rst:449 +#: ../../chapters/configuration.rst:596 msgid "Mixxx preferences - Key settings" msgstr "" -#: ../../source/chapters/configuration.rst:451 +#: ../../chapters/configuration.rst:598 msgid "The table below summarizes the Key detection settings:" msgstr "" -#: ../../source/chapters/configuration.rst:456 +#: ../../chapters/configuration.rst:603 msgid "If enabled, the key will be detected by using only the first minute of audio." msgstr "" -#: ../../source/chapters/configuration.rst:460 +#: ../../chapters/configuration.rst:607 msgid "Re-analyze key when settings change or Key detection data is outdated" msgstr "" -#: ../../source/chapters/configuration.rst:460 +#: ../../chapters/configuration.rst:607 msgid "If enabled, Mixxx will re-analyse tracks if you select a different key detection plugin or the key was generated by a program other than Mixxx." msgstr "" -#: ../../source/chapters/configuration.rst:466 +#: ../../chapters/configuration.rst:613 msgid "Key Notation" msgstr "" -#: ../../source/chapters/configuration.rst:466 +#: ../../chapters/configuration.rst:613 msgid "Change the way keys are displayed in the library." msgstr "" -#: ../../source/chapters/configuration.rst:473 +#: ../../chapters/configuration.rst:620 msgid "Analyze your library" msgstr "" -#: ../../source/chapters/configuration.rst:479 -msgid "|ic_lib_prepare| Mixxx automatically analyzes tracks the first time you load them in a deck, nevertheless it is recommended that you analyze them before playing live with them to ensure the beatgrids are correct. Furthermore, track analysis takes considerable CPU power and might cause skips in the audio --- things you surely don't need while performing." +#: ../../chapters/configuration.rst:626 +msgid "|ic_lib_prepare| Mixxx automatically analyzes tracks the first time you load them in a deck, nevertheless it is recommended that you analyze them before playing live to ensure the beatgrids are correct. Furthermore, track analysis takes considerable CPU power and might cause skips in the audio --- things you surely don't need while performing." msgstr "" -#: ../../source/chapters/configuration.rst:485 -msgid "Once you have configured your music directories and your BPM and key detection settings, press :guilabel:`OK` on the Preferences window. Go to the Analyze view on the left side panel of the library. Thiis allows you to run :term:`beatgrid`, :term:`key`, and :term:`ReplayGain` detection on tracks in advance. While analyzing, the progress in percentage and total queue length are shown." +#: ../../chapters/configuration.rst:632 +msgid "Once you have configured your music directories and your BPM and key detection settings, press :guilabel:`OK` on the Preferences window. Go to the Analyze view on the left side panel of the library. This allows you to run :term:`beatgrid`, :term:`key`, and :term:`ReplayGain` detection on tracks in advance. While analyzing, the progress in percentage and total queue length are shown." msgstr "" -#: ../../source/chapters/configuration.rst:492 +#: ../../chapters/configuration.rst:639 msgid "Drag and drop tracks from the library or external file managers onto the analysis view to instantly analyze these files. The title changes to :guilabel:`Analyze (x/y)` where x is the number of tracks that have been analyzed so far and y is the total number of tracks originally in the queue." msgstr "" -#: ../../source/chapters/configuration.rst:498 +#: ../../chapters/configuration.rst:645 msgid "Does not generate waveforms to save disk space." msgstr "" -#: ../../source/chapters/configuration.rst:501 +#: ../../chapters/configuration.rst:648 msgid "The Analyze features in detail:" msgstr "" -#: ../../source/chapters/configuration.rst:503 +#: ../../chapters/configuration.rst:650 msgid "**All / New radio-buttons**: Allows you to view a list of either all tracks in the library or tracks added to the library within the last 7 days." msgstr "" -#: ../../source/chapters/configuration.rst:505 +#: ../../chapters/configuration.rst:652 msgid "**Select All button**: Selects all tracks in the current view." msgstr "" -#: ../../source/chapters/configuration.rst:506 +#: ../../chapters/configuration.rst:653 msgid "**Analyze button**: Starts the detection on the selected tracks." msgstr "" -#: ../../source/chapters/configuration.rst:508 -msgid "For more information, go to :ref:`djing-bpm-detection`." +#: ../../chapters/configuration.rst:655 +msgid "For more information, go to :ref:`configuration-bpm-detection`." msgstr "" diff --git a/source/locale/pot/chapters/controlling_mixxx.pot b/source/locale/pot/chapters/controlling_mixxx.pot index be11108e52..5fd26adfbe 100644 --- a/source/locale/pot/chapters/controlling_mixxx.pot +++ b/source/locale/pot/chapters/controlling_mixxx.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,231 +16,231 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/controlling_mixxx.rst:4 +#: ../../chapters/controlling_mixxx.rst:4 msgid "Controlling Mixxx" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:6 +#: ../../chapters/controlling_mixxx.rst:6 msgid "Mixxx can be controlled with a keyboard, a mouse, :term:`MIDI`/:term:`HID` controllers, time-code records/CDs, or a combination of these. The choice usually depends on your budget or style of DJing." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:13 +#: ../../chapters/controlling_mixxx.rst:13 msgid "Using a Mouse and Touchpad" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:15 +#: ../../chapters/controlling_mixxx.rst:15 msgid "Use your mouse to interact with the controls in the :ref:`Mixxx User Interface ` on your computer screen. You can perform actions by pointing and clicking with your mouse." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:19 -msgid "**Single Left Click**: Performing a left mouse click on buttons triggers the default action for that control. Moreover if you click on a value in the track list of the Mixxx :ref:`library `, you can change the value. For example the year of a track." +#: ../../chapters/controlling_mixxx.rst:19 +msgid "**Single Left Click**: Performing a left mouse click on buttons triggers the default action for that control. Moreover if you click on a value in the track list of the Mixxx :ref:`library `, you can change the value. For example the year of a track." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:23 +#: ../../chapters/controlling_mixxx.rst:23 msgid "**Single Right Click**: On most buttons, performing a right click triggers a different action than a left click. You can return any knob or fader to its default value by right-clicking that control." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:26 +#: ../../chapters/controlling_mixxx.rst:26 msgid "**Mouse Drag**: Click on a knob or fader, hold the left mouse button and move your cursor to change the value of the control. Use mouse drag to drop tracks from the file list to the decks, crates, playlists, etc." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:29 +#: ../../chapters/controlling_mixxx.rst:29 msgid "**Mouse Wheel**: Just like Mouse Drag, you can change knob and fader values by placing the cursor over the control and moving the mouse wheel." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:32 +#: ../../chapters/controlling_mixxx.rst:32 msgid "If you hover with the mouse over a control (e.g the crossfader) in the Mixxx user interface, the tooltip lists the left- and right-click action respectively." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:36 +#: ../../chapters/controlling_mixxx.rst:36 msgid "On a Macbook or a computer with a touchpad that lacks mouse buttons, a two-finger click gesture is often treated as a right click." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:39 +#: ../../chapters/controlling_mixxx.rst:39 msgid "Using the Mouse drag/wheel on the waveforms you can adjust zoom and playback rate of the tracks. For more information, go to :ref:`interface-waveform`." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:46 +#: ../../chapters/controlling_mixxx.rst:46 msgid "Using a Keyboard" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:55 +#: ../../chapters/controlling_mixxx.rst:55 msgid "Mixxx Keyboard shortcuts (for en-us keyboard layout)" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:57 +#: ../../chapters/controlling_mixxx.rst:57 msgid ":download:`Download the image <../_static/Mixxx-111-Keyboard-Mapping.png>`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:59 +#: ../../chapters/controlling_mixxx.rst:59 msgid "Controlling Mixxx with a keyboard is handy. Unlike mouse control, the keyboard allows you to manage things simultaneously. For example, you can start playing a track on deck 1 whilst stopping deck 2 at the same time." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:63 +#: ../../chapters/controlling_mixxx.rst:63 msgid "The default mapping for English keyboards is depicted in the figure above. It is divided into a left-hand side for deck 1 and right-hand side for deck 2. Please note that you can also access the functions through Mixxx's interface." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:67 +#: ../../chapters/controlling_mixxx.rst:67 msgid "For some user groups, like those using :term:`controllers ` or :term:`vinyl control`, it might be useful to enable/disable the keyboard mappings at runtime. You can do so by clicking :menuselection:`Options --> Enable Keyboard Shortcuts`." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:72 +#: ../../chapters/controlling_mixxx.rst:72 msgid "If you hover with the mouse over a control (e.g. the crossfader) in the Mixxx user interface, the tooltip lists the keyboard shortcuts of the control among a description of the control." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:76 +#: ../../chapters/controlling_mixxx.rst:76 msgid "For a list of default shortcuts, go to :ref:`appendix-keyboard`." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:79 +#: ../../chapters/controlling_mixxx.rst:79 msgid "Customizing the keyboard mapping" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:81 +#: ../../chapters/controlling_mixxx.rst:81 msgid "Mixxx allows you to customize the keyboard control. For more information, go to:" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:83 +#: ../../chapters/controlling_mixxx.rst:83 msgid ":ref:`advanced-keyboard`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:88 +#: ../../chapters/controlling_mixxx.rst:88 msgid "Using MIDI/HID Controllers" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:90 +#: ../../chapters/controlling_mixxx.rst:90 msgid "Mixxx supports MIDI and HID :term:`controllers ` which are external hardware devices used to control audio applications. Many DJs prefer the hands-on feel of a controller with Mixxx because it can feel similar to using a real mixer and turntables or :term:`CDJ`." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:98 +#: ../../chapters/controlling_mixxx.rst:98 msgid "Loading a controller preset" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:106 +#: ../../chapters/controlling_mixxx.rst:106 msgid "Mixxx Preferences - Loading a controller preset" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:108 +#: ../../chapters/controlling_mixxx.rst:108 msgid "Without loading the correct preset, your controller does not work with Mixxx." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:110 +#: ../../chapters/controlling_mixxx.rst:110 msgid "Connect your controller(s) to your computer" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:111 +#: ../../chapters/controlling_mixxx.rst:111 msgid "Start Mixxx" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:112 +#: ../../chapters/controlling_mixxx.rst:112 msgid "Go to :menuselection:`Preferences --> Controllers`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:113 +#: ../../chapters/controlling_mixxx.rst:113 msgid "Select your device from the list of available devices on the left, and the right pane will change" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:115 +#: ../../chapters/controlling_mixxx.rst:115 msgid "Activate the :guilabel:`Enabled` checkbox" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:116 -msgid "Select the mapping for your controller from the :guilabel:`Presets` drop-down menu" +#: ../../chapters/controlling_mixxx.rst:116 +msgid "Select the mapping for your controller from the :guilabel:`Load Preset` drop-down menu" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:118 -msgid "Click :guilabel:`OK` and Mixxx can now be controlled by your controller(s)." +#: ../../chapters/controlling_mixxx.rst:118 +msgid "Click :guilabel:`Apply` and Mixxx can now be controlled by your controller(s)." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:119 +#: ../../chapters/controlling_mixxx.rst:119 msgid "Repeat step 4-7 for any of the controllers you want to use" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:121 +#: ../../chapters/controlling_mixxx.rst:121 msgid "If you do not find a connected device in the list, make sure to install any necessary drivers for that device." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:125 +#: ../../chapters/controlling_mixxx.rst:125 msgid "Supported controllers" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:127 +#: ../../chapters/controlling_mixxx.rst:127 msgid "Mixxx can use any :term:`MIDI`/:term:`HID` controller that is recognized by your :term:`OS ` (some may require drivers), as long as there is a MIDI/HID mapping file to tell Mixxx how to understand it. Mixxx comes bundled with a number of mappings for various devices. There are two levels of controller mappings:" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:133 +#: ../../chapters/controlling_mixxx.rst:133 msgid "**Mixxx Certified Mappings**: These mappings are verified by the Mixxx Development Team." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:135 +#: ../../chapters/controlling_mixxx.rst:135 msgid "**Community Supported Mappings**: These mappings are provided and have been verified as working by the Mixxx community, but the Mixxx Development Team is unable to verify their quality because we don't have the devices ourselves. They might have bugs or rough edges." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:140 +#: ../../chapters/controlling_mixxx.rst:140 msgid "If you run into issues with any of these mappings, please file a :term:`bug report` on our `Bug Tracker`_ or tell us about it on our mailing list, forums, or :term:`IRC` channel. Device support varies for each supported :term:`OS `, so make sure to consult the documentation of the device." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:145 +#: ../../chapters/controlling_mixxx.rst:145 msgid "Additional mappings are available in the `Controller presets forum`_." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:147 +#: ../../chapters/controlling_mixxx.rst:147 msgid "Before purchasing a controller to use with Mixxx, consult our `Hardware Compatibility wiki page`_. It contains the most up-to-date information about which controllers work with Mixxx and the details of each." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:157 +#: ../../chapters/controlling_mixxx.rst:157 msgid "Installing a preset from the forum" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:158 -msgid "To use a controller mapping that did not come bundled with Mixxx, place the controller mapping in your User Presets folder. This is the folder called \"controllers\" inside your User Preferences folder. To open your User Presets folder, go to :menuselection:`Preferences --> Controllers` and click the :guilabel:`Open User Preset Folder` button. Alternatively, navigate to the folder in your :term:`OS` file browser:" +#: ../../chapters/controlling_mixxx.rst:158 +msgid "To use a controller mapping that did not come bundled with Mixxx, place the controller mapping in your User Presets folder. This is the folder called \"controllers\" inside your User Preferences folder. To open your User Presets folder, go to :menuselection:`Preferences --> Controllers` and click the :guilabel:`Open User Preset Folder` button. Alternatively, navigate to the folder in your :term:`OS ` file browser:" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:165 +#: ../../chapters/controlling_mixxx.rst:165 msgid "GNU/Linux: :file:`/home//.mixxx/controllers`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:166 +#: ../../chapters/controlling_mixxx.rst:166 msgid "OS X: :file:`/Users//Library/Application Support/Mixxx/controllers`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:167 +#: ../../chapters/controlling_mixxx.rst:167 msgid "Windows Vista and newer: :file:`C:\\\\Users\\\\\\\\AppData\\\\Mixxx\\\\controllers`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:168 +#: ../../chapters/controlling_mixxx.rst:168 msgid "Windows XP: :file:`C:\\\\Documents and Settings\\\\\\\\AppData\\\\controllers`" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:170 +#: ../../chapters/controlling_mixxx.rst:170 msgid "On Windows, the :file:`AppData` folder is hidden, so if you have not already, you will need to set Windows Explorer to show hidden files and folders (how to do this varies with each version of Windows)." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:174 -msgid "If the mapping was posted as a :file:`.zip` file, first extract the :file:`.zip` file by right clicking on it in your file browser and selecting the option for extracting an archive or compressed folder. Copy the :file:`.xml` file into your User Preset folder. If there is a :file:`.js` file, also copy that to your User Preset folder. Restart Mixxx and :ref:`load the preset`." +#: ../../chapters/controlling_mixxx.rst:174 +msgid "If the mapping was posted as a :file:`.zip` file, first extract the :file:`.zip` file by right clicking on it in your file browser and selecting the option for extracting an archive or compressed folder. Copy the :file:`.xml` file into your User Preset folder. If there is a :file:`.js` file, also copy that to your User Preset folder. Restart Mixxx and :ref:`load the preset `." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:181 +#: ../../chapters/controlling_mixxx.rst:181 msgid "Map your own your controller" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:183 +#: ../../chapters/controlling_mixxx.rst:183 msgid "There is no mapping available for your controller or you want to change an existing mapping? You can map your controller by using the Controller Wizard or take full control with the MIDI Scripting support in Mixxx." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:187 +#: ../../chapters/controlling_mixxx.rst:187 msgid "Go to :ref:`advanced-controller` for detailed information." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:192 +#: ../../chapters/controlling_mixxx.rst:192 msgid "Using Timecode Vinyl Records and CDs" msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:194 +#: ../../chapters/controlling_mixxx.rst:194 msgid ":term:`Vinyl control` allows a user to manipulate the playback of a track in Mixxx using a turntable or :term:`CDJ` as an interface. In effect, it simulates the sound and feel of having your digital music collection on vinyl. Many DJs prefer the tactile feel of vinyl, and vinyl control allows that feel to be preserved while retaining the benefits of using digital audio." msgstr "" -#: ../../source/chapters/controlling_mixxx.rst:200 +#: ../../chapters/controlling_mixxx.rst:200 msgid "Go to :ref:`vinyl-control` for detailed information." msgstr "" diff --git a/source/locale/pot/chapters/djing_with_mixxx.pot b/source/locale/pot/chapters/djing_with_mixxx.pot index 60b1ae51fa..0fea0921a1 100644 --- a/source/locale/pot/chapters/djing_with_mixxx.pot +++ b/source/locale/pot/chapters/djing_with_mixxx.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,399 +16,424 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/djing_with_mixxx.rst:4 +#: ../../chapters/djing_with_mixxx.rst:4 msgid "DJing With Mixxx" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:6 +#: ../../chapters/djing_with_mixxx.rst:6 msgid "Mixxx was designed to be easy to learn for both novice and experienced DJs." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:8 +#: ../../chapters/djing_with_mixxx.rst:8 msgid "This part of the manual provides you with directions for using Mixxx's features to create your own mixes." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:14 +#: ../../chapters/djing_with_mixxx.rst:14 msgid "Setting Your Levels Properly (Gain Staging)" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:23 +#: ../../chapters/djing_with_mixxx.rst:23 msgid "Setting your levels properly, also known as gain staging, is essential for getting the best sound quality out of the equipment you are using. At every link in your signal chain, from Mixxx's channel gains to the power amplifier, the level should be well above the noise floor, but lower than the maximum level before the signal clips. The :term:`level meters ` should mostly be around the top of their green region. The level meter pictured to the left shows where Mixxx's level meters should average at the loudest parts of tracks. The average level should not be in the yellow region. Use the yellow region to leave headroom, or available level above the average before the signal clips. The loudest parts of the music (the transients) should briefly go into the yellow region." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:40 +#: ../../chapters/djing_with_mixxx.rst:40 msgid "A waveform at a good level. Note that the example waveforms in this section were made by adjusting the visual gain of the waveform display in Mixxx to illustrate the concepts. Adjusting the visual gain of the waveform display does not change the level of the audio." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:50 +#: ../../chapters/djing_with_mixxx.rst:50 msgid "**If a level meter is in its red region, the signal is clipping and the gain should be turned down.** Some equipment doesn't have a level meter and only has an LED that turns on when the signal clips. Clipping means that the peaks of the waveform are flattened because the equipment has reached the maximum level that it can amplify the signal to. This distorts sound in an unpleasant way and can damage equipment by driving it with more power than it is designed to handle. Increasing the gain past the point where clipping begins (further into the red on a meter) will distort the signal more. If you want to make the sound louder when every part of the signal chain is at its maximum without clipping, use more speakers or use speakers that are more sensitive and convert electrical energy into acoustic energy more efficiently." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:67 +#: ../../chapters/djing_with_mixxx.rst:67 msgid "A clipping waveform" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:74 +#: ../../chapters/djing_with_mixxx.rst:74 msgid "On the other hand, the signal should not be too low. This is because every audio device generates a little noise at a level referred to as its noise floor. Additionally, analog signals pick up noise as they travel along wires. The signal measured by the meter on the left is relatively close to the noise floor. When a device is turned up, the noise floor does not go up; only the signal does. However, every time the signal is amplified by the gain of another piece of equipment, both the noise and the signal from previous devices in the signal chain are amplified. For example, if your sound card is turned down and you turn the gain up on your mixer to compensate, the signal-to-noise ratio (SNR) of the sound card output will be low and the mixer's gain will amplify the signal and the noise from the sound card, plus the noise picked up along the wire. The end result will have more noise than if the output of the sound card was turned up before the signal reached the mixer and the mixer's gain did not have to be turned up." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:94 +#: ../../chapters/djing_with_mixxx.rst:94 msgid "A waveform that is too close to the noise floor" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:96 -msgid "To adjust the output volume of a sound system while maintaing a high signal-to-noise ratio, the gain should be adjusted as close to the speakers as possible. Refer to the :ref:`Gain Knob ` section for details." +#: ../../chapters/djing_with_mixxx.rst:96 +msgid "To adjust the output volume of a sound system while maintaining a high signal-to-noise ratio, the gain should be adjusted as close to the speakers as possible. Refer to the :ref:`Gain Knob ` section for details." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:104 +#: ../../chapters/djing_with_mixxx.rst:104 msgid "Beatmatching and Mixing" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:106 +#: ../../chapters/djing_with_mixxx.rst:106 msgid ":term:`Beatmatching` is the process of adjusting the playback rate of a track so that it matches the tempo of another track. Beatmatching also involves adjusting the :term:`phase` of the beats in a track so that they are aligned with the beats in the other track. Matching the :term:`tempo` and aligning the beats are the two things a DJ must do to beatmatch." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:112 +#: ../../chapters/djing_with_mixxx.rst:112 msgid "Mixxx can match the tempo and align the beats for you but this requires an accurately detected BPM value and a correct beat grid for both tracks. To enable this feature, tap the :guilabel:`SYNC` button. To beatmatch manually, the tempo of the two tracks must be synchronized by adjusting the playback rate sliders. You can adjust the phase of the beats by right-clicking and dragging on either waveform display to temporarily speed up or slow down one of the tracks until the beats are aligned. The temporary pitch bend buttons can also be used to momentarily adjust the playback rate, allowing you to “shuffle” the beats in a track forwards or backwards, so they can be aligned with another track. See the chapter :ref:`interface-rate`." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:123 +#: ../../chapters/djing_with_mixxx.rst:123 msgid "Two tracks are beatmatched once their tempos are matched and their beats are aligned. A “perfect” beatmatch is nearly impossible - there will always be a tiny difference in the playback rates. A keen DJ will keep his or her ears open and listen for the beats drifting out of alignment. This has a distinct “double bass kick” sound which is often preceded by the kick weakening in intensity as the two kicks drift out of phase. When this happens, the beats can be realigned by simply tapping one of the temporary pitch bend buttons a few times in the appropriate direction." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:135 +#: ../../chapters/djing_with_mixxx.rst:135 msgid "Master Sync" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:139 +#: ../../chapters/djing_with_mixxx.rst:139 msgid ":term:`Master Sync` is an intelligent assistant that allows you to leave the beatmatching to Mixxx so you can focus on track selection, effects manipulation, looping, 4 deck mixing, and other advanced DJing techniques." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:143 -msgid "To activate Master Sync on a deck, push and hold (or click and hold) the :guilabel:`SYNC` button. You'll know Master Sync is on because the sync button will remain lit. Changing the rate of any deck that has Sync lit will change the rates of all other decks that also have the Sync button lit. There is no need to set specific decks to be a master or followers. You can play, stop, eject, load, and queue any track with master sync and it won't interrupt the playback of the other decks. Changing the rate of stopped deck will change the rate of playing decks, however." +#: ../../chapters/djing_with_mixxx.rst:143 +msgid "To activate Master Sync on a deck, push and hold (or click and hold) the :guilabel:`SYNC` button. You'll know Master Sync is on because the sync button will remain lit. Changing the rate of any deck that has Sync lit will change the rates of all other decks that also have the Sync button lit. There is no need to set specific decks to be a master or followers. You can play, stop, eject, load, and queue any track with master sync and it won't interrupt the playback of the other decks. However, changing the rate of a stopped deck will change the rate of playing decks." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:152 +#: ../../chapters/djing_with_mixxx.rst:152 msgid "Master Sync will also notice if one of your tracks is double the BPM of another track and match them correctly. So if you want to mix a 140 BPM drum & bass track with a 70 bpm dubstep track, Master Sync will make sure they are lined up properly." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:157 +#: ../../chapters/djing_with_mixxx.rst:157 msgid "Usually, Master Sync will only make sure the rate sliders are set correctly. If you also want to make sure your beats are perfectly in sync, turn on the :guilabel:`QUANTIZE` button. When activated, Quantize will ensure that the beats are perfectly lined up as well." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:165 +#: ../../chapters/djing_with_mixxx.rst:165 msgid "Harmonic Mixing" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:167 +#: ../../chapters/djing_with_mixxx.rst:167 msgid "Harmonic mixing is a technique to mix songs with matching melodies and harmonies. To learn more about harmonic mixing you might want to check out `the mixshare site`_." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:173 -msgid "Mixxx has two features to help you with harmonic mixing. The first is a :term:`key lock`. When it is active changing the speed of a track won't affect the key. To enable :term:`key lock`, click the :guilabel:`key lock` button in the :ref:`interface-button-grid`. The second is that Mixxx can automatically detect the key of a track and will display it in the library and the decks. The notation which is used to display a key can be changed in :ref:`Key Detection Preferences `." +#: ../../chapters/djing_with_mixxx.rst:173 +msgid "Mixxx has two features to help you with harmonic mixing. The first is a :term:`key lock`. When it is active changing the speed of a track won't affect the key. To enable :term:`key lock`, click the :guilabel:`key lock` button in the :ref:`interface-button-grid`. The second is that Mixxx can automatically detect the key of a track and will display it in the library and the decks. The notation which is used to display a key can be changed in :ref:`Key Detection Preferences `." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:184 +#: ../../chapters/djing_with_mixxx.rst:184 msgid "Using Effects" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:188 +#: ../../chapters/djing_with_mixxx.rst:188 msgid "Mixxx comes with a set of native effects." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:193 +#: ../../chapters/djing_with_mixxx.rst:193 msgid "Flanger" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:202 -msgid "Flanger controls" +#: ../../chapters/djing_with_mixxx.rst:205 +msgid "The Flanger is simple modulation effect, created by taking the input signal and mixing it with a delayed, pitch modulated copy of itself." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:204 -msgid "This effect applies a “sweeping” sound to the channel and can add extra depth to a mix when used tactfully." +#: ../../chapters/djing_with_mixxx.rst:209 +msgid "**Depth**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:209 -msgid "**FX Button**" +#: ../../chapters/djing_with_mixxx.rst:209 +msgid "Controls the intensity of the effect." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:208 -msgid "The FX (“Effects”) button enables a built-in flanger effect on the selected channel." +#: ../../chapters/djing_with_mixxx.rst:212 +#: ../../chapters/djing_with_mixxx.rst:318 +msgid "**Delay**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:212 -msgid "**Delay/Depth/LFO Knobs**" +#: ../../chapters/djing_with_mixxx.rst:212 +msgid "Sets the value for the delay length." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:212 -msgid "Adjusts the phase delay, intensity and the wavelength of the flange effect." +#: ../../chapters/djing_with_mixxx.rst:215 +msgid "**Period**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:214 -msgid "For the most noticeable effect, enable the FX button and turn the Depth knob completely to the right." +#: ../../chapters/djing_with_mixxx.rst:215 +msgid "Controls the speed of the effect." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:221 +#: ../../chapters/djing_with_mixxx.rst:220 msgid "BitCrusher" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:230 -msgid "BitCrusher controls" -msgstr "" - -#: ../../source/chapters/djing_with_mixxx.rst:232 -msgid "The BitCrusher is an effect that adds quantisation noise to the signal by the reduction of the resolution or bandwidth of the samples" +#: ../../chapters/djing_with_mixxx.rst:232 +msgid "The BitCrusher is an effect that adds quantization noise to the signal by the reduction of the resolution or bandwidth of the samples." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:236 +#: ../../chapters/djing_with_mixxx.rst:236 msgid "**Bit Depth**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:236 +#: ../../chapters/djing_with_mixxx.rst:236 msgid "Adjusts the bit depth of the samples." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:239 +#: ../../chapters/djing_with_mixxx.rst:239 msgid "**Downsampling**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:239 -msgid "Adjusts the sample rate, to which the signal is downsampled." +#: ../../chapters/djing_with_mixxx.rst:239 +msgid "Adjusts the sample rate to which the signal is downsampled." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:244 +#: ../../chapters/djing_with_mixxx.rst:244 msgid "Filter" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:253 -msgid "Filter controls" -msgstr "" - -#: ../../source/chapters/djing_with_mixxx.rst:255 +#: ../../chapters/djing_with_mixxx.rst:256 msgid "The filter changes the tone of the music by allowing only high or low frequencies to pass through." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:259 +#: ../../chapters/djing_with_mixxx.rst:260 msgid "**LPF**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:259 -msgid "Corner frequency ratio of the low pass filter" +#: ../../chapters/djing_with_mixxx.rst:260 +msgid "Corner frequency ratio of the low pass filter." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:262 +#: ../../chapters/djing_with_mixxx.rst:263 msgid "**Q**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:262 -msgid "Resonance of the filters, default = Flat top" +#: ../../chapters/djing_with_mixxx.rst:263 +msgid "Resonance of the filters, default = Flat top." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:265 +#: ../../chapters/djing_with_mixxx.rst:266 msgid "**HPF**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:265 -msgid "Corner frequency ratio of the high pass filter" +#: ../../chapters/djing_with_mixxx.rst:266 +msgid "Corner frequency ratio of the high pass filter." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:270 +#: ../../chapters/djing_with_mixxx.rst:271 msgid "Reverb" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:278 -msgid "Reverb controls" -msgstr "" - -#: ../../source/chapters/djing_with_mixxx.rst:281 +#: ../../chapters/djing_with_mixxx.rst:283 msgid "This is a port of the GPL'ed CAPS Reverb plugin, which has the following description: This is based on some of the famous Stanford CCRMA reverbs (NRev, KipRev) all based on the Chowning/Moorer/Schroeder reverberators, which use networks of simple allpass and comb delay filters." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:288 +#: ../../chapters/djing_with_mixxx.rst:290 msgid "**Bandwidth**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:287 -msgid "Higher bandwidth values cause more bright (high-frequency) tones to be included" +#: ../../chapters/djing_with_mixxx.rst:289 +msgid "Higher bandwidth values cause more bright (high-frequency) tones to be included." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:291 +#: ../../chapters/djing_with_mixxx.rst:293 msgid "**Damping**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:291 +#: ../../chapters/djing_with_mixxx.rst:293 msgid "Higher damping values cause reverberations to die out more quickly." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:293 +#: ../../chapters/djing_with_mixxx.rst:295 msgid "This effect is not available in the Mac App Store version of Mixxx." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:298 +#: ../../chapters/djing_with_mixxx.rst:300 msgid "Echo" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:307 -msgid "Echo controls" -msgstr "" - -#: ../../source/chapters/djing_with_mixxx.rst:309 +#: ../../chapters/djing_with_mixxx.rst:312 msgid "Simple Echo with pingpong" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:312 +#: ../../chapters/djing_with_mixxx.rst:315 msgid "**Send**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:312 -msgid "How much of the signal to send into the delay buffer" +#: ../../chapters/djing_with_mixxx.rst:315 +msgid "How much of the signal to send into the delay buffer." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:315 -msgid "**Delay**" -msgstr "" - -#: ../../source/chapters/djing_with_mixxx.rst:315 -msgid "Delay time (seconds)" +#: ../../chapters/djing_with_mixxx.rst:318 +msgid "Delay time in seconds." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:318 +#: ../../chapters/djing_with_mixxx.rst:321 msgid "**Feedback**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:318 -msgid "Amount the echo fades each time it loops" +#: ../../chapters/djing_with_mixxx.rst:321 +msgid "Amount the echo fades each time it loops." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:322 +#: ../../chapters/djing_with_mixxx.rst:325 msgid "**PingPong**" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:321 +#: ../../chapters/djing_with_mixxx.rst:324 msgid "As the ping-pong amount increases, increasing amounts of the echoed signal is bounced between the left and right speakers." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:327 +#: ../../chapters/djing_with_mixxx.rst:330 msgid "Recording Your Mix" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:332 -msgid "With the integrated recording feature you can record your mix as an audio file and listen to it later, distribute it as :term:`Podcast` or burn it to CD. Mixxx records the master output - the audio you hear from the speakers including the microphone." +#: ../../chapters/djing_with_mixxx.rst:335 +msgid "With the integrated recording feature you can record your mix as an audio file and listen to it later, distribute it as a :term:`Podcast` or burn it to CD. Mixxx records the master output - the audio you hear from the speakers including the microphone." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:344 +#: ../../chapters/djing_with_mixxx.rst:347 msgid "Mixxx library - Recordings view" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:346 +#: ../../chapters/djing_with_mixxx.rst:349 msgid "Mixxx can record your mix in various audio formats and quality settings. You can split your recordings, generate :term:`cue files `, choose a custom recording directory and even set your own :term:`metadata`. By default, Mixxx saves your recordings as lossless :term:`wav` files to a :file:`Mixxx/Recordings` sub-folder in the Mixxx music directory. Before you start recording, we recommend that you adjust the settings in :menuselection:`Preferences --> Recording`." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:354 +#: ../../chapters/djing_with_mixxx.rst:357 msgid "If you click on the *Recordings* icon in the sidebar of the Mixxx library, the track table to the right displays the content of your recordings directory. New recordings are automatically saved to this directory as well as CUE files if you choose to create them in the preferences." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:359 +#: ../../chapters/djing_with_mixxx.rst:362 msgid "Recording your mixes and listening to them later to critique yourself is a great tool for improving your DJing skills. Sending your mixes to other DJs for feedback can also be helpful." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:364 +#: ../../chapters/djing_with_mixxx.rst:367 msgid "Record your mix to disk" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:366 +#: ../../chapters/djing_with_mixxx.rst:369 msgid "Displays the duration of the recording." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:369 +#: ../../chapters/djing_with_mixxx.rst:372 msgid "Click on the *Recordings* icon in the sidebar to switch to the :guilabel:`Recordings` view" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:371 +#: ../../chapters/djing_with_mixxx.rst:374 msgid "Click the :guilabel:`Start Recording` button or click :menuselection:`Options --> Record Mix` in the menu on top of the Mixxx application window." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:374 -msgid "The display above the track table shows how many data has already been recorded, as well as the duration of the recording." +#: ../../chapters/djing_with_mixxx.rst:377 +msgid "The display above the track table shows how much data has already been recorded, as well as the duration of the recording." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:376 +#: ../../chapters/djing_with_mixxx.rst:379 msgid "Perform your mix" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:377 +#: ../../chapters/djing_with_mixxx.rst:380 msgid "Click the :guilabel:`Stop Recording` button to stop the recording when the mix has finished." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:380 -msgid "You can instantly play your recording as track in Mixxx. Simply drag-and-drop the track to a deck." +#: ../../chapters/djing_with_mixxx.rst:383 +msgid "You can instantly play your recording as a track in Mixxx. Simply drag-and-drop the track to a deck." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:386 +#: ../../chapters/djing_with_mixxx.rst:389 msgid "Using Auto DJ For Automatic Mixing" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:398 +#: ../../chapters/djing_with_mixxx.rst:401 msgid "Mixxx library - Auto DJ view" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:400 +#: ../../chapters/djing_with_mixxx.rst:403 +msgid "Add random tracks from Auto DJ track sources" +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:406 msgid "Auto DJ allows you to automatically load tracks from the Auto DJ playlist when the current track is nearly finished, and crossfade into it. See :ref:`library-auto-dj`." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:405 +#: ../../chapters/djing_with_mixxx.rst:411 msgid "Loading tracks into Auto DJ" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:407 +#: ../../chapters/djing_with_mixxx.rst:413 msgid "To play tracks automatically, they must first be loaded into the Auto DJ playlist. The Auto DJ playlist is empty by default." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:417 +#: ../../chapters/djing_with_mixxx.rst:423 msgid "Mixxx library - Adding a playlist to Auto DJ" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:419 +#: ../../chapters/djing_with_mixxx.rst:425 msgid "There are several ways to load tracks into the Auto DJ playlist:" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:421 +#: ../../chapters/djing_with_mixxx.rst:427 msgid "Select single or multiple tracks from the library, a regular playlist or crate and drag them to the Auto DJ icon on the left." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:423 +#: ../../chapters/djing_with_mixxx.rst:429 msgid "Select a regular playlist or crate, right-click with the mouse and select :guilabel:`Add to Auto DJ` from the mouse menu. This adds all tracks to Auto DJ." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:425 +#: ../../chapters/djing_with_mixxx.rst:431 msgid "While in the Auto DJ view of the library, drag tracks from external file managers to the Auto DJ icon in the sidebar or to the Auto DJ track table on the right." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:430 +#: ../../chapters/djing_with_mixxx.rst:438 +msgid "Using Auto DJ crates" +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:440 +msgid "Instead of inserting the contents of the crates directly into the Auto DJ playlist, :ref:`Auto DJ crates ` are associated crates that become a source of random track selections." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:444 +msgid "**Add a crate to the Auto DJ track sources**: Expand the :guilabel:`Auto DJ` item in the sidebar, and right-click on the :guilabel:`Crates` sub-item. Select one of the existing crates from the list. This makes the content of the crate available for random selection into the :ref:`Auto DJ ` queue for automatic mixing. The name of the crate is now listed as sub-item below." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:451 +msgid "If you do not have any crates available for selection in the list, go and create a crate first and add some tracks, see :ref:`library-crates`." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:454 +msgid "**Manually add tracks from track sources to Auto DJ**: Click the :guilabel:`Auto DJ` item in the sidebar and switch to the Auto DJ view of the library. Click the :guilabel:`Add random` button to add one track at the time from Auto DJ track sources to the bottom of the Auto DJ playlist." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:459 +msgid "If you did not set any crates as an Auto DJ track source, clicking the :guilabel:`Add Random` button will add a randomly selected track from the whole library instead." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:463 +msgid "**Automatically add tracks from track sources to Auto DJ**: Mixxx can randomly add tracks to the Auto DJ playlist from track sources as soon as a specified minimum number of tracks remain. Select :menuselection:`Preferences --> Auto DJ --> Enable random track addition to queue --> On`. Set :menuselection:`Minimum allowed tracks before addition` to change the minimum number of tracks after which random tracks may be added." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:470 +msgid "If you did not set any crates as an Auto DJ track source, tracks are selected from the whole library instead." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:473 +msgid "**Remove a crate from the Auto DJ track sources**: Expand the :guilabel:`Auto DJ` item in the sidebar, and right-click on one of the crates listed below the :guilabel:`Crates` sub-item. Select :guilabel:`Remove Crate as Track Source` to remove the crate from the Auto DJ track sources." +msgstr "" + +#: ../../chapters/djing_with_mixxx.rst:479 msgid "Playing tracks in Auto DJ" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:432 +#: ../../chapters/djing_with_mixxx.rst:481 msgid "Now that you have loaded tracks into the Auto DJ playlist, you can activate Auto DJ as follows:" msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:435 +#: ../../chapters/djing_with_mixxx.rst:484 msgid "Click on the *Auto DJ* icon in the sidebar to switch to the :guilabel:`Auto DJ` view of the library." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:437 +#: ../../chapters/djing_with_mixxx.rst:486 msgid "Click the :guilabel:`Enable Auto DJ` button." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:438 +#: ../../chapters/djing_with_mixxx.rst:487 msgid "The first tracks from your list are loaded into the decks and the playback starts." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:440 +#: ../../chapters/djing_with_mixxx.rst:489 msgid "Mixxx will continue to automatically mix until the Auto DJ playlist is empty." msgstr "" -#: ../../source/chapters/djing_with_mixxx.rst:441 +#: ../../chapters/djing_with_mixxx.rst:490 msgid "Click the :guilabel:`Disable Auto DJ` button to stop the automatic mixing" msgstr "" +#: ../../chapters/djing_with_mixxx.rst:492 +msgid "You can add a track to the end of the Auto DJ playlist once it is played instead of removing it. Set :menuselection:`Preferences --> Auto DJ --> Re-queue tracks after playback --> On`." +msgstr "" + diff --git a/source/locale/pot/chapters/getting_involved.pot b/source/locale/pot/chapters/getting_involved.pot index 982a3d84ea..c2ed2678be 100644 --- a/source/locale/pot/chapters/getting_involved.pot +++ b/source/locale/pot/chapters/getting_involved.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,107 +16,107 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/getting_involved.rst:4 +#: ../../chapters/getting_involved.rst:4 msgid "Contributing to the Project" msgstr "" -#: ../../source/chapters/getting_involved.rst:6 +#: ../../chapters/getting_involved.rst:6 msgid "Mixxx is a community-driven project involving many DJs worldwide. Without the contributions from these DJs, Mixxx would not exist, and we're constantly looking for more contributors." msgstr "" -#: ../../source/chapters/getting_involved.rst:10 +#: ../../chapters/getting_involved.rst:10 msgid "We want to make it as easy as possible for people to get involved in Mixxx development. First off, to be clear **you don't have to be a programmer to contribute**." msgstr "" -#: ../../source/chapters/getting_involved.rst:15 +#: ../../chapters/getting_involved.rst:15 msgid "As a non-developer" msgstr "" -#: ../../source/chapters/getting_involved.rst:17 +#: ../../chapters/getting_involved.rst:17 msgid "`Donate `_ to Mixxx using Paypal to help support and enhance development." msgstr "" -#: ../../source/chapters/getting_involved.rst:19 +#: ../../chapters/getting_involved.rst:19 msgid "`Make skins `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:20 +#: ../../chapters/getting_involved.rst:20 msgid "`Make MIDI mappings `_ for your controller" msgstr "" -#: ../../source/chapters/getting_involved.rst:23 +#: ../../chapters/getting_involved.rst:23 msgid "`Report bugs `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:24 +#: ../../chapters/getting_involved.rst:24 msgid "Update our `Wiki `_ to make sure the information on it is up to date." msgstr "" -#: ../../source/chapters/getting_involved.rst:26 +#: ../../chapters/getting_involved.rst:26 msgid "Translate Mixxx using `Transifex `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:28 +#: ../../chapters/getting_involved.rst:28 msgid "Answer questions on the `Troubleshooting Forum `_ and the `Launchpad Answers page `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:31 +#: ../../chapters/getting_involved.rst:31 msgid "Help promote Mixxx: If you've got a blog, write an article about Mixxx. Blog about our new releases when they come out. Any exposure on the web and in print helps our project grow, and is much appreciated." msgstr "" -#: ../../source/chapters/getting_involved.rst:34 +#: ../../chapters/getting_involved.rst:34 msgid "Send us some photos of you using Mixxx at a gig!" msgstr "" -#: ../../source/chapters/getting_involved.rst:37 +#: ../../chapters/getting_involved.rst:37 msgid "As a software developer" msgstr "" -#: ../../source/chapters/getting_involved.rst:39 +#: ../../chapters/getting_involved.rst:39 msgid "You don't have to know C++. There are developers who got into Mixxx development while learning C++ along the way." msgstr "" -#: ../../source/chapters/getting_involved.rst:41 +#: ../../chapters/getting_involved.rst:41 msgid "Join our mailing list: `mixxx-devel `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:43 +#: ../../chapters/getting_involved.rst:43 msgid "Join our :term:`IRC` channel, #mixxx on `Freenode `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:44 +#: ../../chapters/getting_involved.rst:44 msgid "Tell us your ideas! Email us, talk on IRC, file wishlist :term:`bugs `, or post on the forums." msgstr "" -#: ../../source/chapters/getting_involved.rst:46 +#: ../../chapters/getting_involved.rst:46 msgid "Register an account on our development platform `Github `_ and fork our code. See `Using Git for Mixxx Development `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:49 +#: ../../chapters/getting_involved.rst:49 msgid "Join the `Mixxx Development Team `_ on Launchpad." msgstr "" -#: ../../source/chapters/getting_involved.rst:52 +#: ../../chapters/getting_involved.rst:52 msgid "Get familiar with the code. Pick a bug off of the `Easy Bug List `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:54 +#: ../../chapters/getting_involved.rst:54 msgid "Get help fixing the bug on IRC, talk to us about the best way to do it." msgstr "" -#: ../../source/chapters/getting_involved.rst:56 +#: ../../chapters/getting_involved.rst:56 msgid "**Contributing to Mixxx in 3 Easy Steps:**" msgstr "" -#: ../../source/chapters/getting_involved.rst:58 +#: ../../chapters/getting_involved.rst:58 msgid "Pick a bug off of the `Easy Bug List `_" msgstr "" -#: ../../source/chapters/getting_involved.rst:60 +#: ../../chapters/getting_involved.rst:60 msgid "Talk to us on IRC for help on how to fix it." msgstr "" -#: ../../source/chapters/getting_involved.rst:61 +#: ../../chapters/getting_involved.rst:61 msgid "Fix it! *Done!* Your name will now be on the `Mixxx contributor list `_." msgstr "" diff --git a/source/locale/pot/chapters/installation.pot b/source/locale/pot/chapters/installation.pot index 8c6568cfd5..896c136aec 100644 --- a/source/locale/pot/chapters/installation.pot +++ b/source/locale/pot/chapters/installation.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,228 +16,191 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/installation.rst:6 +#: ../../chapters/installation.rst:6 msgid "Installing Mixxx" msgstr "" -#: ../../source/chapters/installation.rst:8 +#: ../../chapters/installation.rst:8 msgid "This part of the manual provides step-by-step directions for installing Mixxx on your computer." msgstr "" -#: ../../source/chapters/installation.rst:12 +#: ../../chapters/installation.rst:12 msgid "Installation on Windows" msgstr "" -#: ../../source/chapters/installation.rst:20 -msgid "Mixxx Installation - Ready to install the application" +#: ../../chapters/installation.rst:20 +msgid "Mixxx Installation on Windows 10 - Ready to install the application" msgstr "" -#: ../../source/chapters/installation.rst:22 +#: ../../chapters/installation.rst:22 msgid "Download Mixxx for Windows from ``_ ." msgstr "" -#: ../../source/chapters/installation.rst:23 +#: ../../chapters/installation.rst:23 msgid "Using :file:`Windows Explorer` browse to the location where the Mixxx download was saved, usually the :file:`Desktop` or :file:`Downloads` folder." msgstr "" -#: ../../source/chapters/installation.rst:25 +#: ../../chapters/installation.rst:25 msgid "Double-click the Mixxx installer .EXE to open it up." msgstr "" -#: ../../source/chapters/installation.rst:26 +#: ../../chapters/installation.rst:26 msgid "Follow the step-by-step instructions in the installer." msgstr "" -#: ../../source/chapters/installation.rst:27 +#: ../../chapters/installation.rst:27 msgid "If the installation is complete, a confirmation screen will appear." msgstr "" -#: ../../source/chapters/installation.rst:28 +#: ../../chapters/installation.rst:28 msgid "Close the installer screen." msgstr "" -#: ../../source/chapters/installation.rst:30 +#: ../../chapters/installation.rst:30 msgid "Mixxx is supported on Windows 10 / 8.1 / 8 / 7 / Vista / XP, with native 32 and 64-bit versions." msgstr "" -#: ../../source/chapters/installation.rst:33 +#: ../../chapters/installation.rst:33 msgid "If you are not sure about 32-bit versus 64-bit, pick the 32-bit version when downloading the Mixxx installer." msgstr "" -#: ../../source/chapters/installation.rst:36 -msgid "You may encounter a warning message similar to “Security Warning - Publisher could not be verified”. This is because the Mixxx installer is not digitally signed. Ignore the message and continue the installation. It does not indicate a security risk, if you can trust the source website such as `www.mixxx.org `_ ." +#: ../../chapters/installation.rst:43 +msgid "Mixxx Installation on Windows 10 - User Account Control (UAC) warning message" msgstr "" -#: ../../source/chapters/installation.rst:44 -msgid "Installation on Mac OS X" +#: ../../chapters/installation.rst:45 +msgid "You may encounter a warning message similar to “Do you want to allow this app to make changes to your PC”. This is a Windows security feature to prevent anything from running with elevated rights without you approving first. The Mixxx installer is not digitally signed. It does not indicate a security risk, if you can trust the source website such as `www.mixxx.org `_ . In this case, ignore the message and continue the installation." msgstr "" -#: ../../source/chapters/installation.rst:47 -msgid "Method A: Direct Download" +#: ../../chapters/installation.rst:55 +msgid "Installation on Mac OS X" msgstr "" -#: ../../source/chapters/installation.rst:56 +#: ../../chapters/installation.rst:65 msgid "Mixxx Installation - Ready to drop the Mixxx icon to the Applications folder" msgstr "" -#: ../../source/chapters/installation.rst:58 +#: ../../chapters/installation.rst:67 msgid "Download Mixxx for Mac OS X from ``_ ." msgstr "" -#: ../../source/chapters/installation.rst:59 +#: ../../chapters/installation.rst:68 msgid "Using :file:`Finder` browse to the location where the Mixxx download was saved, usually the :file:`Desktop` or :file:`Downloads` folder." msgstr "" -#: ../../source/chapters/installation.rst:61 +#: ../../chapters/installation.rst:70 msgid "Double-click the Mixxx installer .DMG file, a new Finder window appears." msgstr "" -#: ../../source/chapters/installation.rst:62 +#: ../../chapters/installation.rst:71 msgid "Locate the *Mixxx* icon within this new Finder window. Drag-and-drop it into your :file:`Applications` folder." msgstr "" -#: ../../source/chapters/installation.rst:64 +#: ../../chapters/installation.rst:73 msgid "Eject the Mixxx installation volume from the Finder by clicking on the icon right next to *Mixxx* volume name." msgstr "" -#: ../../source/chapters/installation.rst:67 -msgid "Mixxx requires an Intel Mac running Mac OS X 10.5 or newer." -msgstr "" - -#: ../../source/chapters/installation.rst:70 -msgid "Method B: The Mac App Store" -msgstr "" - -#: ../../source/chapters/installation.rst:78 -msgid "Mixxx Installation from the Mac App Store" -msgstr "" - -#: ../../source/chapters/installation.rst:80 -msgid "The Mac App Store makes getting new apps easier than ever." -msgstr "" - -#: ../../source/chapters/installation.rst:82 -msgid "Start the Mac :file:`App Store.app` on your computer." -msgstr "" - -#: ../../source/chapters/installation.rst:83 -msgid "Search for *mixxx* in the App Store, alternatively `click this direct link `_ ." -msgstr "" - -#: ../../source/chapters/installation.rst:86 -#: ../../source/chapters/installation.rst:133 -msgid "Select Mixxx and click the :guilabel:`Install` button." -msgstr "" - -#: ../../source/chapters/installation.rst:87 -msgid "Type in your administrator password if asked." -msgstr "" - -#: ../../source/chapters/installation.rst:88 -msgid "Mixxx will be installed to your :file:`Applications` folder." -msgstr "" - -#: ../../source/chapters/installation.rst:90 -msgid "The App Store version of Mixxx is under some circumstances out of date, therefore using `Method A: Direct Download`_ is preferable." +#: ../../chapters/installation.rst:76 +msgid "Mixxx requires an Intel Mac running Mac OS X 10.8 or newer." msgstr "" -#: ../../source/chapters/installation.rst:93 -msgid "Due to licensing restrictions, :term:`vinyl control` is not available in Mixxx from the Mac App Store." -msgstr "" - -#: ../../source/chapters/installation.rst:97 +#: ../../chapters/installation.rst:79 msgid "Installation on GNU/Linux" msgstr "" -#: ../../source/chapters/installation.rst:99 +#: ../../chapters/installation.rst:81 msgid "Official packages of Mixxx are only offered for Ubuntu Linux. However, Mixxx can build on almost any Linux distribution." msgstr "" -#: ../../source/chapters/installation.rst:103 +#: ../../chapters/installation.rst:85 msgid "Installation on Ubuntu" msgstr "" -#: ../../source/chapters/installation.rst:106 +#: ../../chapters/installation.rst:88 msgid "Method A: Personal Package Archive (ppa)" msgstr "" -#: ../../source/chapters/installation.rst:107 +#: ../../chapters/installation.rst:89 msgid "Open a terminal and type the following commands. Type in your administrator password if asked for. ::" msgstr "" -#: ../../source/chapters/installation.rst:114 +#: ../../chapters/installation.rst:96 msgid "Start Mixxx by simply typing :file:`mixxx` into the terminal, then hit :kbd:`Return` ." msgstr "" -#: ../../source/chapters/installation.rst:118 +#: ../../chapters/installation.rst:100 msgid "Method B: The Ubuntu Software Center" msgstr "" -#: ../../source/chapters/installation.rst:126 +#: ../../chapters/installation.rst:108 msgid "Mixxx Installation from the Ubuntu Software Center" msgstr "" -#: ../../source/chapters/installation.rst:128 +#: ../../chapters/installation.rst:110 msgid "The Ubuntu Software Center provides the easiest and safest way to install software on Ubuntu." msgstr "" -#: ../../source/chapters/installation.rst:131 +#: ../../chapters/installation.rst:113 msgid "Start the :file:`Ubuntu Software Center` on your computer." msgstr "" -#: ../../source/chapters/installation.rst:132 +#: ../../chapters/installation.rst:114 msgid "Search for *mixxx* in the Software center." msgstr "" -#: ../../source/chapters/installation.rst:134 +#: ../../chapters/installation.rst:115 +msgid "Select Mixxx and click the :guilabel:`Install` button." +msgstr "" + +#: ../../chapters/installation.rst:116 msgid "Type in your administrator password if asked for." msgstr "" -#: ../../source/chapters/installation.rst:135 +#: ../../chapters/installation.rst:117 msgid "Mixxx will be installed and an icon is added to the frequently-used program icons on the launcher." msgstr "" -#: ../../source/chapters/installation.rst:138 +#: ../../chapters/installation.rst:120 msgid "The Software Center version of Mixxx is under some circumstances out of date, therefore using `Method A: Personal Package Archive (ppa)`_ is preferable." msgstr "" -#: ../../source/chapters/installation.rst:142 +#: ../../chapters/installation.rst:124 msgid "Installation on Other Distributions" msgstr "" -#: ../../source/chapters/installation.rst:144 +#: ../../chapters/installation.rst:126 msgid "Your distribution may maintain a non-official build that you may use. Alternatively, you can build Mixxx from source. This should be a pretty straightforward process, and it's certainly easiest on GNU/Linux. For more information, go to:" msgstr "" -#: ../../source/chapters/installation.rst:149 +#: ../../chapters/installation.rst:131 msgid "``_" msgstr "" -#: ../../source/chapters/installation.rst:152 +#: ../../chapters/installation.rst:134 msgid "Building Mixxx from Source" msgstr "" -#: ../../source/chapters/installation.rst:154 +#: ../../chapters/installation.rst:136 msgid "If your operating system isn't listed here, then it's likely you're going to have to build Mixxx from the source code. For more information, go to:" msgstr "" -#: ../../source/chapters/installation.rst:157 +#: ../../chapters/installation.rst:139 msgid "``_" msgstr "" -#: ../../source/chapters/installation.rst:160 +#: ../../chapters/installation.rst:142 msgid "Where to go from here?" msgstr "" -#: ../../source/chapters/installation.rst:162 -msgid ":doc:`Set up your audio devices and controllers `" +#: ../../chapters/installation.rst:144 +msgid ":ref:`Open Mixxx and start importing your audio files `" msgstr "" -#: ../../source/chapters/installation.rst:163 -msgid ":doc:`Open Mixxx and start importing your audio files `" +#: ../../chapters/installation.rst:145 +msgid ":doc:`Set up your audio devices and controllers `" msgstr "" -#: ../../source/chapters/installation.rst:164 +#: ../../chapters/installation.rst:146 msgid ":doc:`Get familiar with the Mixxx user interface `" msgstr "" diff --git a/source/locale/pot/chapters/introduction.pot b/source/locale/pot/chapters/introduction.pot index bb317e7785..ab1de6ce38 100644 --- a/source/locale/pot/chapters/introduction.pot +++ b/source/locale/pot/chapters/introduction.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,323 +16,327 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/introduction.rst:2 +#: ../../chapters/introduction.rst:2 msgid "Introduction to Mixxx" msgstr "" -#: ../../source/chapters/introduction.rst:4 -msgid "Mixxx allows you to perform live DJ mixes with your digital music collection. It helps you rock the party with MIDI controllers, vinyl turntables, or even just your keyboard." +#: ../../chapters/introduction.rst:4 +msgid "Mixxx allows you to perform live DJ mixes with your digital music collection. It helps you rock the party with DJ controllers, vinyl turntables, or even just your keyboard." msgstr "" -#: ../../source/chapters/introduction.rst:8 +#: ../../chapters/introduction.rst:8 msgid "Mixxx is used by professional DJs and bedroom DJs alike. It is designed by an international team of volunteer DJs who want to bring the joy of DJing to everyone. The project is non-profit, open-source and community driven. Together and with your help we aim to build the best DJ software ever created." msgstr "" -#: ../../source/chapters/introduction.rst:14 +#: ../../chapters/introduction.rst:14 msgid "Mixxx Features" msgstr "" -#: ../../source/chapters/introduction.rst:19 +#: ../../chapters/introduction.rst:19 msgid "**4 Decks**: Each deck features a scratchable, scrolling waveform that marks beats and cue points, along with a whole-song waveform overview for quick seeking." msgstr "" -#: ../../source/chapters/introduction.rst:22 +#: ../../chapters/introduction.rst:22 msgid "**Advanced Controls**: Change playback with time stretching, and loop beat segments." msgstr "" -#: ../../source/chapters/introduction.rst:24 +#: ../../chapters/introduction.rst:24 msgid "**Sampler Decks**: Perfect for dropping that vocal sample or airhorn." msgstr "" -#: ../../source/chapters/introduction.rst:25 +#: ../../chapters/introduction.rst:25 msgid "**External Library Integration**: Use your playlists and songs from iTunes, Traktor, Rhythmbox, and Banshee." msgstr "" -#: ../../source/chapters/introduction.rst:27 +#: ../../chapters/introduction.rst:27 msgid "**BPM Detection and Sync**: Instantly detect and sync the tempo of your songs." msgstr "" -#: ../../source/chapters/introduction.rst:28 +#: ../../chapters/introduction.rst:28 msgid "**DJ Controller Support**: Control your DJ mixes with MIDI/HID controllers." msgstr "" -#: ../../source/chapters/introduction.rst:29 +#: ../../chapters/introduction.rst:29 msgid "**Timecode Support**: Use a real turntable or DJ-CD player as a controller." msgstr "" -#: ../../source/chapters/introduction.rst:30 +#: ../../chapters/introduction.rst:30 msgid "**Live Broadcasting**: Start a radio station and stream your mixes live over the Internet." msgstr "" -#: ../../source/chapters/introduction.rst:32 +#: ../../chapters/introduction.rst:32 msgid "**Powerful Mixing Engine**: Supports various file formats, custom EQ shelves, recording, etc." msgstr "" -#: ../../source/chapters/introduction.rst:34 +#: ../../chapters/introduction.rst:34 msgid "**Automatic Mixing**: Create a quick playlist and let Auto DJ take over." msgstr "" -#: ../../source/chapters/introduction.rst:35 +#: ../../chapters/introduction.rst:35 msgid "**Microphone Input**: Drop vocals or give shoutouts on the air." msgstr "" -#: ../../source/chapters/introduction.rst:38 +#: ../../chapters/introduction.rst:38 msgid "New in Mixxx |version|" msgstr "" -#: ../../source/chapters/introduction.rst:44 +#: ../../chapters/introduction.rst:44 msgid "4 decks" msgstr "" -#: ../../source/chapters/introduction.rst:45 +#: ../../chapters/introduction.rst:45 msgid "Master sync" msgstr "" -#: ../../source/chapters/introduction.rst:46 +#: ../../chapters/introduction.rst:46 msgid "Color-coded waveforms showing the frequencies in tracks" msgstr "" -#: ../../source/chapters/introduction.rst:47 +#: ../../chapters/introduction.rst:47 msgid "Key detection and pitch shifting (independent of tempo) for harmonic mixing" msgstr "" -#: ../../source/chapters/introduction.rst:48 +#: ../../chapters/introduction.rst:48 msgid "Choice of traditional, OpenKey, Lancelot, and custom key notations" msgstr "" -#: ../../source/chapters/introduction.rst:49 +#: ../../chapters/introduction.rst:49 msgid "4 effect units with built-in effects" msgstr "" -#: ../../source/chapters/introduction.rst:50 +#: ../../chapters/introduction.rst:50 msgid "Controller mapping :term:`GUI`" msgstr "" -#: ../../source/chapters/introduction.rst:51 +#: ../../chapters/introduction.rst:51 msgid "Resizable skins" msgstr "" -#: ../../source/chapters/introduction.rst:52 +#: ../../chapters/introduction.rst:52 msgid "Beat jumping and loop move" msgstr "" -#: ../../source/chapters/introduction.rst:53 +#: ../../chapters/introduction.rst:53 msgid "Multiple library folders" msgstr "" -#: ../../source/chapters/introduction.rst:54 +#: ../../chapters/introduction.rst:54 msgid "Hierarchical library sorting" msgstr "" -#: ../../source/chapters/introduction.rst:55 +#: ../../chapters/introduction.rst:55 msgid "Cover/album art support" msgstr "" -#: ../../source/chapters/introduction.rst:56 +#: ../../chapters/introduction.rst:56 msgid "Vinyl passthrough mode to switch between control vinyl and music vinyl" msgstr "" -#: ../../source/chapters/introduction.rst:58 +#: ../../chapters/introduction.rst:58 msgid "Auxiliary inputs that pass through to the master mix" msgstr "" -#: ../../source/chapters/introduction.rst:59 +#: ../../chapters/introduction.rst:59 msgid "Mono output and input support" msgstr "" -#: ../../source/chapters/introduction.rst:60 +#: ../../chapters/introduction.rst:60 msgid "Improved support for using multiple sound cards" msgstr "" -#: ../../source/chapters/introduction.rst:61 +#: ../../chapters/introduction.rst:61 +msgid "MusicBrainz tagging support" +msgstr "" + +#: ../../chapters/introduction.rst:62 msgid "Over 100 other performance, quality and usability improvements" msgstr "" -#: ../../source/chapters/introduction.rst:63 +#: ../../chapters/introduction.rst:64 msgid "For a full list of features go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:64 +#: ../../chapters/introduction.rst:65 msgid "For an overview of the new features, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:66 +#: ../../chapters/introduction.rst:67 msgid "For a full list of new features and bugfixes, go to: `https://launchpad.net/mixxx/2.0.0 `_" msgstr "" -#: ../../source/chapters/introduction.rst:69 +#: ../../chapters/introduction.rst:70 msgid "For an overview of previous changes, go to :ref:`appendix-version-history`." msgstr "" -#: ../../source/chapters/introduction.rst:73 +#: ../../chapters/introduction.rst:74 msgid "System Requirements" msgstr "" -#: ../../source/chapters/introduction.rst:75 +#: ../../chapters/introduction.rst:76 msgid "Mixxx is available for Windows, Mac OS X and GNU/Linux. Mixxx is designed to use very few system resources, but the Mixxx Development Team suggests these minimum requirements for having a great experience with Mixxx:" msgstr "" -#: ../../source/chapters/introduction.rst:79 +#: ../../chapters/introduction.rst:80 msgid "A 2GHz or faster CPU" msgstr "" -#: ../../source/chapters/introduction.rst:80 +#: ../../chapters/introduction.rst:81 msgid "At least 1GB of RAM" msgstr "" -#: ../../source/chapters/introduction.rst:81 +#: ../../chapters/introduction.rst:82 msgid "A soundcard with 2 stereo audio outputs (4 mono output channels)" msgstr "" -#: ../../source/chapters/introduction.rst:83 +#: ../../chapters/introduction.rst:84 msgid "The EQs can be disabled to save CPU usage. Using this feature, Mixxx can be used with an external mixer and a less powerful computer such as a netbook." msgstr "" -#: ../../source/chapters/introduction.rst:88 +#: ../../chapters/introduction.rst:89 msgid "About the Mixxx Project" msgstr "" -#: ../../source/chapters/introduction.rst:90 +#: ../../chapters/introduction.rst:91 msgid "Mixxx is designed by an international team of volunteer DJs who want to bring the joy of DJing to everyone. The project is non-profit, open-source and community driven. Together and with your help we aim to build the best DJ software ever created." msgstr "" -#: ../../source/chapters/introduction.rst:95 +#: ../../chapters/introduction.rst:96 msgid "Mixxx started as an open-source project because of demand for DJing software on Linux, and discontent with proprietary DJ software on Windows and Mac OS X. Today, Mixxx development is driven by the simple idea that together we can create a better way to DJ, and that has brought Mixxx to the cutting edge." msgstr "" -#: ../../source/chapters/introduction.rst:100 +#: ../../chapters/introduction.rst:101 msgid "Mixxx is the only free cross-platform vinyl control software and has the most advanced MIDI/HID controller support via our innovative JavaScript-based scripting engine. We are continuing to pursue new and exciting features that give DJs more tools to create better live mixes." msgstr "" -#: ../../source/chapters/introduction.rst:106 +#: ../../chapters/introduction.rst:107 msgid "Project History" msgstr "" -#: ../../source/chapters/introduction.rst:108 +#: ../../chapters/introduction.rst:109 msgid "Mixxx was originally created in 2002 as part of a PhD thesis on new interfaces for DJing by Tue Haste Andersen. After releasing the project as open source, dozens of contributors began modifying and improving Mixxx." msgstr "" -#: ../../source/chapters/introduction.rst:112 +#: ../../chapters/introduction.rst:113 msgid "In 2006, a new development team lead by Adam Davison and Albert Santoni began reorganizing the project to ensure smooth growth of both the code-base and the number of contributors. A renewed focus on usability and stability has helped Mixxx grow to become the most popular free DJ software in the world, receiving over 1,000,000 downloads annually. Our committed team has worked hard to create great DJ software, and this growth is a sign of our success." msgstr "" -#: ../../source/chapters/introduction.rst:119 +#: ../../chapters/introduction.rst:120 msgid "In 2011, RJ Ryan took over as Lead Developer to successfully continue the team's endeavor to make Mixxx a world-class DJ software." msgstr "" -#: ../../source/chapters/introduction.rst:122 +#: ../../chapters/introduction.rst:123 msgid "As our user community grows, so does our development team - Over 150 developers, artists, and translators have helped create Mixxx!" msgstr "" -#: ../../source/chapters/introduction.rst:126 +#: ../../chapters/introduction.rst:127 msgid "About the Mixxx Manual" msgstr "" -#: ../../source/chapters/introduction.rst:131 +#: ../../chapters/introduction.rst:132 msgid "Some effort has been made to present the material in a way that is neither too technical nor too dumbed-down. Take some time to look through it and you'll find lots of hints that will enhance both your enjoyment and your productivity." msgstr "" -#: ../../source/chapters/introduction.rst:135 +#: ../../chapters/introduction.rst:136 msgid "Through the manual you'll find text formatted like this:" msgstr "" -#: ../../source/chapters/introduction.rst:137 +#: ../../chapters/introduction.rst:138 msgid ":menuselection:`Library --> Add new Playlist`" msgstr "" -#: ../../source/chapters/introduction.rst:139 +#: ../../chapters/introduction.rst:140 msgid "This is to simplify the business of choosing commands in menus. In this example, the instruction means “Open the *Library* menu at the top of the application window and then choose the *Add new Playlist* command”." msgstr "" -#: ../../source/chapters/introduction.rst:143 +#: ../../chapters/introduction.rst:144 msgid ":guilabel:`Apply`" msgstr "" -#: ../../source/chapters/introduction.rst:145 +#: ../../chapters/introduction.rst:146 msgid "This is used to indicate a certain area of the :term:`GUI`, including button labels, tabs, checkboxes, field names, values in selection lists etc. ." msgstr "" -#: ../../source/chapters/introduction.rst:148 +#: ../../chapters/introduction.rst:149 msgid ":kbd:`STRG` + :kbd:`G`" msgstr "" -#: ../../source/chapters/introduction.rst:150 +#: ../../chapters/introduction.rst:151 msgid "This is used to mark a keystroke, or a sequence of keystrokes. In this example, you would have to hold down the *STRG* key, then to press *G*." msgstr "" -#: ../../source/chapters/introduction.rst:153 -msgid "``_" +#: ../../chapters/introduction.rst:154 +msgid "``_" msgstr "" -#: ../../source/chapters/introduction.rst:155 +#: ../../chapters/introduction.rst:156 msgid "Links to external websites are marked like this." msgstr "" -#: ../../source/chapters/introduction.rst:157 +#: ../../chapters/introduction.rst:158 msgid "Important information in this manual are highlighted like this:" msgstr "" -#: ../../source/chapters/introduction.rst:159 +#: ../../chapters/introduction.rst:160 msgid "For anything that should receive a bit more attention." msgstr "" -#: ../../source/chapters/introduction.rst:161 +#: ../../chapters/introduction.rst:162 msgid "For supplementary information that lightens the work load." msgstr "" -#: ../../source/chapters/introduction.rst:163 +#: ../../chapters/introduction.rst:164 msgid "For references to other documents or websites if they need special attention." msgstr "" -#: ../../source/chapters/introduction.rst:166 +#: ../../chapters/introduction.rst:167 msgid "For anything that needs to be done with caution." msgstr "" -#: ../../source/chapters/introduction.rst:169 +#: ../../chapters/introduction.rst:170 msgid "Improving the Manual" msgstr "" -#: ../../source/chapters/introduction.rst:171 +#: ../../chapters/introduction.rst:172 msgid "**Send Feedback**: If you have comments, corrections or suggestions regarding the manual, `write us an email `_." msgstr "" -#: ../../source/chapters/introduction.rst:174 +#: ../../chapters/introduction.rst:175 msgid "**Get the Source Code**: To download the source code for the Mixxx manual, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:178 +#: ../../chapters/introduction.rst:179 msgid "Additional Resources" msgstr "" -#: ../../source/chapters/introduction.rst:183 +#: ../../chapters/introduction.rst:184 msgid "Got questions? Need more information? Want to :ref:`contribute ` ? There are a variety of other resources you can use to find out more." msgstr "" -#: ../../source/chapters/introduction.rst:186 +#: ../../chapters/introduction.rst:187 msgid "**Mixxx Website**: For general information and updates, as well as the latest news on Mixxx, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:189 +#: ../../chapters/introduction.rst:190 msgid "**Mixxx Support Websites**: To get support from the Mixxx wiki, IRC channel or Developer mailing list, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:192 +#: ../../chapters/introduction.rst:193 msgid "**Mixxx Community Forums**: To search for answers, post your question or answer other DJ's questions, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:195 +#: ../../chapters/introduction.rst:196 msgid "**Mixxx Source Code**: To download the source code for Mixxx, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:198 +#: ../../chapters/introduction.rst:199 msgid "**Mixxx Bug Tracker**: To report a bug or request a feature, go to: ``_" msgstr "" -#: ../../source/chapters/introduction.rst:201 +#: ../../chapters/introduction.rst:202 msgid "**Mixxx Translations**: To translate Mixxx and promote your mother tongue, go to: ``_ . Please read the `Translation FAQ `_ first." msgstr "" -#: ../../source/chapters/introduction.rst:206 +#: ../../chapters/introduction.rst:207 msgid "**Social Media**: Follow us on `Twitter `_ , `Facebook `_ , and `Google+ `_ ." msgstr "" diff --git a/source/locale/pot/chapters/library.pot b/source/locale/pot/chapters/library.pot index 145ea17535..d08e31f498 100644 --- a/source/locale/pot/chapters/library.pot +++ b/source/locale/pot/chapters/library.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,1015 +16,1071 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/library.rst:6 -#: ../../source/chapters/library.rst:21 +#: ../../chapters/library.rst:6 +#: ../../chapters/library.rst:21 msgid "The Mixxx Library" msgstr "" -#: ../../source/chapters/library.rst:9 +#: ../../chapters/library.rst:9 msgid "Overview of the Library features" msgstr "" -#: ../../source/chapters/library.rst:23 -msgid "The library manages all of your music files. This is where you can find the tracks you want to play and load them into a :ref:`deck ` or :ref:`sampler `; see :ref:`djing-loading-tracks`. Mixxx imports your music library automatically when it is run for the first time, see :ref:`djing-import` for more information." +#: ../../chapters/library.rst:23 +msgid "The library manages all of your music files. This is where you can find the tracks you want to play and load them into a :ref:`deck ` or :ref:`sampler `; see :ref:`library-loading-tracks`. Mixxx imports your music library automatically when it is run for the first time, see :ref:`configuration-import` for more information." msgstr "" -#: ../../source/chapters/library.rst:29 +#: ../../chapters/library.rst:29 msgid "The sidebar on the left contains different collections of music. The track list view on the right displays the tracks in those collections." msgstr "" -#: ../../source/chapters/library.rst:32 +#: ../../chapters/library.rst:32 msgid "**Sidebar**:" msgstr "" -#: ../../source/chapters/library.rst:34 +#: ../../chapters/library.rst:34 msgid "**Search**: Search for tracks in your Mixxx library." msgstr "" -#: ../../source/chapters/library.rst:35 +#: ../../chapters/library.rst:35 msgid "**Library**: View and edit your whole collection." msgstr "" -#: ../../source/chapters/library.rst:36 +#: ../../chapters/library.rst:36 msgid "**Auto DJ**: Automatically load and crossfade tracks for unattended mixing." msgstr "" -#: ../../source/chapters/library.rst:37 -msgid "**Playlists**: Organize your tracks in sortable lists." +#: ../../chapters/library.rst:37 +msgid "**Playlists**: Arrange tracks in a set order." msgstr "" -#: ../../source/chapters/library.rst:38 -msgid "**Crates**: Manage your files in unordered track collections." +#: ../../chapters/library.rst:38 +msgid "**Crates**: Organize tracks in (unordered) collections." msgstr "" -#: ../../source/chapters/library.rst:39 +#: ../../chapters/library.rst:39 msgid "**Browse**: Browse and load tracks from your file system and connected devices." msgstr "" -#: ../../source/chapters/library.rst:40 +#: ../../chapters/library.rst:40 msgid "**Recordings**: Record your mix and view previous recordings." msgstr "" -#: ../../source/chapters/library.rst:41 -msgid "**History**: Browse lists of tracks you played in past mixing sessions." +#: ../../chapters/library.rst:41 +msgid "**History**: Browse lists of tracks played in past mixing sessions." msgstr "" -#: ../../source/chapters/library.rst:42 -msgid "**Analyze**: Prepare your tracks for optimal mixing experience." +#: ../../chapters/library.rst:42 +msgid "**Analyze**: Generate Mixxx-specific data for tracks before a gig." msgstr "" -#: ../../source/chapters/library.rst:43 +#: ../../chapters/library.rst:43 msgid "**External Libraries**: Access your existing iTunes, Traktor, Rhythmbox, and Banshee libraries." msgstr "" -#: ../../source/chapters/library.rst:46 +#: ../../chapters/library.rst:46 msgid "**Track List**:" msgstr "" -#: ../../source/chapters/library.rst:48 +#: ../../chapters/library.rst:48 msgid "**Sort**: Display and sort track collections by different criteria." msgstr "" -#: ../../source/chapters/library.rst:49 +#: ../../chapters/library.rst:49 msgid "**Load**: Drag tracks you want to play to the waveform display." msgstr "" -#: ../../source/chapters/library.rst:50 +#: ../../chapters/library.rst:50 msgid "**Edit**: Rate tracks and edit track properties." msgstr "" -#: ../../source/chapters/library.rst:55 +#: ../../chapters/library.rst:55 msgid "Library - View and edit your whole collection" msgstr "" -#: ../../source/chapters/library.rst:60 +#: ../../chapters/library.rst:60 msgid "|ic_lib_library| The Library displays a sortable list of all the tracks in your music library." msgstr "" -#: ../../source/chapters/library.rst:67 +#: ../../chapters/library.rst:67 msgid "**Customizing the view**" msgstr "" -#: ../../source/chapters/library.rst:64 -msgid "Move columns by clicking in a column header and dragging it to another position. Right-click on a column header to show and hide particular columns. Adjust the column width to fit the contents of the rows by double-clicking on the separator between two column headers." +#: ../../chapters/library.rst:64 +msgid "Move columns by clicking a column header and dragging it to another position. Right-click on a column header to show or hide individual columns. Adjust the column width to fit the contents of the rows by double-clicking on the separator between two column headers." msgstr "" -#: ../../source/chapters/library.rst:72 +#: ../../chapters/library.rst:90 msgid "**Sorting Tracks**" msgstr "" -#: ../../source/chapters/library.rst:70 +#: ../../chapters/library.rst:70 msgid "Tracks are automatically sorted by the active column. Click on the active column header to reverse the sort order. Click on another column header to change the active column." msgstr "" -#: ../../source/chapters/library.rst:76 +#: ../../chapters/library.rst:74 +msgid "**Multi-Column sorting**" +msgstr "" + +#: ../../chapters/library.rst:78 +msgid "You can sort multiple columns by clicking *up to three* column headers you wish to sort your tracks by. This makes searching for tracks in a large list more efficient. Clicking twice on a column header will reverse the sort order." +msgstr "" + +#: ../../chapters/library.rst:83 +msgid "Example:" +msgstr "" + +#: ../../chapters/library.rst:85 +msgid "Click on the :guilabel:`BPM` column header -> list is sorted by BPM" +msgstr "" + +#: ../../chapters/library.rst:86 +msgid "Click on the :guilabel:`Year` column header -> list is sorted by year. If year is equal, it is still sorted by the last criteria, e.g. BPM." +msgstr "" + +#: ../../chapters/library.rst:88 +msgid "Click on the :guilabel:`Genre` column header -> list is sorted by genre. If genre is equal, it is still sorted by year. If genre and year is equal, then it is sorted by BPM." +msgstr "" + +#: ../../chapters/library.rst:94 msgid "**Rating tracks**" msgstr "" -#: ../../source/chapters/library.rst:75 +#: ../../chapters/library.rst:93 msgid "Make sure the :guilabel:`Rating` column is not hidden. Rate tracks by hovering over the rating field and clicking the stars." msgstr "" -#: ../../source/chapters/library.rst:82 +#: ../../chapters/library.rst:100 msgid "**Track Inline editing**" msgstr "" -#: ../../source/chapters/library.rst:79 -msgid "Mixxx reads :term:`metadata` from the tracks to fill the columns of the library. Double-click on a field, edit the data, and hit :kbd:`Enter` when you are done. Go to the chapter :ref:`edit metadata ` for detailed information." +#: ../../chapters/library.rst:97 +msgid "Mixxx reads :term:`metadata` from the tracks to fill the columns of the library. Double-click on a field, edit the data, and hit :kbd:`Enter` when you are done. Go to the chapter :ref:`edit metadata ` for detailed information." msgstr "" -#: ../../source/chapters/library.rst:87 +#: ../../chapters/library.rst:105 msgid "**Loading tracks**" msgstr "" -#: ../../source/chapters/library.rst:85 -msgid "To load a track into a :ref:`deck `, you can either drag it to the waveform display or use the context menu. Go to the chapter :ref:`djing-loading-tracks` for detailed information." +#: ../../chapters/library.rst:103 +msgid "To load a track into a :ref:`deck `, you can either drag it to the waveform display or use the context menu. Go to the chapter :ref:`library-loading-tracks` for detailed information." msgstr "" -#: ../../source/chapters/library.rst:91 +#: ../../chapters/library.rst:109 msgid "**Importing tracks**" msgstr "" -#: ../../source/chapters/library.rst:90 -msgid "Mixxx imports your music library automatically when it is run for the first time. Go to the chapter :ref:`djing-import` for detailed information." +#: ../../chapters/library.rst:108 +msgid "Mixxx imports your music library automatically when it is run for the first time. Go to the chapter :ref:`configuration-import` for detailed information." msgstr "" -#: ../../source/chapters/library.rst:96 +#: ../../chapters/library.rst:114 msgid "**Previewing Tracks**" msgstr "" -#: ../../source/chapters/library.rst:94 -msgid "To pre-listen to tracks in your headphones without loading them to a regular deck, click the |ic_lib_preview_play| icon in the :guilabel:`Preview` column. Go to the chapter :ref:`djing-previewing-tracks` for detailed information." +#: ../../chapters/library.rst:112 +msgid "To pre-listen to tracks in your headphones without loading them to a regular deck, click the |ic_lib_preview_play| icon in the :guilabel:`Preview` column. Go to the chapter :ref:`library-previewing-tracks` for detailed information." msgstr "" -#: ../../source/chapters/library.rst:98 +#: ../../chapters/library.rst:116 msgid "**Cover/Album Art**" msgstr "" -#: ../../source/chapters/library.rst:100 -msgid "Mixxx can display any cover art that it finds for a track in the library. The search algorithm will check locally for available cover art, and chooses the first cover that appears in the following list:" +#: ../../chapters/library.rst:118 +msgid "Mixxx can display cover art it finds for a track in the library. It will search for available cover art in the following places in order and will use the first one it finds:" msgstr "" -#: ../../source/chapters/library.rst:104 -msgid "The first cover saved in the ID3v2 :term:`tags` of the track" +#: ../../chapters/library.rst:122 +msgid "The first image saved in the track's ID3v2/Vorbis :term:`tags`" msgstr "" -#: ../../source/chapters/library.rst:105 -msgid "If just one image file exists in the track folder take that." +#: ../../chapters/library.rst:123 +msgid "An image file in the track folder (if there is only one image file there.)" msgstr "" -#: ../../source/chapters/library.rst:106 +#: ../../chapters/library.rst:124 msgid ":file:`%track-file-base%.jpg` in the track directory for :file:`%track-file-base%.mp3`" msgstr "" -#: ../../source/chapters/library.rst:107 +#: ../../chapters/library.rst:125 msgid ":file:`%album%.jpg`" msgstr "" -#: ../../source/chapters/library.rst:108 +#: ../../chapters/library.rst:126 msgid ":file:`cover.jpg`" msgstr "" -#: ../../source/chapters/library.rst:109 +#: ../../chapters/library.rst:127 msgid ":file:`front.jpg`" msgstr "" -#: ../../source/chapters/library.rst:110 +#: ../../chapters/library.rst:128 msgid ":file:`album.jpg`" msgstr "" -#: ../../source/chapters/library.rst:111 +#: ../../chapters/library.rst:129 msgid ":file:`folder.jpg`" msgstr "" -#: ../../source/chapters/library.rst:113 +#: ../../chapters/library.rst:131 msgid "Mixxx supports the following image types: jpg, jpeg, png, gif, bmp" msgstr "" -#: ../../source/chapters/library.rst:120 +#: ../../chapters/library.rst:138 msgid "**Rescan Library**" msgstr "" -#: ../../source/chapters/library.rst:116 -msgid "If you want to manually refresh your library without exiting (for example because you added or moved files) you can do this with :menuselection:`Library --> Rescan Library` in the menu on top of the application window. You can prompt an automatic rescan when Mixxx is started in :menuselection:`Preferences --> Library --> Rescan on startup`." +#: ../../chapters/library.rst:134 +msgid "If you want to manually refresh your library without exiting (for example because you added or moved files) you can do this with :menuselection:`Library --> Rescan Library` in the menu at the top of the application window. You can prompt an automatic rescan when Mixxx is started under :menuselection:`Preferences --> Library --> Rescan on startup`." msgstr "" -#: ../../source/chapters/library.rst:123 +#: ../../chapters/library.rst:141 msgid "Track list context menu" msgstr "" -#: ../../source/chapters/library.rst:125 +#: ../../chapters/library.rst:143 msgid ":guilabel:`Reload Track Metadata from MusicBrainz`, :guilabel:`Change BPM` context menu options and :guilabel:`Cover Art`" msgstr "" -#: ../../source/chapters/library.rst:129 +#: ../../chapters/library.rst:147 msgid "All BPM related options are in the :guilabel:`BPM Options` sub-menu." msgstr "" -#: ../../source/chapters/library.rst:132 +#: ../../chapters/library.rst:150 msgid "Right-clicking on selected tracks in the track list reveals the context menu:" msgstr "" -#: ../../source/chapters/library.rst:134 +#: ../../chapters/library.rst:152 msgid "**Add to Auto DJ**: Adds the content of the selection to either the :guilabel:`bottom` or :guilabel:`top` of the :ref:`Auto DJ ` playlist for automatic mixing." msgstr "" -#: ../../source/chapters/library.rst:137 +#: ../../chapters/library.rst:155 msgid "**Load to Deck/Sampler**: Loads a selected file to a :ref:`Deck `, :ref:`Sampler ` or :ref:`Previewdeck `. Alternatively simply drag it to the :ref:`interface-waveform`. Note that you can't load multiple files at once." msgstr "" -#: ../../source/chapters/library.rst:142 -msgid "**Add to playlist/crate**: Add selected tracks to the playlists or crates that you have created before. Alternatively, drag the selection to the playlist or crate in the sidebar." +#: ../../chapters/library.rst:160 +msgid "**Add to playlist/crate**: Add selected tracks to playlists or crates you have previously created. Alternatively, drag the selection to a playlist or crate in the sidebar." msgstr "" -#: ../../source/chapters/library.rst:145 +#: ../../chapters/library.rst:163 msgid "**BPM Options sub-menu**:" msgstr "" -#: ../../source/chapters/library.rst:147 -msgid "**Change BPM**: Allows to change the :term:`BPM` to 50%, 66%, 75% or 200% of the BPM set by Mixxx when :ref:`analyzing ` the tracks. If many of the detected BPM are off from the tracks original tempo, you might want to adjust the :guilabel:`BPM Range` in the :ref:`Analyzer Settings ` and re-run the analysis." +#: ../../chapters/library.rst:165 +msgid "**Change BPM**: Allows to change the :term:`BPM` to 50%, 66%, 75% or 200% of the BPM set by Mixxx when :ref:`analyzing ` the tracks. If many of the detected BPM values are incorrect, you might want to adjust the :guilabel:`BPM Range` in the :ref:`Analyzer Settings ` and re-run the analysis." msgstr "" -#: ../../source/chapters/library.rst:153 +#: ../../chapters/library.rst:172 msgid "**Lock/Unlock BPM**: Locks/Unlocks the :term:`BPM` of selected tracks so you can't edit them in the track properties. The |ic_lib_bpm_unlocked| icon next to the track's BPM in the library row is a toggle. Clicking it will set the status to \"locked\", and the icon changes to |ic_lib_bpm_locked|." msgstr "" -#: ../../source/chapters/library.rst:158 -msgid "**Clear BPM and Beatgrid**: Removes :term:`BPM` and :term:`beatgrid` data of selected tracks from the Mixxx library. After doing this, we recommended you to :ref:`analyze ` the tracks again." +#: ../../chapters/library.rst:177 +msgid "**Clear BPM and Beatgrid**: Removes the :term:`BPM` and :term:`beatgrid` data from the selected tracks in the Mixxx library. After doing this, we recommend :ref:`analyzing ` the tracks again." msgstr "" -#: ../../source/chapters/library.rst:162 -msgid "**Reload Track Metadata from File**: If the track's :term:`metadata` changes, e.g. if you used iTunes to edit them, this option lets you save the new values for the selected tracks to the Mixxx library, see :ref:`edit metadata `." +#: ../../chapters/library.rst:181 +msgid "**Reload Track Metadata from File**: If the track's :term:`metadata` changes, (e.g. if you used iTunes to edit it,) this option lets you save the new values for the selected tracks to the Mixxx library. See :ref:`edit metadata `." msgstr "" -#: ../../source/chapters/library.rst:166 -msgid "**Reload Track Metadata from MusicBrainz**: Lookup :term:`metadata` online by searching the :term:`MusicBrainz` database, and apply the search results to your tracks, see :ref:`edit metadata `." +#: ../../chapters/library.rst:185 +msgid "**Reload Track Metadata from MusicBrainz**: Look up :term:`metadata` online by searching the :term:`MusicBrainz` database and apply the search results to your tracks. See :ref:`edit metadata `." msgstr "" -#: ../../source/chapters/library.rst:170 +#: ../../chapters/library.rst:189 msgid "**Cover Art Option sub-menu**:" msgstr "" -#: ../../source/chapters/library.rst:172 -msgid "**Choose New Cover**: Select an image from the file-browser as new cover." +#: ../../chapters/library.rst:191 +msgid "**Choose New Cover**: Select an image from the file browser as the cover." msgstr "" -#: ../../source/chapters/library.rst:173 +#: ../../chapters/library.rst:192 msgid "**Unset Cover**: Delete any cover information saved for this track." msgstr "" -#: ../../source/chapters/library.rst:174 -msgid "**Reload from track/folder**: Reload the cover from the tracks ID3v2 :term:`tags` or a picture in the track folder if they are not available." +#: ../../chapters/library.rst:193 +msgid "**Reload from track/folder**: Reload the cover from the tracks' ID3v2 :term:`tags` or a picture in the track folder if the tags do not supply any." msgstr "" -#: ../../source/chapters/library.rst:178 +#: ../../chapters/library.rst:197 msgid "**Hide from Library**: Temporarily hides selected tracks from the track list. Hidden tracks are listed in the :guilabel:`Hidden Tracks` menu item which is explained below." msgstr "" -#: ../../source/chapters/library.rst:181 -msgid "**Reset Play Count**: Marks selected tracks as not played in the current session and set their play counter to zero. The icon in the :guilabel:`Played` column changes." +#: ../../chapters/library.rst:200 +msgid "**Reset Play Count**: Marks selected tracks as not played in the current session and sets their play counter to zero. The icon in the :guilabel:`Played` column changes." msgstr "" -#: ../../source/chapters/library.rst:184 -msgid "**Open in File Browser**: Browse for the selected files in your file manager." +#: ../../chapters/library.rst:203 +msgid "**Open in File Browser**: Brings up the selected files in your file manager." msgstr "" -#: ../../source/chapters/library.rst:185 +#: ../../chapters/library.rst:204 msgid "**Properties**: Similar to inline editing explained above, the properties dialog allows you to view and edit metadata such as title, artist, album, and view the full file name and path. Note that you can not edit multiple files at once." msgstr "" -#: ../../source/chapters/library.rst:190 +#: ../../chapters/library.rst:209 msgid "Most of the context menu items are available in file lists of other views like Auto DJ, Playlists, and Crates as well." msgstr "" -#: ../../source/chapters/library.rst:194 +#: ../../chapters/library.rst:213 msgid "Missing Tracks" msgstr "" -#: ../../source/chapters/library.rst:200 -msgid "The Missing Tracks view is accessible by expanding the Library tree item in the sidebar. Any tracks that were previously loaded into your library, but were later detected to be missing from your hard disk by Mixxx will appear here. Mixxx does not automatically delete records of missing tracks so that extra metadata Mixxx might have (such as hotcues and the beatgrids) will not be lost if the file is replaced." +#: ../../chapters/library.rst:219 +msgid "The Missing Tracks view is accessible by expanding the Library tree item in the sidebar. Any tracks that were previously loaded into your library but were later not found on your drive will appear here. Mixxx does not automatically delete records of missing tracks so that extra metadata Mixxx might have (such as hot cues and beat grids) will not be lost in case the file is replaced." msgstr "" -#: ../../source/chapters/library.rst:207 -#: ../../source/chapters/library.rst:227 +#: ../../chapters/library.rst:226 +#: ../../chapters/library.rst:246 msgid "The features in detail:" msgstr "" -#: ../../source/chapters/library.rst:209 -#: ../../source/chapters/library.rst:229 +#: ../../chapters/library.rst:228 +#: ../../chapters/library.rst:248 msgid "**Select All button**: Selects all tracks in the current view." msgstr "" -#: ../../source/chapters/library.rst:210 +#: ../../chapters/library.rst:229 msgid "**Purge button**: Purges the selected tracks from the Mixxx library, but does not remove them from your computer. This will delete all :term:`metadata` Mixxx has for a track." msgstr "" -#: ../../source/chapters/library.rst:215 +#: ../../chapters/library.rst:234 msgid "Hidden Tracks" msgstr "" -#: ../../source/chapters/library.rst:221 -msgid "The Hidden Tracks view is also accessible by expanding the Library tree item in the sidebar. Any tracks that were previously loaded into your library, but were later set to be hidden from the library, will appear here. Use the :guilabel:`Hide from Library` context menu item in the :ref:`library ` view to temporarily hide selected tracks." +#: ../../chapters/library.rst:240 +msgid "The Hidden Tracks view is accessible by expanding the Library tree item in the sidebar. Any tracks that were previously loaded into your library but were later set to be hidden from the library will appear here. Use the :guilabel:`Hide from Library` context menu item in the :ref:`library ` view to temporarily hide selected tracks." msgstr "" -#: ../../source/chapters/library.rst:230 +#: ../../chapters/library.rst:249 msgid "**Purge Button**: Purges the selected tracks from the Mixxx library, but does not remove them from your computer. This will delete all :term:`metadata` Mixxx has for a track." msgstr "" -#: ../../source/chapters/library.rst:233 -msgid "**Unhide Button**: Removes the selected tracks from the :guilabel:`Hidden Tracks` view and makes them available in the regular track list again. The tracks appear again in every playlist or crate they were listed before they were hidden." +#: ../../chapters/library.rst:252 +msgid "**Unhide Button**: Removes the selected tracks from the :guilabel:`Hidden Tracks` view and makes them available in the regular track lists again. The tracks will re-appear in every playlist or crate they were in before being hidden." +msgstr "" + +#: ../../chapters/library.rst:257 +msgid "To learn how to permanently remove tracks from the Mixxx library using the :guilabel:`Hidden Tracks` view, see :ref:`permanently remove tracks `." msgstr "" -#: ../../source/chapters/library.rst:241 +#: ../../chapters/library.rst:264 msgid "Loading Tracks" msgstr "" -#: ../../source/chapters/library.rst:243 -msgid "Supports dragging tracks from deck to deck." +#: ../../chapters/library.rst:266 +msgid "You can drag tracks from deck to deck." msgstr "" -#: ../../source/chapters/library.rst:246 +#: ../../chapters/library.rst:269 msgid "Tracks can be loaded into a deck in several ways:" msgstr "" -#: ../../source/chapters/library.rst:248 -msgid "Right-click the :ref:`library track table `: Right-clicking on a track in the table will present the options :guilabel:`Load in Deck 1` and :guilabel:`Load in Deck 2`, among others. Making either selection will load a track into a deck." +#: ../../chapters/library.rst:271 +msgid "Right-click the :ref:`library track table `: Right-clicking on a track in the table will present the options :guilabel:`Load in Deck 1` and :guilabel:`Load in Deck 2`, among others. Making either selection will load a track into a deck." msgstr "" -#: ../../source/chapters/library.rst:252 -msgid "By :ref:`control-keyboard` to load the selected track from library track table." +#: ../../chapters/library.rst:275 +msgid "By :ref:`control-keyboard` to load the selected track in the library track table." msgstr "" -#: ../../source/chapters/library.rst:254 -msgid "Drag-and-drop from library track table: Dragging-and-dropping a track from the track table onto a waveform display will load a track into a deck." +#: ../../chapters/library.rst:277 +msgid "Drag-and-drop from library track table: Dragging-and-dropping a track from the track table onto a waveform display will load the track into that deck." msgstr "" -#: ../../source/chapters/library.rst:256 -msgid "Drag-and-drop from deck to deck: Once you've loaded a track to deck, sampler, or preview deck, click on the :ref:`track title ` and drag it to a deck or sampler." +#: ../../chapters/library.rst:279 +msgid "Drag-and-drop from deck to deck: Once you've loaded a track to deck, sampler, or preview deck, click on the :ref:`track title ` and drag it to another deck or sampler." msgstr "" -#: ../../source/chapters/library.rst:259 -msgid "Drag-and-drop from external file browser: Dragging-and-dropping a track from an external file browser directly onto a waveform display in Mixxx will load that track. This function also works with some other applications. For example, on Mac OS X, dragging-and-dropping a track from iTunes onto one of Mixxx's waveform displays will load that track into a deck." +#: ../../chapters/library.rst:282 +msgid "Drag-and-drop from external file browser: Dragging-and-dropping a track from an external file browser directly onto a waveform display in Mixxx will load that track. This function also works with some other applications. For example, on Mac OS X, dragging-and-dropping a track from iTunes onto one of Mixxx's waveform displays will load it into that deck." msgstr "" -#: ../../source/chapters/library.rst:268 +#: ../../chapters/library.rst:291 msgid "Finding Tracks (Search)" msgstr "" -#: ../../source/chapters/library.rst:274 -msgid "The search function filters the current selected list (e.g. a playlist, a crate or even the whole library) for tracks that match your search query." +#: ../../chapters/library.rst:297 +msgid "The search function filters the currently displayed list (e.g. a playlist, a crate, or even the whole library) for tracks that match your search query." msgstr "" -#: ../../source/chapters/library.rst:277 -msgid "Activate the search input field by pressing :kbd:`CTRL` + :kbd:`F` (Windows/Linux) or :kbd:`CMD` + :kbd:`F` (Mac). Alternatively click into the search box." +#: ../../chapters/library.rst:300 +msgid "Activate the search input field by clicking in it or pressing :kbd:`CTRL` + :kbd:`F` (Windows/Linux) or :kbd:`CMD` + :kbd:`F` (Mac)." msgstr "" -#: ../../source/chapters/library.rst:280 -msgid "Type your search term. Mixxx filters the tracks and retains only the ones that match the search term. Search terms can include an artist's name, a song title, BPM, etc." +#: ../../chapters/library.rst:302 +msgid "Type your search term(s). Mixxx filters the tracks as you type and shows only those matching the search term(s). Search terms can include an artist's name, a song title, BPM, etc." msgstr "" -#: ../../source/chapters/library.rst:283 +#: ../../chapters/library.rst:305 msgid "To clear the search string hit :kbd:`ESC` or click the clear button right next to the input field." msgstr "" -#: ../../source/chapters/library.rst:285 +#: ../../chapters/library.rst:307 msgid "Hit :kbd:`TAB` to cycle between the search and the list of results in the library. Use the :kbd:`ARROW UP` and :kbd:`ARROW DOWN` keys to scroll in the list of results." msgstr "" -#: ../../source/chapters/library.rst:289 +#: ../../chapters/library.rst:311 msgid "If the search input field has focus, the Mixxx keyboard shortcuts are disabled, see :ref:`control-keyboard`." msgstr "" -#: ../../source/chapters/library.rst:293 +#: ../../chapters/library.rst:315 msgid "Using search operators" msgstr "" -#: ../../source/chapters/library.rst:295 +#: ../../chapters/library.rst:317 msgid "Search operators allow you to form more complex search queries. They allow you to limit certain search terms to particular properties of your tracks." msgstr "" -#: ../../source/chapters/library.rst:298 +#: ../../chapters/library.rst:320 msgid "Adds *location*, *album_artist*, and *key* search keywords. Supports human-readable time suffixes in time-based search query filters, e.g. ``1:30``, ``1m30s``, ``1m30``, ``90``, ``90s``. Supports negative search filters." msgstr "" -#: ../../source/chapters/library.rst:304 +#: ../../chapters/library.rst:326 msgid "Mixxx supports the following filters:" msgstr "" -#: ../../source/chapters/library.rst:306 +#: ../../chapters/library.rst:328 msgid "**Text filtering**: artist, album, album_artist, genre, title, composer, comment, key, location" msgstr "" -#: ../../source/chapters/library.rst:309 +#: ../../chapters/library.rst:331 msgid "**Numeric filtering**: year, track, bpm, played, rating, bitrate, duration" msgstr "" -#: ../../source/chapters/library.rst:311 +#: ../../chapters/library.rst:333 msgid "**Special filtering**:" msgstr "" -#: ../../source/chapters/library.rst:313 +#: ../../chapters/library.rst:335 msgid "Supports fuzzy matching of key searches. The following example list tracks with harmonically compatible keys to C# minor." msgstr "" -#: ../../source/chapters/library.rst:320 +#: ../../chapters/library.rst:342 msgid "You can combine operators but there's no way to do an “OR” search right now. The following example list all tracks by “Danger” over 3 minutes long that are rated 4 or 5." msgstr "" -#: ../../source/chapters/library.rst:328 +#: ../../chapters/library.rst:350 msgid "Negative search filters. Use the ``-`` prefix as negation operator. The following example would find “hip-hop“ from any year but 1990." msgstr "" -#: ../../source/chapters/library.rst:337 +#: ../../chapters/library.rst:359 msgid "Examples for text filtering" msgstr "" -#: ../../source/chapters/library.rst:337 +#: ../../chapters/library.rst:359 msgid "Examples for numeric filtering" msgstr "" -#: ../../source/chapters/library.rst:337 +#: ../../chapters/library.rst:359 msgid "Examples for duration filtering" msgstr "" -#: ../../source/chapters/library.rst:339 +#: ../../chapters/library.rst:361 msgid "artist: “com truise”" msgstr "" -#: ../../source/chapters/library.rst:339 +#: ../../chapters/library.rst:361 msgid "bpm:140" msgstr "" -#: ../../source/chapters/library.rst:339 +#: ../../chapters/library.rst:361 msgid "duration:2m10" msgstr "" -#: ../../source/chapters/library.rst:341 +#: ../../chapters/library.rst:363 msgid "album:Danger" msgstr "" -#: ../../source/chapters/library.rst:341 +#: ../../chapters/library.rst:363 msgid "bpm: >140" msgstr "" -#: ../../source/chapters/library.rst:341 +#: ../../chapters/library.rst:363 msgid "duration:<2:10" msgstr "" -#: ../../source/chapters/library.rst:343 +#: ../../chapters/library.rst:365 msgid "genre: Trance" msgstr "" -#: ../../source/chapters/library.rst:343 +#: ../../chapters/library.rst:365 msgid "year: <2010" msgstr "" -#: ../../source/chapters/library.rst:343 +#: ../../chapters/library.rst:365 msgid "duration:>1m35s" msgstr "" -#: ../../source/chapters/library.rst:345 +#: ../../chapters/library.rst:367 msgid "title: foo" msgstr "" -#: ../../source/chapters/library.rst:345 +#: ../../chapters/library.rst:367 msgid "bpm: >=140" msgstr "" -#: ../../source/chapters/library.rst:345 +#: ../../chapters/library.rst:367 msgid "duration:>62" msgstr "" -#: ../../source/chapters/library.rst:347 +#: ../../chapters/library.rst:369 msgid "composer: foo" msgstr "" -#: ../../source/chapters/library.rst:347 +#: ../../chapters/library.rst:369 msgid "rating: <=4" msgstr "" -#: ../../source/chapters/library.rst:349 +#: ../../chapters/library.rst:371 msgid "comment: foo" msgstr "" -#: ../../source/chapters/library.rst:349 +#: ../../chapters/library.rst:371 msgid "bpm: 140-150" msgstr "" -#: ../../source/chapters/library.rst:351 +#: ../../chapters/library.rst:373 msgid "genre:hip-hop -genre:gangsta" msgstr "" -#: ../../source/chapters/library.rst:351 +#: ../../chapters/library.rst:373 msgid "played: >10" msgstr "" -#: ../../source/chapters/library.rst:353 +#: ../../chapters/library.rst:375 msgid "Note it doesn't matter if you have space between the colon and the argument or not. Quotes must be used for multi-word text arguments." msgstr "" -#: ../../source/chapters/library.rst:353 -#: ../../source/chapters/library.rst:353 -msgid "Note that you can put a space between the colon but currently there must be no space between the operator and the number." +#: ../../chapters/library.rst:375 +#: ../../chapters/library.rst:375 +msgid "Note that you can put a space after the colon but currently there must be no space between the operator and the number." msgstr "" -#: ../../source/chapters/library.rst:362 +#: ../../chapters/library.rst:384 msgid "Previewing Tracks" msgstr "" -#: ../../source/chapters/library.rst:368 -msgid "To pre-listen to a track, activate the :guilabel:`Preview` column in a library view. Clicking the |ic_lib_preview_play| icon in the library's :guilabel:`Preview` column loads the selected track in a special :ref:`Preview Deck ` that will only output sound in the :ref:`headphones ` channel. Click the |ic_lib_preview_pause| icon to stop the playback." +#: ../../chapters/library.rst:390 +msgid "To pre-listen to a track, activate the :guilabel:`Preview` column in a library view. Clicking the |ic_lib_preview_play| icon in the library's :guilabel:`Preview` column loads the selected track into a special :ref:`Preview Deck ` that will only output sound in the :ref:`headphones ` channel. Click the |ic_lib_preview_pause| icon to stop the playback." msgstr "" -#: ../../source/chapters/library.rst:375 +#: ../../chapters/library.rst:397 msgid "Alternatively, select a track from the track list of the Mixxx library, drag the track to the waveform view of the :ref:`Preview Deck ` and click the :guilabel:`Play` button next to the waveform." msgstr "" -#: ../../source/chapters/library.rst:379 +#: ../../chapters/library.rst:401 msgid "To display the Preview deck, press :kbd:`CTRL` + :kbd:`4` (Windows/Linux) or :kbd:`CMD` + :kbd:`4` (Mac)." msgstr "" -#: ../../source/chapters/library.rst:385 +#: ../../chapters/library.rst:407 msgid "Edit metadata of audio files" msgstr "" -#: ../../source/chapters/library.rst:390 +#: ../../chapters/library.rst:412 msgid "Mixxx reads relevant :term:`metadata` from the tracks and displays them in the library columns. You are free to edit most metadata, and Mixxx offers a number of different ways to do so. Note that some information can not be edited, such as bitrate, size, length, type, filename, and location." msgstr "" -#: ../../source/chapters/library.rst:395 +#: ../../chapters/library.rst:417 msgid "Mixxx does not support editing the metadata of many tracks at a time (bulk editing)." msgstr "" -#: ../../source/chapters/library.rst:398 +#: ../../chapters/library.rst:420 msgid "Changes to a track's metadata will be saved to the Mixxx library, but **not** to the track itself. Mixxx wont touch your audio files to prevent data loss." msgstr "" -#: ../../source/chapters/library.rst:403 +#: ../../chapters/library.rst:425 msgid "Manual Edit" msgstr "" -#: ../../source/chapters/library.rst:417 +#: ../../chapters/library.rst:439 msgid "**Track Inline editing**:" msgstr "" -#: ../../source/chapters/library.rst:406 +#: ../../chapters/library.rst:428 msgid "Double-click on a field in the :ref:`library `. If the field is editable, it will become an editable text box. Enter a value and hit :kbd:`Enter` when you are done." msgstr "" -#: ../../source/chapters/library.rst:417 +#: ../../chapters/library.rst:439 msgid "Mixxx library - Inline editing" msgstr "" -#: ../../source/chapters/library.rst:442 +#: ../../chapters/library.rst:465 msgid "**Properties editor**:" msgstr "" -#: ../../source/chapters/library.rst:420 +#: ../../chapters/library.rst:442 msgid "Click on a **single track** in the library and select :guilabel:`Properties` to open the editor. Add or change values in the editable fields, and save your changes as explained below." msgstr "" -#: ../../source/chapters/library.rst:431 +#: ../../chapters/library.rst:453 msgid "Mixxx library - Properties editor" msgstr "" -#: ../../source/chapters/library.rst:433 +#: ../../chapters/library.rst:455 msgid "**OK**: Accept the changes and close the editor." msgstr "" -#: ../../source/chapters/library.rst:434 -msgid "**Apply**: Accept the changes you made into the metadata." +#: ../../chapters/library.rst:456 +msgid "**Apply**: Accept the changes and leave the editor open." msgstr "" -#: ../../source/chapters/library.rst:435 +#: ../../chapters/library.rst:457 msgid "**Cancel**: Discard the changes and close the editor." msgstr "" -#: ../../source/chapters/library.rst:436 +#: ../../chapters/library.rst:458 msgid "**Previous/Next**: Load the previous or next track in the current library view." msgstr "" -#: ../../source/chapters/library.rst:438 -msgid "**Reload Track Metadata from File**: Prompts Mixxx to re-read the metadata of the selected track if you have modified metadata in 3rd-party software," +#: ../../chapters/library.rst:460 +msgid "**Reload Track Metadata from File**: Prompts Mixxx to re-read the metadata of the selected track (such as when you have modified it externally with another application.)" msgstr "" -#: ../../source/chapters/library.rst:440 -msgid "**Reload Track Metadata from MusicBrainz**: Lookup metadata online by searching the :term:`MusicBrainz` database, see below." +#: ../../chapters/library.rst:463 +msgid "**Reload Track Metadata from MusicBrainz**: Look up metadata on-line by searching the :term:`MusicBrainz` database. See below." msgstr "" -#: ../../source/chapters/library.rst:445 +#: ../../chapters/library.rst:468 msgid "Using the MusicBrainz online database" msgstr "" -#: ../../source/chapters/library.rst:447 +#: ../../chapters/library.rst:470 msgid "`Musicbrainz `_ is an :term:`open-source` music encyclopedia that collects music :term:`metadata` and makes it available to the public." msgstr "" -#: ../../source/chapters/library.rst:458 +#: ../../chapters/library.rst:481 msgid "Mixxx library - MusicBrainz Wizard" msgstr "" -#: ../../source/chapters/library.rst:460 -msgid "The MusicBrainz wizard in Mixxx allows to search the MusicBrainz database and apply the search results to your tracks." +#: ../../chapters/library.rst:483 +msgid "The MusicBrainz wizard in Mixxx allows searching the MusicBrainz database and applying the results to your tracks." msgstr "" -#: ../../source/chapters/library.rst:463 +#: ../../chapters/library.rst:486 msgid "Click on a **single track** in the library and select :guilabel:`Get Metadata from MusicBrainz`. Mixxx fetches track data from the MusicBrainz database and displays the search results." msgstr "" -#: ../../source/chapters/library.rst:467 -msgid "Select the best possible match from the search results by clicking on it in the list." +#: ../../chapters/library.rst:490 +msgid "Select the best match from the search results by clicking on it in the list." msgstr "" -#: ../../source/chapters/library.rst:470 +#: ../../chapters/library.rst:492 msgid "**Apply**: Apply the selected MusicBrainz metadata to the track." msgstr "" -#: ../../source/chapters/library.rst:471 +#: ../../chapters/library.rst:493 msgid "**Close**: Close the wizard." msgstr "" -#: ../../source/chapters/library.rst:472 -msgid "**Previous/Next**: Load the previous or next track in the current library view and perform a MusicBrainz lookup on them as well." +#: ../../chapters/library.rst:494 +msgid "**Previous/Next**: Load the previous or next track in the current library view and perform a MusicBrainz lookup on it as well." +msgstr "" + +#: ../../chapters/library.rst:500 +msgid "Fetching track metadata from MusicBrainz can fail:" +msgstr "" + +#: ../../chapters/library.rst:498 +msgid "if Mixxx is unable to find the specified track in the MusicBrainz database," msgstr "" -#: ../../source/chapters/library.rst:475 -msgid "Fetching track metadata from MusicBrainz can possibly fail if Mixxx could not find the requested track in the MusicBrainz database, could not connect to the MusicBrainz servers, or because you are not connected to the Internet." +#: ../../chapters/library.rst:499 +msgid "if Mixxx cannot reach the MusicBrainz servers (if they are down,)" msgstr "" -#: ../../source/chapters/library.rst:479 -msgid "The MusicBrainz service has been designed for identifying full audio files. Is a track less then 2 minutes long, identifying the file will likely fail. Identifying a layered mix-track or mash-up may produce false positives in the result list." +#: ../../chapters/library.rst:500 +msgid "or if you are not connected to the Internet." msgstr "" -#: ../../source/chapters/library.rst:485 -msgid "Using 3rd-party software" +#: ../../chapters/library.rst:502 +msgid "The MusicBrainz service has been designed for identifying full audio files. If a track is less than 2 minutes long, identifying the file will likely fail. Identifying a layered mix-track or mash-up may produce false positives in the result list." msgstr "" -#: ../../source/chapters/library.rst:487 -msgid "If you have modified file metadata in 3rd-party software, select :menuselection:`Library --> Rescan Library` in the menu on top of the application window. This prompts Mixxx to re-read the metadata from **all** tracks in the library." +#: ../../chapters/library.rst:508 +msgid "Using third-party software" msgstr "" -#: ../../source/chapters/library.rst:495 +#: ../../chapters/library.rst:510 +msgid "If you have modified file metadata in third-party software, select :menuselection:`Library --> Rescan Library` in the menu on top of the application window. This prompts Mixxx to re-read the metadata from **all** tracks in the library." +msgstr "" + +#: ../../chapters/library.rst:518 msgid "Popular software to edit metadata of audio files include:" msgstr "" -#: ../../source/chapters/library.rst:493 +#: ../../chapters/library.rst:516 msgid "`Mp3tag `_ (Windows)" msgstr "" -#: ../../source/chapters/library.rst:494 -msgid "`Kid3 `_ (Linux)" +#: ../../chapters/library.rst:517 +msgid "`Kid3 `_ (Mac, Windows, Linux)" msgstr "" -#: ../../source/chapters/library.rst:495 +#: ../../chapters/library.rst:518 msgid "`Picard `_ (Mac, Windows, Linux)" msgstr "" -#: ../../source/chapters/library.rst:500 +#: ../../chapters/library.rst:523 msgid "Auto DJ - Automate your mix" msgstr "" -#: ../../source/chapters/library.rst:505 -msgid "|ic_lib_autodj| The Auto DJ queue is a special playlist that contains extra controls for automatic mixing. This is useful for taking a break from live mixing or for using Mixxx as media player." +#: ../../chapters/library.rst:528 +msgid "|ic_lib_autodj| The Auto DJ queue is a special playlist that contains extra controls for automatic mixing. This is useful when taking a break from live mixing or for using Mixxx as media player." msgstr "" -#: ../../source/chapters/library.rst:509 +#: ../../chapters/library.rst:532 msgid "The Auto DJ features in detail:" msgstr "" -#: ../../source/chapters/library.rst:511 -msgid "**Shuffle button**: Shuffles the content of the Auto DJ playlist." +#: ../../chapters/library.rst:534 +msgid "**Shuffle button**: Randomizes the order of tracks in the Auto DJ playlist." msgstr "" -#: ../../source/chapters/library.rst:512 -msgid "**Add Random button**: Add random track from Auto DJ Crates." +#: ../../chapters/library.rst:535 +msgid "**Add Random button**: Add random track from Auto DJ track sources." msgstr "" -#: ../../source/chapters/library.rst:513 +#: ../../chapters/library.rst:536 msgid "**Skip track button**: Skips the next track in the Auto DJ playlist." msgstr "" -#: ../../source/chapters/library.rst:514 +#: ../../chapters/library.rst:537 msgid "**Fade now button**: Triggers the transition to the next track." msgstr "" -#: ../../source/chapters/library.rst:515 -msgid "**Transition time spin-box**: Determines the duration of the transition." +#: ../../chapters/library.rst:538 +msgid "**Transition time spin-box**: Determines the duration of the transition. A negative value will add a pause between tracks." msgstr "" -#: ../../source/chapters/library.rst:516 +#: ../../chapters/library.rst:540 msgid "**Enable Auto DJ button**: Toggles the Auto DJ mode on or off." msgstr "" -#: ../../source/chapters/library.rst:518 -msgid "The :guilabel:`Skip track`, :guilabel:`Add Random` and :guilabel:`Fade now` buttons are only accessible if the Auto DJ mode is enabled. The Search field in the upper left corner is disabled in Auto DJ. By default, Auto DJ removes tracks after playing them but if you want AutoDJ to play the same tracks over and over again, you may activate the :guilabel:`Auto DJ Requeue` option in :menuselection:`Preferences --> Auto DJ --> Re-queue tracks after playback`." +#: ../../chapters/library.rst:542 +msgid "The :guilabel:`Skip track`, :guilabel:`Add Random` and :guilabel:`Fade now` buttons are only accessible if the Auto DJ mode is enabled. The Search field in the upper left corner is disabled in Auto DJ. By default, Auto DJ removes tracks after playing them but if you want it to play the same tracks over and over again, you can activate the :guilabel:`Auto DJ Requeue` option in :menuselection:`Preferences --> Auto DJ --> Re-queue tracks after playback`." msgstr "" -#: ../../source/chapters/library.rst:525 -msgid "**AutoDJ Crates**" +#: ../../chapters/library.rst:551 +msgid "**Auto DJ Crates**" msgstr "" -#: ../../source/chapters/library.rst:529 -msgid "It is possible to add random tracks to the bottom of the Auto DJ playlist. The tracks are not chosen from the standard library but from a set of crates. It will be all the crates that you have set as a source for Auto DJ. Mixxx will normally try to select a track that you haven't played so far. You can set a amount off tracks that is always supposed to be available for selection no matter when they where last played in :menuselection:`Preferences --> Auto DJ --> Minimum available tracks in Track Source`." +#: ../../chapters/library.rst:555 +msgid "It is possible to add random tracks to the bottom of the Auto DJ playlist. The tracks are chosen from a set of crates that you have set as a source for Auto DJ, or from the standard library. Mixxx will normally try to select tracks that haven't yet been played. You can set a minimum number of tracks that are always available for selection no matter when they were last played in :menuselection:`Preferences --> Auto DJ --> Minimum available tracks in Track Source`." msgstr "" -#: ../../source/chapters/library.rst:537 -msgid "Put a pause between tracks that are automatically mixed by using a negative value in the :guilabel:`Transition time` spin-box." -msgstr "" - -#: ../../source/chapters/library.rst:540 +#: ../../chapters/library.rst:562 msgid "For more information, go to the chapter :ref:`djing-auto-dj`." msgstr "" -#: ../../source/chapters/library.rst:545 -msgid "Playlists - Organizing your tracks" +#: ../../chapters/library.rst:567 +msgid "Playlists - Arranging tracks in a set order" msgstr "" -#: ../../source/chapters/library.rst:550 -msgid "|ic_lib_playlist| Playlists are ordered lists of tracks that allow you to plan your DJ sets. Some DJs construct playlists before they perform live, but others prefer to build them on-the-fly." +#: ../../chapters/library.rst:572 +msgid "|ic_lib_playlist| Playlists are ordered lists of tracks that allow you to plan your DJ sets. Some DJs construct playlists before they perform live; others prefer to build them on-the-fly." msgstr "" -#: ../../source/chapters/library.rst:554 -msgid "Playlists are not directly loadable into the decks as Mixxx is primarily intended for live, attended performance use. However, you can use the :ref:`Auto DJ ` explained above." +#: ../../chapters/library.rst:576 +msgid "Playlists are not directly loadable into decks as Mixxx is primarily intended for live, attended performance use. However, you can right-click a playlist to queue it to :ref:`Auto DJ `, so in a sense you can \"play\" it." msgstr "" -#: ../../source/chapters/library.rst:558 +#: ../../chapters/library.rst:581 msgid "**Create a playlist**: Right-click on the :guilabel:`Playlists` sidebar item and select :guilabel:`New playlist`. Name the playlist and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:561 +#: ../../chapters/library.rst:584 msgid "**Add Tracks**: Add tracks to a previously created playlist by dragging-and-dropping a selection of tracks from the library or playlists onto the name of a playlist in the sidebar. Alternatively, use the right-click context menu in the library's :ref:`track list `." msgstr "" -#: ../../source/chapters/library.rst:566 -msgid ":guilabel:`Analyze Playlist` option in the context menu. Import playlists by drag-and-dropping them into a playlist in the sidebar. :guilabel:`Import playlist` and :guilabel:`Export playlist` context menu options remember the last selected playlist directory. Displays the total number of tracks, and the total duration next to the playlist's name." +#: ../../chapters/library.rst:591 +msgid ":guilabel:`Analyze Playlist` option in the context menu." +msgstr "" + +#: ../../chapters/library.rst:592 +msgid "Import playlists by dragging-and-dropping them into a playlist in the sidebar." +msgstr "" + +#: ../../chapters/library.rst:593 +msgid ":guilabel:`Import playlist` and :guilabel:`Export playlist` context menu options remember the last selected playlist directory." +msgstr "" + +#: ../../chapters/library.rst:595 +msgid "The total number of tracks and total duration are displayed next to the playlist's name." msgstr "" -#: ../../source/chapters/library.rst:574 -msgid "Right-click on an existing playlist's name to access the different features in the context menu:" +#: ../../chapters/library.rst:598 +msgid "Right-click on an existing playlist name to access the different features in the context menu:" msgstr "" -#: ../../source/chapters/library.rst:577 +#: ../../chapters/library.rst:601 msgid "**Add to Auto DJ**: Adds the content of the playlist to the :ref:`Auto DJ ` queue for automatic mixing." msgstr "" -#: ../../source/chapters/library.rst:579 -msgid "**Rename**: To rename a playlist, just put in a new playlist name and click :guilabel:`OK`." +#: ../../chapters/library.rst:603 +msgid "**Rename**: To rename a playlist, just enter a new playlist name and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:581 +#: ../../chapters/library.rst:605 msgid "**Duplicate**: Sometimes you want to build a playlist based on an existing one. Select the playlist you would like to duplicate, choose :guilabel:`Duplicate Playlist`, name the new playlist and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:584 -msgid "**Remove**: Removes an unlocked playlist. Tracks in the playlist are still available in the library for later use." +#: ../../chapters/library.rst:608 +msgid "**Remove**: Removes an unlocked playlist. Tracks that were in the playlist remain in the library for later use." msgstr "" -#: ../../source/chapters/library.rst:586 +#: ../../chapters/library.rst:610 msgid "**Lock**: |ic_lib_locked| This icon indicates a locked playlist. If a playlist is locked, you cannot add tracks, rename or delete the playlist. Choose :guilabel:`Unlock` from the context menu to unlock the playlist." msgstr "" -#: ../../source/chapters/library.rst:589 -msgid "**Analyze entire playlist**: Forces the analysis of the playlist in the :ref:`Analyze ` view." +#: ../../chapters/library.rst:613 +msgid "**Analyze entire playlist**: Forces the analysis of the tracks in the playlist in the :ref:`Analyze ` view." msgstr "" -#: ../../source/chapters/library.rst:591 -msgid "**Import playlist**: Import tracks from external playlists to a playlist in various file formats. For more information, go to :ref:`library-3rd-party`." +#: ../../chapters/library.rst:615 +msgid "**Import playlist**: Import tracks from external playlists in various file formats to a new Mixxx playlist. For more information, go to :ref:`library-3rd-party`." msgstr "" -#: ../../source/chapters/library.rst:593 -msgid "**Export playlist**: Export a playlist in various file formats, such as :file:`m3u`, :file:`pls`, or :file:`csv`. Ideal for processing the data in other applications." +#: ../../chapters/library.rst:618 +msgid "**Export playlist**: Export a playlist to various file formats such as :file:`m3u`, :file:`pls`, or :file:`csv`. This allows you to use the data in other applications." msgstr "" -#: ../../source/chapters/library.rst:600 -msgid "Crates - Working with track collections" +#: ../../chapters/library.rst:625 +msgid "Crates - Organizing tracks into collections" msgstr "" -#: ../../source/chapters/library.rst:605 -msgid "|ic_lib_crates| Crates are unordered collections of tracks, and are similar to playlists. Think of it like a DJ case to organize your favorite vinyls into." +#: ../../chapters/library.rst:630 +msgid "|ic_lib_crates| Crates are unordered collections of tracks, just like DJ cases holding your favorite records." msgstr "" -#: ../../source/chapters/library.rst:608 +#: ../../chapters/library.rst:633 msgid "**Create a crate**: Right-click on the :guilabel:`Crates` sidebar item and select :guilabel:`New Crate`. Name the crate and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:610 -msgid "**Add Tracks**: Add tracks to a previously created crate by drag-and-dropping a selection of tracks from the library or playlists onto the name of a crate in the sidebar. Alternatively use the context menu in the library's :ref:`track list`." +#: ../../chapters/library.rst:635 +msgid "**Add Tracks**: Add tracks to a previously created crate by dragging-and-dropping a selection of tracks from the library or playlists onto the name of a crate in the sidebar. Alternatively use the context menu in the library's :ref:`track list`." +msgstr "" + +#: ../../chapters/library.rst:642 +msgid ":guilabel:`Analyze Crate` and :guilabel:`Auto DJ Track Source` context menu options." +msgstr "" + +#: ../../chapters/library.rst:644 +msgid ":guilabel:`Import crate` and :guilabel:`Export crate` context menu options remember the last selected playlist directory." msgstr "" -#: ../../source/chapters/library.rst:615 -msgid ":guilabel:`Analyze Crate` context menu option. :guilabel:`Import crate` and :guilabel:`Export crate` context menu options remember the last selected playlist directory. Displays the total number of tracks, and the total duration next to the crate's name." +#: ../../chapters/library.rst:646 +msgid "Displays the total number of tracks and the total duration next to the crate's name." msgstr "" -#: ../../source/chapters/library.rst:622 +#: ../../chapters/library.rst:649 msgid "Right-click on an existing crate's name to access the different features in the context menu:" msgstr "" -#: ../../source/chapters/library.rst:625 +#: ../../chapters/library.rst:652 msgid "**Rename**: To rename a crate, enter the new crate name and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:627 +#: ../../chapters/library.rst:654 msgid "**Duplicate**: Just like playlists you can duplicate an existing crate. Select the crate you would like to duplicate, choose :guilabel:`Duplicate Crate`, name the new crate and click :guilabel:`OK`." msgstr "" -#: ../../source/chapters/library.rst:630 +#: ../../chapters/library.rst:657 msgid "**Remove**: Removes an unlocked crate. Tracks in the crate are still available in the library for later use." msgstr "" -#: ../../source/chapters/library.rst:632 +#: ../../chapters/library.rst:659 msgid "**Lock**: |ic_lib_locked| This icon indicates a locked crate. If a crate is locked, you cannot add tracks, rename or delete the crate. Choose :guilabel:`Unlock` from the context menu to unlock the crate." msgstr "" -#: ../../source/chapters/library.rst:635 -msgid "**AutoDJ Track Source**: Use this crate as a source for random tracks in AutoDJ." +#: ../../chapters/library.rst:662 +msgid "**Auto DJ Track Source**: Use this crate as a source for random tracks in Auto DJ, see :ref:`Auto DJ crates ` ." msgstr "" -#: ../../source/chapters/library.rst:636 -msgid "**Analyze entire crate**: Forces the analysis of the crate in the :ref:`Analyze ` view." +#: ../../chapters/library.rst:664 +msgid "**Analyze entire crate**: Forces the analysis of the crate in the :ref:`Analyze ` view." msgstr "" -#: ../../source/chapters/library.rst:638 -msgid "**Import crate**: Import tracks from an external playlist to a crate in various file formats." +#: ../../chapters/library.rst:666 +msgid "**Import crate**: Import tracks from external playlists in various file formats to a new Mixxx crate." msgstr "" -#: ../../source/chapters/library.rst:640 -msgid "**Export crate**: Export a crate in various file formats, such as :file:`m3u`, :file:`pls`, or :file:`csv`. Ideal for processing the data in other applications." +#: ../../chapters/library.rst:668 +msgid "**Export crate**: Export a crate to various file formats, such as :file:`m3u`, :file:`pls`, or :file:`csv`. This allows you to use the data in other applications." msgstr "" -#: ../../source/chapters/library.rst:645 +#: ../../chapters/library.rst:673 msgid "Crates vs. Playlists" msgstr "" -#: ../../source/chapters/library.rst:651 -msgid "Crates are unordered collections of tracks. Unlike playlists, they cannot contain duplicate entries and do not support drag-and-drop within them." +#: ../../chapters/library.rst:680 +msgid "Crates are unordered collections of tracks. Unlike playlists, they cannot contain duplicate entries and do not support arranging tracks within them." msgstr "" -#: ../../source/chapters/library.rst:654 -msgid "Playlists serve a limited purpose of keeping an ordered list of tracks. You can right-click a playlist to queue it to :ref:`Auto DJ `, so in a sense you can “play” it." +#: ../../chapters/library.rst:683 +msgid "Often DJs group tracks by genre, keep lists of favorite tracks, and/or prepare lists of tracks they want to play at a particular party. In these cases they rarely care about the order since they will choose it at the party based on the dance floor and mood. They certainly don't want duplicates in these lists. Crates serve these purposes. You can think of them like labels in GMail or Web 2.0 tags for your music." msgstr "" -#: ../../source/chapters/library.rst:658 -msgid "Often DJs keep a playlist of favorites or plan a list of tracks they want to play at a party. In these cases they rarely care about the order since they will likely choose the order at the party based on the dance floor and mood and they certainly don't want duplicates. This is where crates come in. You can think of them like labels in GMail or Web 2.0 tags for your music." +#: ../../chapters/library.rst:690 +msgid "If however you want to plan out a specific set and practice the transitions, you will want an ordered list of tracks. Playlists serve this purpose." msgstr "" -#: ../../source/chapters/library.rst:664 -msgid "On the other hand, if you want to specifically plan out a set and practice the transitions you might want to keep an ordering of tracks or repeat them (if you plan to mix a track back in later on) so in that situation you could use a playlist." -msgstr "" - -#: ../../source/chapters/library.rst:672 +#: ../../chapters/library.rst:697 msgid "Browse - Loading remote tracks" msgstr "" -#: ../../source/chapters/library.rst:677 -msgid "|ic_lib_browse| Browse mode works like a file-manager and allows you to load tracks that are not necessarily already in your Mixxx library." +#: ../../chapters/library.rst:702 +msgid "|ic_lib_browse| Browse mode works like a file manager and allows you to load tracks from anywhere on your computer that are not necessarily already in your Mixxx library." msgstr "" -#: ../../source/chapters/library.rst:680 +#: ../../chapters/library.rst:706 msgid "Add music directories directly from the Browse sidebar item." msgstr "" -#: ../../source/chapters/library.rst:683 -msgid "Click the :guilabel:`Browse` sidebar item to navigate the computer and find your music. Depending on your :term:`operating system`, the music will usually be found in the “My Music” or “Music” folder. Drag the files you want to import to the |ic_lib_library| :ref:`Library ` icon or directly to the :ref:`interface-waveform`." +#: ../../chapters/library.rst:709 +msgid "Click the :guilabel:`Browse` sidebar item to navigate the computer and find your music. Depending on your :term:`operating system`, your music will usually be found in the “My Music” or “Music” folder. Drag the files you want to import to the |ic_lib_library| :ref:`Library ` icon or directly to the :ref:`interface-waveform`." msgstr "" -#: ../../source/chapters/library.rst:689 -msgid "Currently you can drag only files but not folders to the Mixxx library." +#: ../../chapters/library.rst:715 +msgid "Currently you can only drag files (not folders) to the Mixxx library." msgstr "" -#: ../../source/chapters/library.rst:692 -msgid "Right-click on a folder and choose :guilabel:`Add to Library` to add the folder as new music directory. Mixxx will watch this directory and its subdirectories for new tracks." +#: ../../chapters/library.rst:717 +msgid "Right-click on a folder and choose :guilabel:`Add to Library` to add the folder as an additional music directory. Mixxx will watch this directory and its subdirectories for new tracks." msgstr "" -#: ../../source/chapters/library.rst:696 -msgid "For more informations, go to :ref:`djing-changing-music-directories`." +#: ../../chapters/library.rst:721 +msgid "For more informations, go to :ref:`configuration-changing-music-directories`." msgstr "" -#: ../../source/chapters/library.rst:699 +#: ../../chapters/library.rst:724 msgid "Quick Links - Bookmark your favorite folders" msgstr "" -#: ../../source/chapters/library.rst:701 +#: ../../chapters/library.rst:726 msgid "Using the :guilabel:`Quick Links` sub-menu you can bookmark folders for direct access. Click the :guilabel:`Browse` sidebar item and navigate to the folder you would like to bookmark. Right-click and choose :guilabel:`Add to Quick Links`. The folder is now pinned below the :guilabel:`Quick Links`. To un-pin that folder, right-click and choose :guilabel:`Remove from Quick Links`." msgstr "" -#: ../../source/chapters/library.rst:708 +#: ../../chapters/library.rst:733 msgid "Recordings" msgstr "" -#: ../../source/chapters/library.rst:710 -msgid "|ic_lib_recordings| In this section of the library you can start and stop recordings well as view previous recordings and the dates they were made." +#: ../../chapters/library.rst:735 +msgid "|ic_lib_recordings| In this section of the library you can start and stop recording your session as well as view previous recordings and the dates they were made." msgstr "" -#: ../../source/chapters/library.rst:713 +#: ../../chapters/library.rst:739 msgid "For more information, go to :ref:`djing-recording-your-mix`." msgstr "" -#: ../../source/chapters/library.rst:718 -msgid "History - Keep track of your last sessions" +#: ../../chapters/library.rst:744 +msgid "History - Keep track of your sessions" msgstr "" -#: ../../source/chapters/library.rst:723 -msgid "|ic_lib_history| The history section automatically keeps a list of tracks you play in your DJ sets. This is handy for remembering what worked in your DJ sets, posting set-lists, or reporting your plays to licensing organizations. Every time you start Mixxx, a new history section is created. If you don't play a track during the current session, it will be discarded." +#: ../../chapters/library.rst:749 +msgid "|ic_lib_history| The history section automatically keeps a list of tracks you play in your DJ sets. This is handy for remembering what worked in your DJ sets, posting set-lists, or reporting your plays to licensing organizations. Every time you start Mixxx, a new history section is created. If you don't play any tracks during the session, it will be discarded." msgstr "" -#: ../../source/chapters/library.rst:729 +#: ../../chapters/library.rst:755 msgid "|ic_lib_history_current| This icon indicates the current session." msgstr "" -#: ../../source/chapters/library.rst:731 -msgid "Click on the *History* icon in the sidebar to switch to the :guilabel:`History` view, then right-click on a sessions name to access the different features:" +#: ../../chapters/library.rst:759 +msgid ":guilabel:`Create new history playlist` context menu option." +msgstr "" + +#: ../../chapters/library.rst:760 +msgid ":guilabel:`Export playlist` context menu option remember the last selected playlist directory." msgstr "" -#: ../../source/chapters/library.rst:734 -msgid ":guilabel:`Create new history playlist` context menu option. :guilabel:`Export playlist` context menu option remember the last selected playlist directory." +#: ../../chapters/library.rst:763 +msgid "Click on the *History* icon in the sidebar to switch to the :guilabel:`History` view, then right-click on a session's name/date to access the different features:" msgstr "" -#: ../../source/chapters/library.rst:739 +#: ../../chapters/library.rst:766 msgid "**Add to Auto DJ**: Adds the content of the session to the :ref:`Auto DJ ` queue for automatic mixing." msgstr "" -#: ../../source/chapters/library.rst:741 -msgid "**Rename**: Rename a session, default is the calendar date (YYYY-MM-DD)." +#: ../../chapters/library.rst:768 +msgid "**Rename**: Rename a session. The default is the calendar date (YYYY-MM-DD)." msgstr "" -#: ../../source/chapters/library.rst:742 -msgid "**Remove**: Remove a previous session, but not the locked sessions or even the current session." +#: ../../chapters/library.rst:769 +msgid "**Remove**: Remove a previous (unlocked) session. (You cannot remove the current session.)" msgstr "" -#: ../../source/chapters/library.rst:744 -msgid "**Lock**: Protect a previous session against accidental merge and deletion. An icon indicates a locked session." +#: ../../chapters/library.rst:771 +msgid "**Lock**: Protect a previous session against accidental merge or deletion. An |ic_lib_locked| icon indicates a locked session." msgstr "" -#: ../../source/chapters/library.rst:746 -msgid "**Create new history playlist**: Split off the current history session, and add a new session without having to restart Mixxx. The current history must contain at least one track for this option to be available." +#: ../../chapters/library.rst:773 +msgid "**Create new history playlist**: Split off the current history session and add a new session without having to restart Mixxx. The current history must contain at least one track for this option to be available." msgstr "" -#: ../../source/chapters/library.rst:749 -msgid "**Join with previous**: Join the current history session with a previous one." +#: ../../chapters/library.rst:776 +msgid "**Join with previous**: Append the selected history session to the end of the previous one." msgstr "" -#: ../../source/chapters/library.rst:750 -msgid "**Export playlist**: Export a session in various file formats, ideal for processing the data in other applications." +#: ../../chapters/library.rst:778 +msgid "**Export playlist**: Export a session in various file formats. This allows you to use the data in other applications." msgstr "" -#: ../../source/chapters/library.rst:754 +#: ../../chapters/library.rst:785 msgid "Analyze - Prepare your tracks" msgstr "" -#: ../../source/chapters/library.rst:756 -msgid "This section allows you to analyze your tracks in advance of loading them into a deck. Analyzing tracks requires considerably CPU power and may cause skips in the audio while performing, so it helps to have your tracks analyzed before you play. See :ref:`library-analyze` for details." +#: ../../chapters/library.rst:787 +msgid "This section allows you to analyze your tracks in advance of loading them into a deck. Analyzing tracks requires considerable CPU power and may cause skips in the audio while performing, so it helps to have your tracks analyzed before you play. See :ref:`configuration-analyze` for details." msgstr "" -#: ../../source/chapters/library.rst:765 +#: ../../chapters/library.rst:796 msgid "iTunes, Traktor, Rhythmbox, Banshee - Using external libraries" msgstr "" -#: ../../source/chapters/library.rst:770 +#: ../../chapters/library.rst:801 msgid "Supported libraries:" msgstr "" -#: ../../source/chapters/library.rst:772 +#: ../../chapters/library.rst:803 msgid "|ic_lib_itunes| `iTunes `_ (Windows, Mac OS X)" msgstr "" -#: ../../source/chapters/library.rst:773 +#: ../../chapters/library.rst:804 msgid "|ic_lib_traktor| `Traktor `_ (Windows, Mac OS X)," msgstr "" -#: ../../source/chapters/library.rst:774 +#: ../../chapters/library.rst:805 msgid "|ic_lib_rhythmbox| `Rhythmbox `_ (GNU/Linux)" msgstr "" -#: ../../source/chapters/library.rst:775 +#: ../../chapters/library.rst:806 msgid "|ic_lib_banshee| `Banshee `_ (Windows, Mac OS X, GNU/Linux)" msgstr "" -#: ../../source/chapters/library.rst:777 +#: ../../chapters/library.rst:808 msgid "Support for Banshee music player" msgstr "" -#: ../../source/chapters/library.rst:780 -msgid "The external library views allow you to use the music libraries you have created in these third party applications. You can access music and playlists. If available, Mixxx automatically loads the external libraries from their default locations on your hard drive." +#: ../../chapters/library.rst:811 +msgid "The external library views allow you to use music libraries you have created in these third-party applications. You can access music as well as playlists. If available, Mixxx automatically loads the external libraries from their default locations on your hard drive." msgstr "" -#: ../../source/chapters/library.rst:785 +#: ../../chapters/library.rst:816 msgid "Playing a track from an external library will add it to your Mixxx library." msgstr "" -#: ../../source/chapters/library.rst:788 +#: ../../chapters/library.rst:819 msgid "Right-click on the iTunes icon in the Library tree and select :guilabel:`Choose Library` to load the :file:`iTunes Music Library.xml` from a different location. Select :guilabel:`Use Default Library` to reset." msgstr "" -#: ../../source/chapters/library.rst:792 -msgid "Right-click on a iTunes/Traktor/Rhythmbox/Banshee playlist and choose :guilabel:`Import Playlist` to import it to be a regular Mixxx playlist." +#: ../../chapters/library.rst:823 +msgid "Right-click on a iTunes/Traktor/Rhythmbox/Banshee playlist and choose :guilabel:`Import Playlist` to import it into a new Mixxx playlist." msgstr "" -#: ../../source/chapters/library.rst:794 -msgid "If you have an iTunes configuration file (:file:`\\*.xml`) from a Windows or Mac partition mounted in Linux, you can load it and use your iTunes tracks and playlists." +#: ../../chapters/library.rst:825 +msgid "If you have an iTunes configuration file (:file:`\\*.xml`) from a Windows or Mac partition mounted in Linux, you can load it and use your iTunes tracks and playlists as well." msgstr "" -#: ../../source/chapters/library.rst:798 -msgid "You can disable external libraries in :menuselection:`Preferences --> Library`." +#: ../../chapters/library.rst:829 +msgid "External libraries can be disabled under :menuselection:`Preferences --> Library`." msgstr "" diff --git a/source/locale/pot/chapters/livebroadcasting.pot b/source/locale/pot/chapters/livebroadcasting.pot index a85e1181e5..484000f968 100644 --- a/source/locale/pot/chapters/livebroadcasting.pot +++ b/source/locale/pot/chapters/livebroadcasting.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,361 +16,357 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/livebroadcasting.rst:4 +#: ../../chapters/livebroadcasting.rst:4 msgid "Live Broadcasting - Start your own Internet radio" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:9 +#: ../../chapters/livebroadcasting.rst:9 msgid "Live Broadcasting in Mixxx allow you to stream your mix over the Internet to listeners around the world." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:13 +#: ../../chapters/livebroadcasting.rst:13 msgid "Streaming Servers" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:40 +#: ../../chapters/livebroadcasting.rst:40 msgid "**Remote streaming server**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:16 -msgid "Mixxx allows you to feed your audio stream directly to :term:`Shoutcast ` and :term:`Icecast ` streaming servers. Depending on the number of listeners, streaming audio requires a significant amount of bandwidth. Streaming servers provide the required bandwidth and broadcast the stream to your listeners. A popular free streaming service is `Caster.fm `_. A review of several free and paid stream hosts is available at `broadcastingworld.net `_." +#: ../../chapters/livebroadcasting.rst:16 +msgid "Mixxx allows you to feed your audio stream directly to :term:`Shoutcast ` and :term:`Icecast ` streaming servers. Depending on the number of listeners, streaming audio requires a significant amount of bandwidth. Streaming servers provide the required bandwidth and broadcast the stream to your listeners. A popular free streaming service is `Caster.fm `_. A review of several free and paid stream hosts is available at `broadcastingworld.net `_." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:0 -msgid "Mixxx as client-side streaming source broadcasting to an remote streaming server" -msgstr "" - -#: ../../source/chapters/livebroadcasting.rst:71 +#: ../../chapters/livebroadcasting.rst:71 msgid "**Local streaming server**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:43 +#: ../../chapters/livebroadcasting.rst:43 msgid "For experienced users, it may be interesting to set up your own local streaming server. This turns your personal computer into a radio station and listeners connect directly to your server. Mixxx as a streaming source does not need to run on the same computer as your streaming server. However, professional stations often run the streaming source on the same computer as the streaming server for stability and reliability reasons. Keep in mind that if want to stream audio to a significant number of listeners, you'll need enough bandwidth. Read the `Shoutcast documentation `_ or `Icecast documentation `_ for server setup instructions." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:0 -msgid "Mixxx as client-side streaming source broadcasting to an local streaming server" -msgstr "" - -#: ../../source/chapters/livebroadcasting.rst:74 +#: ../../chapters/livebroadcasting.rst:74 msgid "Configuring Mixxx" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:76 +#: ../../chapters/livebroadcasting.rst:76 msgid "Start by supplying Mixxx with all information needed to establish a connection to the streaming server:" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:79 +#: ../../chapters/livebroadcasting.rst:79 msgid "Open :menuselection:`Preferences --> Live Broadcasting`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:80 +#: ../../chapters/livebroadcasting.rst:80 msgid "Insert the settings following the descriptions in the :ref:`live-broadcasting-preferences`" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:82 +#: ../../chapters/livebroadcasting.rst:82 msgid "Click :guilabel:`OK`" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:83 +#: ../../chapters/livebroadcasting.rst:83 msgid "Go to :menuselection:`Options --> Enable Live Broadcasting` or use the :ref:`appendix-shortcuts` to start broadcasting." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:89 +#: ../../chapters/livebroadcasting.rst:89 msgid "Live Broadcasting Preferences" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:98 +#: ../../chapters/livebroadcasting.rst:98 msgid "Mixxx preferences - Setting up live broadcasting" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:100 +#: ../../chapters/livebroadcasting.rst:100 msgid "**Server Connection**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:102 +#: ../../chapters/livebroadcasting.rst:102 msgid "**Type**: Select the type of streaming server you want to connect with. :term:`Shoutcast 1`, :term:`Icecast 1 `, and :term:`Icecast 2` servers are supported." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:105 +#: ../../chapters/livebroadcasting.rst:106 +msgid "Mixxx works with Shoutcast 2 using the Shoutcast 1 protocol if you provide a stream name in :menuselection:`Preferences --> Live Broadcasting --> Stream Settings`. If you don't provide a stream name, Shoutcast 2 rejects the connection (where Shoutcast 1 would accept this case)." +msgstr "" + +#: ../../chapters/livebroadcasting.rst:110 msgid "**Host**: You can enter the host as either a host name or an IP address." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:106 +#: ../../chapters/livebroadcasting.rst:111 msgid "**Login**: As provided by your streaming server provider. Without this, you will not connect successfully to the server. The default login for *Icecast* is ``source`` while the default login for Shoutcast is ``admin``." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:109 +#: ../../chapters/livebroadcasting.rst:114 msgid "**Mount**: A mount point is a unique name identifying a particular stream. For *Shoutcast* it is not necessary to specify a mount point. The setting must not be blank if you are using *Icecast*. Try the default ``/mount`` or ``/live``. If you haven't been given a specific mount point you can usually make one up. It always begins with a ``/`` (slash) followed by a text without any special characters in it." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:115 +#: ../../chapters/livebroadcasting.rst:120 msgid "**Port**: As provided by your streaming server provider. Most servers use the default port 8000." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:117 +#: ../../chapters/livebroadcasting.rst:122 msgid "**Password**: As provided by your streaming server provider, unless you run your own radio server. It is required to establish the connection to the server and to start the broadcast." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:121 +#: ../../chapters/livebroadcasting.rst:126 msgid "Do not enter a :term:`URL` as the host! ``http://example.com:8000`` does not work. Use ``example.com`` in the :guilabel:`Host` field and ``8000`` in the :guilabel:`Port` field instead." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:125 +#: ../../chapters/livebroadcasting.rst:130 msgid "**Stream Setting**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:127 +#: ../../chapters/livebroadcasting.rst:132 msgid ":guilabel:`Dynamically update Ogg Vorbis metadata` option" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:130 +#: ../../chapters/livebroadcasting.rst:135 msgid "**Public stream**: If enabled, this option adds your radio station to the Shoutcast/Icecast directory." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:132 +#: ../../chapters/livebroadcasting.rst:137 msgid "**Enable UTF-8 metadata**: If enabled, this option fixes broken accented and foreign language symbols in :term:`metadata`, assuming the streaming provider has configured the server to support UTF-8 metadata." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:135 -msgid "**Dynamically update Ogg Vorbis metadata**: Due to flaws in some streaming clients, updating Ogg Vorbis metadata dynamically can cause listener glitches and disconnections. Check this box to update the metadata anyway." +#: ../../chapters/livebroadcasting.rst:140 +msgid "**Dynamically update Ogg Vorbis metadata**: Due to flaws in some streaming clients, updating Ogg Vorbis metadata dynamically can cause listener glitches and disconnections. Check this box to update the metadata anyway. Some players that listeners can use have bugs that can cause audio glitches or disconnections when the Ogg Vorbis metadata is updated dynamically. If this is not a problem, you can enable this checkbox." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:138 +#: ../../chapters/livebroadcasting.rst:146 msgid "**Stream name**: So, what's the name of your show?" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:139 +#: ../../chapters/livebroadcasting.rst:147 msgid "**Website**: The website you would like your listeners to visit." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:140 +#: ../../chapters/livebroadcasting.rst:148 msgid "**Description**: Enter your DJ name and a short tagline." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:141 +#: ../../chapters/livebroadcasting.rst:149 msgid "**Genre**: List the main genres you play. This attracts search hits on stream directories. Genre must not be blank." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:144 +#: ../../chapters/livebroadcasting.rst:152 msgid "**Encoding**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:146 +#: ../../chapters/livebroadcasting.rst:154 msgid "**Bitrate**: Selecting a :term:`bitrate` of 128 or 160 :term:`kbps` is common and provides sufficient quality to your listeners. Higher bitrates will use a larger chunk in your Internet connection bandwidth to stream and for your listeners to receive the stream." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:150 +#: ../../chapters/livebroadcasting.rst:158 msgid "**Format**: Mixxx supports streaming to Icecast servers either in :term:`MP3` or :term:`Ogg Vorbis` format, streaming to Shoutcast servers is supported in :term:`MP3` format." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:154 +#: ../../chapters/livebroadcasting.rst:162 msgid "**Shoutcast metadata format**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:158 +#: ../../chapters/livebroadcasting.rst:166 msgid "This allows to set custom metatdata formats for the Shoutcast title field. Previously only ``artist - title`` was allowed. For example if you were broadcasting as part of a station, you could add the station's name or the presenter's name in the title: ``MyStation | $artist - $title``. Or if you were doing a live mix with several artists, you could have: ``Live mix by MyName - currently playing: $artist``. Or even if you wanted a very unusual format: ``Hey, I like $artist, here is $title by $artist``." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:166 +#: ../../chapters/livebroadcasting.rst:174 msgid "The changes **do not** affect the case for the combination of OGG/Icecast2." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:168 +#: ../../chapters/livebroadcasting.rst:176 msgid "**Custom metadata**" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:170 +#: ../../chapters/livebroadcasting.rst:178 msgid "By default, Mixxx broadcasts artist and title information of the files that you play to your listeners. You can disable this feature and use your own custom metadata." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:174 +#: ../../chapters/livebroadcasting.rst:182 msgid "**Enable custom metadata**: Toggles custom metadata on and off." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:175 +#: ../../chapters/livebroadcasting.rst:183 msgid "**Artist**: Insert your custom artist metadata here, your DJ name for example." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:176 +#: ../../chapters/livebroadcasting.rst:184 msgid "**Title**: Insert your custom title metadata here." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:178 +#: ../../chapters/livebroadcasting.rst:186 msgid "Due to licensing restrictions, MP3 streaming is not enabled by default. For information on how to enable MP3 streaming, go to the chapter :ref:`MP3 streaming`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:183 +#: ../../chapters/livebroadcasting.rst:191 msgid "Icecast vs. Shoutcast" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:185 +#: ../../chapters/livebroadcasting.rst:193 msgid "Both essentially serve the same purpose. An Icecast server can stream either :term:`MP3` or :term:`Ogg Vorbis`. However, although Ogg is more efficient and effective (you get higher-fidelity sound than MP3 at lower data rates) not all players can play Ogg streams. As a result MP3 is probably a safe choice unless you know your listeners can hear an Ogg stream successfully." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:192 +#: ../../chapters/livebroadcasting.rst:200 msgid "Broadcast directories" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:194 +#: ../../chapters/livebroadcasting.rst:202 msgid "Generally your streaming server host adds your radio station to the Shoutcast/Icecast directory, if you enable the :guilabel:`Public Stream` option in :menuselection:`Preferences --> Live Broadcasting --> Stream Settings`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:198 +#: ../../chapters/livebroadcasting.rst:206 msgid "**Shoutcast radio directory**: `www.shoutcast.com `_" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:199 +#: ../../chapters/livebroadcasting.rst:207 msgid "**Icecast radio directory**: `dir.xiph.org `_" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:201 +#: ../../chapters/livebroadcasting.rst:209 msgid "Often streaming hosts will run their own directories. Check your host's FAQ to find out. If you want to promote your streaming radio station even more, register at services like `streamfinder.com `_. An overview of different internet radio directories is available at `shoutcheap.com `_" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:208 +#: ../../chapters/livebroadcasting.rst:216 msgid "Troubleshooting" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:210 +#: ../../chapters/livebroadcasting.rst:218 msgid "If you have trouble connecting to your streaming server, check the configuration in the :ref:`live-broadcasting-preferences`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:212 +#: ../../chapters/livebroadcasting.rst:220 msgid "You may need the :term:`LAME` libraries to stream in MP3. See :ref:`MP3 Streaming`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:214 +#: ../../chapters/livebroadcasting.rst:222 msgid "You may have selected the :term:`Ogg Vorbis` format that is unsupported by Shoutcast servers." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:216 +#: ../../chapters/livebroadcasting.rst:224 msgid "You may need to check your firewall settings. Both Icecast and Shoutcast use two ports. If you are streaming on a port (for example, port 8000) then you need to open up the next port (port 8001) as well." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:219 +#: ../../chapters/livebroadcasting.rst:227 msgid "You may need to configure port forwarding if you are behind a router or your router will block requests to your streaming port (for example, port 8000)" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:225 +#: ../../chapters/livebroadcasting.rst:233 msgid "Activate MP3 streaming support" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:227 +#: ../../chapters/livebroadcasting.rst:235 msgid "Due to licensing restrictions, :term:`MP3` streaming is not enabled by default. In order to enable MP3 streaming you must install the :term:`LAME` MP3 :term:`codec` yourself. The following section explains how you can do that." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:231 +#: ../../chapters/livebroadcasting.rst:239 msgid "If you have activated MP3 streaming support, you'll be also able to record your mixes in MP3 format. Go to the chapter :ref:`djing-recording-your-mix` for more information." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:236 +#: ../../chapters/livebroadcasting.rst:244 msgid "Activate MP3 streaming support on Windows" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:243 +#: ../../chapters/livebroadcasting.rst:251 msgid "To activate MP3 streaming on Windows, follow these steps:" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:245 +#: ../../chapters/livebroadcasting.rst:253 msgid "Download LAME 3.98.4 :term:`binaries` from http://www.rarewares.org/mp3-lame-libraries.php." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:248 +#: ../../chapters/livebroadcasting.rst:256 msgid "The download page includes 32-bit and 64-bit versions. Make sure the version you download matches the version of Mixxx that you use, not the version of Windows. If you are on 64bit Windows but are using 32bit Mixxx, you need the 32bit (“x86”) version of the LAME binaries." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:254 +#: ../../chapters/livebroadcasting.rst:262 msgid "Unpack the downloaded archive. You need a utility for manipulating archives like the free `7zip `_." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:256 +#: ../../chapters/livebroadcasting.rst:264 msgid "Copy :file:`libmp3lame.dll` to the location you have installed Mixxx, probably :file:`C:\\\\Program Files\\\\Mixxx\\\\`." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:258 +#: ../../chapters/livebroadcasting.rst:266 msgid "**Only** if you are running Mixxx 1.11 or earlier, you **must** also rename :file:`libmp3lame.dll` to :file:`lame_enc.dll` in the folder where you have installed Mixxx. Select :menuselection:`Help --> About` to find out your version of Mixxx." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:263 -#: ../../source/chapters/livebroadcasting.rst:294 -#: ../../source/chapters/livebroadcasting.rst:311 -#: ../../source/chapters/livebroadcasting.rst:319 -#: ../../source/chapters/livebroadcasting.rst:332 +#: ../../chapters/livebroadcasting.rst:271 +#: ../../chapters/livebroadcasting.rst:302 +#: ../../chapters/livebroadcasting.rst:319 +#: ../../chapters/livebroadcasting.rst:327 +#: ../../chapters/livebroadcasting.rst:340 msgid "Restart Mixxx" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:266 +#: ../../chapters/livebroadcasting.rst:274 msgid "Windows Troubleshooting" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:268 +#: ../../chapters/livebroadcasting.rst:276 msgid "Double check that the version of LAME you use (“x86” = 32-bit vs. “x64” = 64-bit) matches the version of Mixxx you use." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:270 +#: ../../chapters/livebroadcasting.rst:278 msgid "If you are running Mixxx 1.11 or earlier, did you rename the :file:`libmp3lame.dll` to :file:`lame_enc.dll`?" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:272 +#: ../../chapters/livebroadcasting.rst:280 msgid "Make sure you put the correct LAME :file:`*.dll` file in the same folder that contains the installation of Mixxx you are using." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:275 +#: ../../chapters/livebroadcasting.rst:283 msgid "Some websites like `Audacity `_ provide lame :term:`binaries` too. Do not use these versions or Mixxx will show an error when activating live broadcasting and your stream will fail." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:281 +#: ../../chapters/livebroadcasting.rst:289 msgid "Activate MP3 streaming support on Mac OS X" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:284 +#: ../../chapters/livebroadcasting.rst:292 msgid "Method A: Download" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:285 +#: ../../chapters/livebroadcasting.rst:293 msgid "To activate MP3 streaming on Mac OS X, follow these steps:" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:287 -msgid "Download `LAME 3.98.4 `_ Intel (Mac OS X 10.5+ 32-bit & 64-bit)" +#: ../../chapters/livebroadcasting.rst:295 +msgid "Download `LAME 3.98.4 `_ Intel (Mac OS X 10.8+ 64-bit)" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:290 +#: ../../chapters/livebroadcasting.rst:298 msgid "Double-click on the downloaded zip file to unpack the file and you'll get an installer package file" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:292 +#: ../../chapters/livebroadcasting.rst:300 msgid "Double-click on the installer package file and follow the step-by-step instructions in the installer" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:297 +#: ../../chapters/livebroadcasting.rst:305 msgid "Method B: Package manager" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:298 +#: ../../chapters/livebroadcasting.rst:306 msgid "Another easy way to activate MP3 streaming is to use `Homebrew `_ or `MacPorts `_, which are package managers like `apt `_ on Debian/Ubuntu Linux. They provide a convenient way to install many Open Source packages. Once Homebrew or Macports is installed, adding MP3 support to Mixxx is rather simple." msgstr "" -#: ../../source/chapters/livebroadcasting.rst:305 +#: ../../chapters/livebroadcasting.rst:313 msgid "**Homebrew**:" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:307 -#: ../../source/chapters/livebroadcasting.rst:315 -#: ../../source/chapters/livebroadcasting.rst:328 +#: ../../chapters/livebroadcasting.rst:315 +#: ../../chapters/livebroadcasting.rst:323 +#: ../../chapters/livebroadcasting.rst:336 msgid "Open a terminal and type the following commands::" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:313 +#: ../../chapters/livebroadcasting.rst:321 msgid "**Macports**:" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:322 +#: ../../chapters/livebroadcasting.rst:330 msgid "Activate MP3 streaming support on Linux" msgstr "" -#: ../../source/chapters/livebroadcasting.rst:324 +#: ../../chapters/livebroadcasting.rst:332 msgid "On Ubuntu and GNU/Linux-based operating systems MP3 streams can be activated by installing the package :file:`libmp3lame`. Dependent on your Linux distribution the package might be slightly named different such as :file:`lame`." msgstr "" diff --git a/source/locale/pot/chapters/quickstart.pot b/source/locale/pot/chapters/quickstart.pot index d9aee747c0..ab2585d725 100644 --- a/source/locale/pot/chapters/quickstart.pot +++ b/source/locale/pot/chapters/quickstart.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,63 +16,55 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/quickstart.rst:2 +#: ../../chapters/quickstart.rst:2 msgid "Quickstart" msgstr "" -#: ../../source/chapters/quickstart.rst:4 +#: ../../chapters/quickstart.rst:4 msgid "If you're new to DJing, this is the section for you. We've got some tutorials for you that cover the basics of DJing with Mixxx. If you already you already know how to DJ and are just looking for an overview of how to get your groove on with Mixxx, you can skip to the `Table of Contents`_." msgstr "" -#: ../../source/chapters/quickstart.rst:10 +#: ../../chapters/quickstart.rst:10 msgid "Example of a note" msgstr "" -#: ../../source/chapters/quickstart.rst:12 +#: ../../chapters/quickstart.rst:12 msgid "Example of a warning" msgstr "" -#: ../../source/chapters/quickstart.rst:0 -msgid "Todo" -msgstr "" - -#: ../../source/chapters/quickstart.rst:14 -msgid "Example of a todo" -msgstr "" - -#: ../../source/chapters/quickstart.rst:17 +#: ../../chapters/quickstart.rst:17 msgid "Loading a Track" msgstr "" -#: ../../source/chapters/quickstart.rst:19 +#: ../../chapters/quickstart.rst:19 msgid "Lesson about how to load a track." msgstr "" -#: ../../source/chapters/quickstart.rst:23 +#: ../../chapters/quickstart.rst:23 msgid "Using the Mixer Section" msgstr "" -#: ../../source/chapters/quickstart.rst:25 +#: ../../chapters/quickstart.rst:25 msgid "Lesson about how to use the mixer." msgstr "" -#: ../../source/chapters/quickstart.rst:28 +#: ../../chapters/quickstart.rst:28 msgid "The Beatmatching Basics" msgstr "" -#: ../../source/chapters/quickstart.rst:30 +#: ../../chapters/quickstart.rst:30 msgid "Lesson about how to beatmatch." msgstr "" -#: ../../source/chapters/quickstart.rst:34 +#: ../../chapters/quickstart.rst:34 msgid "Getting Funky with Effects" msgstr "" -#: ../../source/chapters/quickstart.rst:36 +#: ../../chapters/quickstart.rst:36 msgid "Effects overview tutorial." msgstr "" -#: ../../source/chapters/quickstart.rst:40 +#: ../../chapters/quickstart.rst:40 msgid "Mixxxing it Up with Hotcues and Loops" msgstr "" diff --git a/source/locale/pot/chapters/setup.pot b/source/locale/pot/chapters/setup.pot index c00f4d9ea5..04f7b29bc7 100644 --- a/source/locale/pot/chapters/setup.pot +++ b/source/locale/pot/chapters/setup.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,249 +16,249 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/setup.rst:2 +#: ../../chapters/setup.rst:2 msgid "Hardware Setup" msgstr "" -#: ../../source/chapters/setup.rst:9 +#: ../../chapters/setup.rst:9 msgid "This chapter describes the most common hardware setups to serve as examples. We will go over the setup of soundcards, controllers, and timecode records/CDs." msgstr "" -#: ../../source/chapters/setup.rst:12 +#: ../../chapters/setup.rst:12 msgid "Headphone cueing, or just cueing, is a crucial aspect of DJing that separates DJing from merely making a playlist. Headphone cueing allows you to preview the next track you would like to mix in your headphones. The audience will not hear what you are cueing in your headphones until you decide to mix it in." msgstr "" -#: ../../source/chapters/setup.rst:17 +#: ../../chapters/setup.rst:17 msgid "In order to use headphone cueing, you will need at least 2 separate audio outputs, typically provided by a USB soundcard (also known as an “audio interface”). The headphone jack on most laptops is not a second audio output. Rather, plugging headphones into the jack simply redirects the laptop's single stereo output from its speakers to your headphones. A splitter cable can be used to separate the stereo output of a headphone jack into two separate mono outputs for headphone cueing, but it is recommended to use a sound card with at least four mono outputs (for two stereo pairs). Such sound cards tend to be higher quality than those built into laptops and allow your mix to be enjoyed in stereo by your audience." msgstr "" -#: ../../source/chapters/setup.rst:28 +#: ../../chapters/setup.rst:28 msgid "Unlike some proprietary DJ systems, Mixxx can use any soundcard and any :term:`MIDI` or :term:`HID` controller that your :term:`OS ` has drivers to use. Mixxx can use multiple audio devices simultaneously. Depending on your budget and application area, your sound setup and requirements may vary. This section provides useful information for club, hobby, and radio DJs alike." msgstr "" -#: ../../source/chapters/setup.rst:35 +#: ../../chapters/setup.rst:35 msgid "The `Mixxx DJ Hardware Guide `_ lists controllers and sound cards with information about their compatibility with Mixxx and different :term:`operating systems`. It also has suggestions for what to consider when you are shopping for DJ equipment." msgstr "" -#: ../../source/chapters/setup.rst:46 +#: ../../chapters/setup.rst:45 msgid "Laptop Only" msgstr "" -#: ../../source/chapters/setup.rst:55 +#: ../../chapters/setup.rst:54 msgid "Using Mixxx with your built-in sound card" msgstr "" -#: ../../source/chapters/setup.rst:57 +#: ../../chapters/setup.rst:56 msgid "There is no need to buy any equipment other than a computer if you do not require headphone :term:`cueing`. The built-in soundcard on most computers and laptops comes with a single stereo line-out and a microphone input." msgstr "" -#: ../../source/chapters/setup.rst:61 +#: ../../chapters/setup.rst:60 msgid "The figure above depicts how the sound configuration might look. The stereo output of your soundcard (channels 1-2) will be connected to the **Master out**." msgstr "" -#: ../../source/chapters/setup.rst:65 -#: ../../source/chapters/setup.rst:108 -#: ../../source/chapters/setup.rst:161 -#: ../../source/chapters/setup.rst:171 -#: ../../source/chapters/setup.rst:225 -#: ../../source/chapters/setup.rst:250 +#: ../../chapters/setup.rst:64 +#: ../../chapters/setup.rst:108 +#: ../../chapters/setup.rst:160 +#: ../../chapters/setup.rst:170 +#: ../../chapters/setup.rst:224 +#: ../../chapters/setup.rst:249 msgid "Open :menuselection:`Preferences --> Sound Hardware`" msgstr "" -#: ../../source/chapters/setup.rst:66 -#: ../../source/chapters/setup.rst:109 -#: ../../source/chapters/setup.rst:162 -#: ../../source/chapters/setup.rst:172 -#: ../../source/chapters/setup.rst:226 -#: ../../source/chapters/setup.rst:251 +#: ../../chapters/setup.rst:65 +#: ../../chapters/setup.rst:109 +#: ../../chapters/setup.rst:161 +#: ../../chapters/setup.rst:171 +#: ../../chapters/setup.rst:225 +#: ../../chapters/setup.rst:250 msgid "Select the :guilabel:`Output` tab" msgstr "" -#: ../../source/chapters/setup.rst:67 +#: ../../chapters/setup.rst:66 msgid "From the :guilabel:`Master` drop-down menu, select your built-in soundcard, then :guilabel:`Channels 1-2`" msgstr "" -#: ../../source/chapters/setup.rst:69 +#: ../../chapters/setup.rst:68 msgid "Depending on your soundcard, you can specify a :ref:`microphone `" msgstr "" -#: ../../source/chapters/setup.rst:72 +#: ../../chapters/setup.rst:71 msgid "Use your built-in microphone or connect a microphone to your computer" msgstr "" -#: ../../source/chapters/setup.rst:73 +#: ../../chapters/setup.rst:72 msgid "Check that your microphone is detected by your :term:`OS `" msgstr "" -#: ../../source/chapters/setup.rst:74 +#: ../../chapters/setup.rst:73 msgid "Open the :guilabel:`Input` tab" msgstr "" -#: ../../source/chapters/setup.rst:75 +#: ../../chapters/setup.rst:74 msgid "From the :guilabel:`Microphone` drop-down menu, select the input your microphone is connected to" msgstr "" -#: ../../source/chapters/setup.rst:77 -#: ../../source/chapters/setup.rst:117 -#: ../../source/chapters/setup.rst:167 -#: ../../source/chapters/setup.rst:177 -#: ../../source/chapters/setup.rst:231 -#: ../../source/chapters/setup.rst:256 +#: ../../chapters/setup.rst:76 +#: ../../chapters/setup.rst:117 +#: ../../chapters/setup.rst:166 +#: ../../chapters/setup.rst:176 +#: ../../chapters/setup.rst:230 +#: ../../chapters/setup.rst:255 msgid "Click :guilabel:`Apply` to save the changes." msgstr "" -#: ../../source/chapters/setup.rst:79 +#: ../../chapters/setup.rst:78 msgid "This minimal configuration may be suitable for **radio DJs** who do not need headphone cueing." msgstr "" -#: ../../source/chapters/setup.rst:85 +#: ../../chapters/setup.rst:84 msgid "Laptop and Splitter Cable" msgstr "" -#: ../../source/chapters/setup.rst:95 -msgid "The cheapest way to DJ and :term:`cue` with headphones uses a stereo-to-mono DJ splitter cable (also known as a “Y cable”) plugged into the headphone jack of a laptop or other computer. This cable divides the stereo output from a single jack into two separate mono singals." +#: ../../chapters/setup.rst:95 +msgid "The cheapest way to DJ and :term:`cue` with headphones uses a stereo-to-mono DJ splitter cable (also known as a “Y cable”) plugged into the headphone jack of a laptop or other computer. This cable divides the stereo output from a single jack into two separate mono signals." msgstr "" -#: ../../source/chapters/setup.rst:100 +#: ../../chapters/setup.rst:100 msgid "This setup allows you to start DJing without having to invest in expensive equipment. However, your audience will not be able to enjoy music producers' artistic use of stereophonic sound (although many club PA systems are wired in mono anyway). Furthermore, soundcards built into computers are usually low quality." msgstr "" -#: ../../source/chapters/setup.rst:106 +#: ../../chapters/setup.rst:106 msgid "**Using a built-in soundcard and a stereo-to-mono splitter**" msgstr "" -#: ../../source/chapters/setup.rst:110 +#: ../../chapters/setup.rst:110 msgid "Check that your headphones are plugged into the side of the cable with a headphones symbol and that the speakers are plugged into the side of the cable with a speaker symbol." msgstr "" -#: ../../source/chapters/setup.rst:113 +#: ../../chapters/setup.rst:113 msgid "From the :guilabel:`Master` drop-down menu, select your built-in soundcard, then :guilabel:`Channel 1`" msgstr "" -#: ../../source/chapters/setup.rst:115 +#: ../../chapters/setup.rst:115 msgid "From the :guilabel:`Headphones` drop-down menu, select your built-in soundcard, then :guilabel:`Channel 2`" msgstr "" -#: ../../source/chapters/setup.rst:119 +#: ../../chapters/setup.rst:119 msgid "See `the wiki `_ for a list of DJ splitter cables." msgstr "" -#: ../../source/chapters/setup.rst:123 +#: ../../chapters/setup.rst:122 msgid "Most splitter cables, particularly those marketed as headphone splitter cables, output the same stereo signal to two headphone jacks and will not work for this DJ setup. Also, if you use a generic stereo-to-mono splitter adapter, you may only be able to hear out of one side of your speakers and headphones. DJ splitter cables allow you to hear the same mono signal on both sides of your headphones and speakers." msgstr "" -#: ../../source/chapters/setup.rst:134 +#: ../../chapters/setup.rst:133 msgid "Laptop and External USB Soundcard" msgstr "" -#: ../../source/chapters/setup.rst:143 +#: ../../chapters/setup.rst:142 msgid "Using Mixxx together with an external soundcard" msgstr "" -#: ../../source/chapters/setup.rst:145 -msgid "The most common setup for DJing is a laptop and a soundcard with 2 stereo outputs (4 channels). The first stereo output (channels 1-2) is used as the master output and supplies the main mix to the audience. With the second stereo output (channels 3-4) you can :term:`cue ` and :ref:`preview ` the next track in your headphones. If your soundcard only has one stereo output, you can use multiple soundcards to achieve a similar setup. Most DJ controllers above the most basic models include a soundcard with 2 stereo outputs (see :ref:`setup-controller-and-external-card` for details)." +#: ../../chapters/setup.rst:144 +msgid "The most common setup for DJing is a laptop and a soundcard with 2 stereo outputs (4 channels). The first stereo output (channels 1-2) is used as the master output and supplies the main mix to the audience. With the second stereo output (channels 3-4) you can :term:`cue ` and :ref:`preview ` the next track in your headphones. If your soundcard only has one stereo output, you can use multiple soundcards to achieve a similar setup. Most DJ controllers above the most basic models include a soundcard with 2 stereo outputs (see :ref:`setup-controller-and-external-card` for details)." msgstr "" -#: ../../source/chapters/setup.rst:155 +#: ../../chapters/setup.rst:154 msgid "The configuration depicted above uses two soundcards. This setup is the bare minimum for serious DJing. Without any extra gear, the DJ can control Mixxx via mouse and keyboard. For more information see :ref:`controlling mixxx`." msgstr "" -#: ../../source/chapters/setup.rst:159 +#: ../../chapters/setup.rst:158 msgid "**Using two soundcards (built-in + external)**" msgstr "" -#: ../../source/chapters/setup.rst:163 -#: ../../source/chapters/setup.rst:173 -#: ../../source/chapters/setup.rst:252 +#: ../../chapters/setup.rst:162 +#: ../../chapters/setup.rst:172 +#: ../../chapters/setup.rst:251 msgid "From the :guilabel:`Master` drop-down menu, select the external soundcard, then :guilabel:`Channels 1-2`" msgstr "" -#: ../../source/chapters/setup.rst:165 -#: ../../source/chapters/setup.rst:254 +#: ../../chapters/setup.rst:164 +#: ../../chapters/setup.rst:253 msgid "From the :guilabel:`Headphones` drop-down menu, select the built-in soundcard, then :guilabel:`Channels 1-2`" msgstr "" -#: ../../source/chapters/setup.rst:169 +#: ../../chapters/setup.rst:168 msgid "**Using an external multi-channel soundcard**" msgstr "" -#: ../../source/chapters/setup.rst:175 +#: ../../chapters/setup.rst:174 msgid "From the :guilabel:`Headphones` drop-down menu, select the external soundcard, then :guilabel:`Channels 3-4`" msgstr "" -#: ../../source/chapters/setup.rst:179 +#: ../../chapters/setup.rst:178 msgid "If you have technical difficulties with your external sound card, a :ref:`splitter cable` can be used as a portable, inexpensive backup." msgstr "" -#: ../../source/chapters/setup.rst:183 +#: ../../chapters/setup.rst:182 msgid "Soundcards designed and marketed for recording often have a knob that allows you to mix its input directly with its output. This function can be helpful when recording (to hear the input without the latency of going through the computer), but the master output level will be low even if there is no sound on the inputs. To get the maximum output level from these soundcards, you may need to set this knob to only send output from the computer and none from the input(s)." msgstr "" -#: ../../source/chapters/setup.rst:194 +#: ../../chapters/setup.rst:193 msgid "Laptop and MIDI or HID Controller" msgstr "" -#: ../../source/chapters/setup.rst:196 +#: ../../chapters/setup.rst:195 msgid "Most DJs prefer the tactile and intuitive control provided by DJ MIDI or HID controllers over only a keyboard and mouse. Mixxx can work with any :term:`MIDI` or :term:`HID` :term:`controller` as long as there is a mapping file to tell Mixxx how to understand the controller's signals. Mixxx comes bundled with a number of MIDI and HID mapping presets, which are listed in the `Mixxx DJ Hardware Guide `_ on the wiki. For controllers that Mixxx does not yet support, you can `search the forum `_ to see if anyone has started a mapping. You can also start one yourself using the information in the `Controller Mapping Documentation `_ on the wiki." msgstr "" -#: ../../source/chapters/setup.rst:209 +#: ../../chapters/setup.rst:208 msgid "Controllers with an integrated soundcard" msgstr "" -#: ../../source/chapters/setup.rst:211 +#: ../../chapters/setup.rst:210 msgid "Many DJ controllers include an integrated *multi-channel* soundcard. A setup with this kind of controller may look like the diagram below:" msgstr "" -#: ../../source/chapters/setup.rst:221 +#: ../../chapters/setup.rst:220 msgid "Using Mixxx together with a DJ controller and integrated soundcard" msgstr "" -#: ../../source/chapters/setup.rst:223 +#: ../../chapters/setup.rst:222 msgid "**Using a controller with an integrated multi-channel soundcard**" msgstr "" -#: ../../source/chapters/setup.rst:227 +#: ../../chapters/setup.rst:226 msgid "From the :guilabel:`Master` drop-down menu, select your controller's soundcard, then :guilabel:`Channels 1-2`" msgstr "" -#: ../../source/chapters/setup.rst:229 +#: ../../chapters/setup.rst:228 msgid "From the :guilabel:`Headphones` drop-down menu, select your controller's soundcard, then :guilabel:`Channels 3-4`" msgstr "" -#: ../../source/chapters/setup.rst:234 +#: ../../chapters/setup.rst:233 msgid "Controllers without an integrated sound card" msgstr "" -#: ../../source/chapters/setup.rst:236 +#: ../../chapters/setup.rst:235 msgid "Controllers without an integrated soundcard can be used together with a USB soundcard as depicted in the diagram below:" msgstr "" -#: ../../source/chapters/setup.rst:246 +#: ../../chapters/setup.rst:245 msgid "Using Mixxx together with a DJ controller and external soundcard" msgstr "" -#: ../../source/chapters/setup.rst:248 +#: ../../chapters/setup.rst:247 msgid "**Using a controller without an integrated soundcard**" msgstr "" -#: ../../source/chapters/setup.rst:258 +#: ../../chapters/setup.rst:257 msgid "You can connect as many controllers as you have ports on your computer. Just follow the steps in :ref:`control-midi` for each controller you want to use." msgstr "" -#: ../../source/chapters/setup.rst:269 +#: ../../chapters/setup.rst:268 msgid "Laptop, External Hardware Mixer and Vinyl Control" msgstr "" -#: ../../source/chapters/setup.rst:278 +#: ../../chapters/setup.rst:277 msgid "Using Mixxx together with turntables and external mixer" msgstr "" -#: ../../source/chapters/setup.rst:280 +#: ../../chapters/setup.rst:279 msgid "This setup allows DJs to use the techniques of DJing with vinyl record turntables combined with the portability and flexibility of a laptop computer. Instead of carrying crates of records or CDs, DJs can carry their entire music collection on their laptop. In addition to a laptop and headphones, this setup requires a soundcard with at least two pairs of stereo inputs and outputs as well as a pair of :term:`timecode` records." msgstr "" -#: ../../source/chapters/setup.rst:287 +#: ../../chapters/setup.rst:286 msgid "Go to the chapter :ref:`vinyl-control` for detailed information." msgstr "" diff --git a/source/locale/pot/chapters/user_interface.pot b/source/locale/pot/chapters/user_interface.pot index 510ce177cd..2d31dc2c38 100644 --- a/source/locale/pot/chapters/user_interface.pot +++ b/source/locale/pot/chapters/user_interface.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,1223 +16,1266 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/user_interface.rst:4 +#: ../../chapters/user_interface.rst:4 msgid "An Overview of the Mixxx Interface" msgstr "" -#: ../../source/chapters/user_interface.rst:6 +#: ../../chapters/user_interface.rst:6 msgid "Welcome to the Mixxx interface. This is where the magic happens. You are going to want to get very familiar with this interface because it is the main way to use Mixxx. In this chapter, we present the default interface of Mixxx and describe its elements, knobs and faders." msgstr "" -#: ../../source/chapters/user_interface.rst:18 -msgid "The Mixxx interface - Deere skin" +#: ../../chapters/user_interface.rst:18 +msgid "The Mixxx interface - Latenight skin" msgstr "" -#: ../../source/chapters/user_interface.rst:20 -msgid "This is the Deere skin. It is the default skin supplied with Mixxx. There are a variety of others skins included with Mixxx. You should explore them all to figure out which one you prefer. This section will focus on Deere only." +#: ../../chapters/user_interface.rst:20 +msgid "This is the Latenight skin. It is the default skin supplied with Mixxx. There are a variety of others skins included with Mixxx. You should explore them all to figure out which one you prefer. This section will focus on Latenight only." msgstr "" -#: ../../source/chapters/user_interface.rst:27 +#: ../../chapters/user_interface.rst:27 msgid "The Deck Sections" msgstr "" -#: ../../source/chapters/user_interface.rst:40 +#: ../../chapters/user_interface.rst:40 msgid "A deck with a track loaded" msgstr "" -#: ../../source/chapters/user_interface.rst:42 +#: ../../chapters/user_interface.rst:42 msgid "The deck section allows you to control everything relating to a virtual turntable :term:`deck`. We are going to break this down into sections." msgstr "" -#: ../../source/chapters/user_interface.rst:48 -#: ../../source/chapters/user_interface.rst:950 +#: ../../chapters/user_interface.rst:48 +#: ../../chapters/user_interface.rst:997 msgid "Track Information Display" msgstr "" -#: ../../source/chapters/user_interface.rst:57 +#: ../../chapters/user_interface.rst:57 msgid "The track information section of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:59 +#: ../../chapters/user_interface.rst:59 msgid "Parse the title and the artist from the file name when the corresponding :term:`metadata` is missing." msgstr "" -#: ../../source/chapters/user_interface.rst:67 +#: ../../chapters/user_interface.rst:67 msgid "**Track Title**" msgstr "" -#: ../../source/chapters/user_interface.rst:64 +#: ../../chapters/user_interface.rst:64 msgid "The title of the track that was loaded into a deck is displayed on top. This is the same as the title listed under the :guilabel:`Title` column heading in the Mixxx library. This information is initially loaded from the track's :term:`metadata`." msgstr "" -#: ../../source/chapters/user_interface.rst:71 +#: ../../chapters/user_interface.rst:71 msgid "**Track Artist**" msgstr "" -#: ../../source/chapters/user_interface.rst:70 +#: ../../chapters/user_interface.rst:70 msgid "The artist of the track is listed below. It is the same as listed under the :guilabel:`Artist` column heading in the Mixxx library." msgstr "" -#: ../../source/chapters/user_interface.rst:81 -#: ../../source/chapters/user_interface.rst:958 +#: ../../chapters/user_interface.rst:81 +#: ../../chapters/user_interface.rst:1005 msgid "**BPM (Tempo)**" msgstr "" -#: ../../source/chapters/user_interface.rst:74 +#: ../../chapters/user_interface.rst:74 msgid "The number at the top right is the effective :term:`BPM` of the track. This is the detected :term:`BPM` of the track, adjusted for the playback rate of the track. For example, if the track is normally 100 BPM, and it is playing at +5%, then the effective BPM will read 105 BPM." msgstr "" -#: ../../source/chapters/user_interface.rst:79 -msgid "Click directly on the BPM display and tap with the beat to set the BPM to the speed you are tapping. You can also use a keyboard shortcut, go to :ref:`control-keyboard` for more information." +#: ../../chapters/user_interface.rst:79 +msgid "You can use a keyboard shortcut and tap with the beat to set the BPM to the speed you are tapping, go to :ref:`control-keyboard` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:89 +#: ../../chapters/user_interface.rst:88 msgid "**Time Elapsed/Remaining**" msgstr "" -#: ../../source/chapters/user_interface.rst:84 +#: ../../chapters/user_interface.rst:84 msgid "By default it displays the total elapsed time in the track up to the millisecond. Clicking on the display switches to the *Time Remaining* view, which indicates how much time is left before the track reaches the end. You can change the default in :menuselection:`Preferences --> Interface --> Position Display`." msgstr "" -#: ../../source/chapters/user_interface.rst:94 +#: ../../chapters/user_interface.rst:93 msgid "Waveform Displays" msgstr "" -#: ../../source/chapters/user_interface.rst:107 +#: ../../chapters/user_interface.rst:106 msgid "The waveform summary and waveform overview of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:109 +#: ../../chapters/user_interface.rst:108 msgid "The waveform section of a deck allows you to visualize the audio changes that occur throughout the track, you can basically “see” your music." msgstr "" -#: ../../source/chapters/user_interface.rst:112 -msgid "Depending on the skin Mixxx displays either parallel waveforms (default) or separate waveforms. Select your preferred appearance in :menuselection:`Preferences --> Interface --> Skin`." +#: ../../chapters/user_interface.rst:111 +msgid "By default the waveform displays are aligned parallel to each other in order to make :term:`beatmatching` easier, as it is possible to beatmatch visually by aligning the beats that appear in each waveform." msgstr "" -#: ../../source/chapters/user_interface.rst:123 -msgid "Mixxx default skin (Deere) - Separate waveforms" +#: ../../chapters/user_interface.rst:122 +msgid "Mixxx default skin (Latenight) - Parallel waveforms" msgstr "" -#: ../../source/chapters/user_interface.rst:125 -msgid "With some skins the waveform displays are aligned parallel to each other in order to make :term:`beatmatching` easier, as it is possible to beatmatch visually by aligning the beats that appear in each waveform." +#: ../../chapters/user_interface.rst:124 +msgid "Depending on the skin Mixxx displays either parallel waveforms (default) or separate waveforms. Select your preferred appearance in :menuselection:`Preferences --> Interface --> Skin`." msgstr "" -#: ../../source/chapters/user_interface.rst:136 -msgid "Mixxx alternative skin (Latenight) - Parallel waveforms" +#: ../../chapters/user_interface.rst:135 +msgid "Mixxx alternative skin (Deere) - Separate waveforms" msgstr "" -#: ../../source/chapters/user_interface.rst:138 -msgid "If you have a slower computer and notice performance issues with Mixxx, try to lower the frame rate or change the level of detail shown in the waveform in :menuselection:`Preferences --> Interface --> Waveform Display`." +#: ../../chapters/user_interface.rst:137 +msgid "If you have a slower computer and notice performance issues with Mixxx, try to lower the frame rate or change the waveform type in :menuselection:`Preferences --> Waveforms`." msgstr "" -#: ../../source/chapters/user_interface.rst:153 +#: ../../chapters/user_interface.rst:151 msgid "**Waveform summary**" msgstr "" -#: ../../source/chapters/user_interface.rst:144 +#: ../../chapters/user_interface.rst:142 msgid "The big waveform summary shows the waveform envelope of the track near the current playback position and is updated in real time. The mouse can be used on the waveform to pause, scratch, spin-back or throw the tracks. Right-clicking on the waveforms allows you to drag with the mouse to make temporary pitch adjustments." msgstr "" -#: ../../source/chapters/user_interface.rst:150 +#: ../../chapters/user_interface.rst:148 msgid "You can select from different types of displays for the waveform, which differ primarily in the level of detail shown in the waveform, in :menuselection:`Preferences --> Waveforms --> Summary type`." msgstr "" -#: ../../source/chapters/user_interface.rst:155 -#: ../../source/chapters/user_interface.rst:939 +#: ../../chapters/user_interface.rst:153 +#: ../../chapters/user_interface.rst:986 msgid "**Waveform overview**" msgstr "" -#: ../../source/chapters/user_interface.rst:159 +#: ../../chapters/user_interface.rst:157 msgid "Like with the Waveform summary, you can now select from different types of displays for the overview in :menuselection:`Preferences --> Waveforms --> Overview type`." msgstr "" -#: ../../source/chapters/user_interface.rst:163 +#: ../../chapters/user_interface.rst:161 msgid "The smaller, zoomed-out version of the waveform shows the various markers within the track as well as the waveform envelope of the entire track. This is useful because they allow DJs to see breakdowns far in advance. Clicking somewhere on the waveform allows you to jump to an arbitrary position in the track." msgstr "" -#: ../../source/chapters/user_interface.rst:180 +#: ../../chapters/user_interface.rst:178 msgid "**Vinyl Widget**" msgstr "" -#: ../../source/chapters/user_interface.rst:170 +#: ../../chapters/user_interface.rst:168 msgid "The line on the vinyl widget rotates if the track moves. It is similar to the position marker found on scratch records. Use the mouse on the vinyl widget to pause, scratch, spin-back or throw tracks - just like a real record. When performing :ref:`Loop rolls ` or right-clicking on the vinyl during playback, a “ghost” marker hints where the playback will continue. The Vinyl Widget is hidden by default and can be enabled in the :ref:`interface-button-grid`." msgstr "" -#: ../../source/chapters/user_interface.rst:178 +#: ../../chapters/user_interface.rst:176 msgid "If :term:`Vinyl control` is enabled, it can optionally display the time-coded vinyl signal quality. Activate the option in :menuselection:`Preferences --> Vinyl Control --> Show Signal Quality in Skin`." msgstr "" -#: ../../source/chapters/user_interface.rst:186 +#: ../../chapters/user_interface.rst:183 msgid "**Waveform Zoom**" msgstr "" -#: ../../source/chapters/user_interface.rst:183 -msgid "Using the mouse-wheel everywhere in the waveform summary will zoom the waveform in or out. You can choose whether to synchronize the zoom level between the decks in :menuselection:`Preferences --> Interface --> Waveform Display --> Synchronize`." +#: ../../chapters/user_interface.rst:181 +msgid "Using the mouse-wheel everywhere in the waveform summary will zoom the waveform in or out. You can choose whether to synchronize the zoom level between the decks in :menuselection:`Preferences --> Waveforms`." msgstr "" -#: ../../source/chapters/user_interface.rst:189 -#: ../../source/chapters/user_interface.rst:942 +#: ../../chapters/user_interface.rst:186 +#: ../../chapters/user_interface.rst:989 msgid "**Waveform Marker**" msgstr "" -#: ../../source/chapters/user_interface.rst:189 +#: ../../chapters/user_interface.rst:186 msgid "While mixing, various additional markers can appear on the waveforms:" msgstr "" -#: ../../source/chapters/user_interface.rst:191 +#: ../../chapters/user_interface.rst:188 msgid "**Position marker**: The static vertical line in the center of the waveform summary indicates the playback point of the deck." msgstr "" -#: ../../source/chapters/user_interface.rst:193 +#: ../../chapters/user_interface.rst:190 msgid "**Beat marker**: The regular white lines on the waveform summary indicate the locations of beats in the audio, also called the :term:`beatgrid`." msgstr "" -#: ../../source/chapters/user_interface.rst:195 +#: ../../chapters/user_interface.rst:192 msgid "**Cue marker**: Indicates the position of the :term:`cue point `." msgstr "" -#: ../../source/chapters/user_interface.rst:196 -#: ../../source/chapters/user_interface.rst:946 +#: ../../chapters/user_interface.rst:193 +#: ../../chapters/user_interface.rst:993 msgid "**Hotcue marker**: Indicate the position and number of a :term:`hotcue` point if set." msgstr "" -#: ../../source/chapters/user_interface.rst:198 +#: ../../chapters/user_interface.rst:195 msgid "**Loop-in/Out marker**: Indicate the beginning and the end of a loop." msgstr "" -#: ../../source/chapters/user_interface.rst:199 +#: ../../chapters/user_interface.rst:196 msgid "**Loop overlay**: Is drawn between the Loop-in/Out markers and changes color depending on whether a loop is activated or not." msgstr "" -#: ../../source/chapters/user_interface.rst:201 +#: ../../chapters/user_interface.rst:198 msgid "**Track ending notification**: If the waveform overview flashes red, only 30 seconds are left before the track reaches the end." msgstr "" -#: ../../source/chapters/user_interface.rst:207 -#: ../../source/chapters/user_interface.rst:961 +#: ../../chapters/user_interface.rst:204 +#: ../../chapters/user_interface.rst:1008 msgid "Deck Options Button Grid" msgstr "" -#: ../../source/chapters/user_interface.rst:220 +#: ../../chapters/user_interface.rst:217 msgid "The Options Button Grid of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:222 +#: ../../chapters/user_interface.rst:219 msgid "The six buttons at the bottom right below the waveform allow you to configure the deck. Starting from the top-left and moving clockwise the buttons are as follows:" msgstr "" -#: ../../source/chapters/user_interface.rst:227 +#: ../../chapters/user_interface.rst:224 msgid "**Show/Hide Vinyl Widget**" msgstr "" -#: ../../source/chapters/user_interface.rst:227 +#: ../../chapters/user_interface.rst:224 msgid "Toggles the visibility of the Vinyl Widget in the :ref:`interface-waveform`." msgstr "" -#: ../../source/chapters/user_interface.rst:231 -#: ../../source/chapters/user_interface.rst:968 +#: ../../chapters/user_interface.rst:228 +#: ../../chapters/user_interface.rst:1015 msgid "**Repeat Mode Toggle**" msgstr "" -#: ../../source/chapters/user_interface.rst:230 -#: ../../source/chapters/user_interface.rst:967 +#: ../../chapters/user_interface.rst:227 +#: ../../chapters/user_interface.rst:1014 msgid "If enabled, the repeat mode will jump back to the beginning and continue playing when the track finishes." msgstr "" -#: ../../source/chapters/user_interface.rst:236 -#: ../../source/chapters/user_interface.rst:971 +#: ../../chapters/user_interface.rst:233 +#: ../../chapters/user_interface.rst:1018 msgid "**Eject Track Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:234 +#: ../../chapters/user_interface.rst:231 msgid "Clicking this button ejects the track from the deck. Alternatively you can use a keyboard shortcut, go to the chapter :ref:`control-keyboard` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:242 +#: ../../chapters/user_interface.rst:239 msgid "**Beat-grid Adjust Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:239 -msgid "Clicking this button adjusts the track beat-grid so that the current position is marked as a beat. This is useful if Mixxx was able to accurately detect the track's :term:`BPM` but failed to align the beat markers on the beats. For more information, go to the chapter :ref:`djing-bpm-detection`." +#: ../../chapters/user_interface.rst:236 +msgid "Clicking this button adjusts the track beat-grid so that the current position is marked as a beat. This is useful if Mixxx was able to accurately detect the track's :term:`BPM` but failed to align the beat markers on the beats. For more information, go to the chapter :ref:`configuration-bpm-detection`." msgstr "" -#: ../../source/chapters/user_interface.rst:246 +#: ../../chapters/user_interface.rst:243 msgid "**Quantize Mode Toggle**" msgstr "" -#: ../../source/chapters/user_interface.rst:245 +#: ../../chapters/user_interface.rst:242 msgid "If enabled, all cues, hotcues, loops, and beatloops will be automatically :term:`quantized ` so that they begin on a beat." msgstr "" -#: ../../source/chapters/user_interface.rst:252 -#: ../../source/chapters/user_interface.rst:978 +#: ../../chapters/user_interface.rst:249 +#: ../../chapters/user_interface.rst:1025 msgid "**Keylock Toggle**" msgstr "" -#: ../../source/chapters/user_interface.rst:249 +#: ../../chapters/user_interface.rst:246 msgid ":term:`Keylock ` locks the track's pitch so that adjustments to its tempo via the rate slider do not affect its pitch. This is useful if you would like to speed up or slow down a track and avoid the “chipmunk” effect that speeding up vocals has." msgstr "" -#: ../../source/chapters/user_interface.rst:257 -msgid "Vinyl Control Mode and Cueing controls" +#: ../../chapters/user_interface.rst:254 +msgid "Playback/Cue Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:269 -msgid "The Vinyl Control Mode and Cueing controls of a deck" +#: ../../chapters/user_interface.rst:263 +msgid "The playback and cueing controls of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:271 -msgid "The control above the waveforms relate to the :term:`vinyl control` feature in Mixxx and is **hidden** in the default :ref:`Mixxx user interface `. Click the :ref:`VINYL section expansion button ` in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section." +#: ../../chapters/user_interface.rst:271 +msgid "**Play/Pause Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:278 -msgid "**Abs/Rel/Const button**" +#: ../../chapters/user_interface.rst:268 +msgid "Clicking the Play/Pause button starts and pauses the playback." msgstr "" -#: ../../source/chapters/user_interface.rst:280 -msgid "**Absolute mode**: The track position equals needle position and speed." +#: ../../chapters/user_interface.rst:270 +msgid "The actual behavior of the Play/Pause button depends on the selected :ref:`Cue mode `." msgstr "" -#: ../../source/chapters/user_interface.rst:281 -msgid "**Relative mode**: The track speed equals needle speed regardless of needle position." +#: ../../chapters/user_interface.rst:273 +msgid "To return to the beginning of the track, right-click on the deck's :ref:`Fast-Rewind Button `." msgstr "" -#: ../../source/chapters/user_interface.rst:283 -msgid "**Constant mode**: The track speed equals last known-steady speed regardless of needle input." +#: ../../chapters/user_interface.rst:289 +msgid "**Cue Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:286 -msgid "**Off/One/Hot button**" +#: ../../chapters/user_interface.rst:283 +msgid "If the button is pressed while the track is playing, the play position jumps to the :term:`Cue point ` on the track and the track is paused. Once the track is paused at the Cue point, you can preview it by holding the Cue Button. If you have not moved the Cue point yet, the default point is at the track's beginning." msgstr "" -#: ../../source/chapters/user_interface.rst:288 -msgid "This button determines how :term:`cue points ` are treated in vinyl control relative mode:" +#: ../../chapters/user_interface.rst:288 +msgid "The actual behavior of the Cue button depends on the selected :ref:`Cue mode `." msgstr "" -#: ../../source/chapters/user_interface.rst:291 -msgid "**Off**: Cue points are ignored." +#: ../../chapters/user_interface.rst:292 +msgid "Setting Cue points" msgstr "" -#: ../../source/chapters/user_interface.rst:292 -msgid "**One Cue**: If the needle is dropped after the cue point, the track will seek to that cue point." +#: ../../chapters/user_interface.rst:294 +msgid "Every track has a Cue point, by default on its beginning. Unlike with :ref:`Hotcues `, you can't delete, but only move Cue points." msgstr "" -#: ../../source/chapters/user_interface.rst:294 -msgid "**Hot Cue**: The track will seek to nearest previous :term:`hotcue` point." +#: ../../chapters/user_interface.rst:297 +msgid "The Cue point is moved according to the selected Cue mode, as explained below." msgstr "" -#: ../../source/chapters/user_interface.rst:296 -msgid "For more information on how to use Vinyl control in your setup, go to the chapter :ref:`vinyl-control`." +#: ../../chapters/user_interface.rst:300 +msgid "Auto Cue" msgstr "" -#: ../../source/chapters/user_interface.rst:302 -msgid "Sync and Rate Controls" +#: ../../chapters/user_interface.rst:301 +msgid "Mixxx automatically seeks to the saved Cue point on track load. If none exists, seeks to the beginning of the track." msgstr "" -#: ../../source/chapters/user_interface.rst:315 -msgid "Rate controls" +#: ../../chapters/user_interface.rst:304 +msgid "Uncheck :menuselection:`Preferences --> Interface --> Auto Cue` to always seek to the beginning of the track." msgstr "" -#: ../../source/chapters/user_interface.rst:317 -msgid "The rate controls allow you to change the rate at which tracks are played. This is very useful for :term:`beatmatching` two tracks together in a mix. You can control rate changes also from your computer's keyboard, see the chapter :ref:`control-keyboard` for more information." +#: ../../chapters/user_interface.rst:310 +msgid "Using Cue Modes" msgstr "" -#: ../../source/chapters/user_interface.rst:322 -msgid "**SYNC button**" +#: ../../chapters/user_interface.rst:312 +msgid "The Mixxx/Pioneer/Denon/Numark Cue modes gives users now even more flexibility." msgstr "" -#: ../../source/chapters/user_interface.rst:324 -msgid "**Left-Click**: Changes the :term:`rate` of the track so that the :term:`BPM` and :term:`phase` of the track matches the other deck." +#: ../../chapters/user_interface.rst:315 +msgid "Mixxx supports various Cue modes that adapt to fit other devices in your setup, or your personal preferences. The actual behavior of the Play, Pause, and Cue buttons depends on the selected Cue mode. To change the Cue mode, go to :menuselection:`Preferences --> Interface`." msgstr "" -#: ../../source/chapters/user_interface.rst:326 -msgid "**Right-Click**: Only changes the :term:`rate` of the track to match the other deck but does not adjust the :term:`phase`." +#: ../../chapters/user_interface.rst:320 +msgid "**Mixxx mode (default)**" msgstr "" -#: ../../source/chapters/user_interface.rst:329 -msgid "Decks and samplers now pick which sync target to sync to on the fly. Decks can't sync to samplers and samplers can only sync to decks. The sync target for samplers is:" +#: ../../chapters/user_interface.rst:322 +#: ../../chapters/user_interface.rst:381 +msgid "**While paused at Cue point (Cue button lit):**" msgstr "" -#: ../../source/chapters/user_interface.rst:333 -msgid "The first deck (in numerical order) that is playing a track with a detected beatgrid, and has a rate different than zero." +#: ../../chapters/user_interface.rst:324 +msgid "Holding down the Cue button plays the track from the :term:`Cue point `, as long as the button is pressed. After releasing the Cue button, the track jumps back to Cue point and pauses again. Continue playback by pressing the Play/Pause button before releasing the Cue button." msgstr "" -#: ../../source/chapters/user_interface.rst:335 -msgid "The first deck (in numerical order) that has a track loaded with a detected beatgrid, no matter if it is playing or stopped." +#: ../../chapters/user_interface.rst:329 +#: ../../chapters/user_interface.rst:385 +msgid "**While paused not at Cue point (Cue button flashing)**:" msgstr "" -#: ../../source/chapters/user_interface.rst:338 -msgid "So basically, if you sync a sampler and both deck 1 and deck 2 are playing a track with a beatgrid then deck 1 will win since numerically it is first. The sync targets for decks are chosen with the new master sync feature, see :ref:`master-sync` for more information." +#: ../../chapters/user_interface.rst:331 +msgid "Tapping the Cue button stores the current position as new Cue point." msgstr "" -#: ../../source/chapters/user_interface.rst:347 -#: ../../source/chapters/user_interface.rst:1013 -msgid "**Pitch/Rate slider**" +#: ../../chapters/user_interface.rst:333 +#: ../../chapters/user_interface.rst:390 +msgid "**While playing:**" msgstr "" -#: ../../source/chapters/user_interface.rst:344 -msgid "The slider allows you to change the speed of the song, by default up to 10% from the tracks original tempos. The speed will increase as you move the slider up, opposite to the behavior found on DJ turntables and :term:`CDJ`. Right-clicking on the slider will reset the tempo to its original value." +#: ../../chapters/user_interface.rst:335 +msgid "Tapping the Cue button causes the track to instantly jump to the location of the Cue point where it pauses the playback." msgstr "" -#: ../../source/chapters/user_interface.rst:352 -msgid "**Pitch Rate Display**" +#: ../../chapters/user_interface.rst:337 +#: ../../chapters/user_interface.rst:370 +#: ../../chapters/user_interface.rst:395 +msgid "Tapping the Play/Pause button pauses the track at the current position." msgstr "" -#: ../../source/chapters/user_interface.rst:350 -msgid "The percent that the track's rate is sped up or slowed down is noted here. Is the Pitch/Rate slider positioned at the center, the pitch rate display is at +0.0%, which indicates no change." +#: ../../chapters/user_interface.rst:339 +msgid "**Mixxx mode (no blinking)**" msgstr "" -#: ../../source/chapters/user_interface.rst:357 -msgid "**Pitch/Rate buttons**" +#: ../../chapters/user_interface.rst:341 +msgid "Is the same as the default Mixxx mode, but with no blinking indicators." msgstr "" -#: ../../source/chapters/user_interface.rst:355 -msgid "The plus and minus buttons increase or decrease the tempo in steps at which a song is played, same as pulling the pitch slider slightly. By right-clicking the buttons you get even finer adjustments." +#: ../../chapters/user_interface.rst:343 +msgid "**Pioneer mode**" msgstr "" -#: ../../source/chapters/user_interface.rst:364 -msgid "**Temporary Pitch/Rate buttons (Nudge)**" +#: ../../chapters/user_interface.rst:345 +msgid "It is basically the same as Mixxx mode but the buttons are more flashy like a Pioneer CDJ player." msgstr "" -#: ../../source/chapters/user_interface.rst:360 -msgid "Pushing the left and right arrow buttons is like nudging the metal edge of a turntable, or the outer edge of a CD player. It will give the track a push or pull forwards or backwards. If the buttons are released the previous tempo is restored. The buttons can act as either a fixed :term:`pitch bend` or a :term:`ramping pitch bend`." +#: ../../chapters/user_interface.rst:347 +msgid "The Play/Pause button flashes once per second when a track is paused." msgstr "" -#: ../../source/chapters/user_interface.rst:366 -msgid "To customize the amount by which the buttons alter the pitch of the track, the slider range as well as the direction, go to :menuselection:`Preferences --> Interface`." +#: ../../chapters/user_interface.rst:348 +msgid "The Cue button flashes twice a second when the next push will move the Cue point." msgstr "" -#: ../../source/chapters/user_interface.rst:370 -msgid "If the tempo of a track changes, you'll notice that the tone changes based on the pitch used (e.g. playing at faster pitch gives a chipmunk sound). You can enable the :ref:`Keylock ` feature to maintain a constant tone." +#: ../../chapters/user_interface.rst:350 +msgid "**Denon mode**" msgstr "" -#: ../../source/chapters/user_interface.rst:378 -msgid "Transport Controls" +#: ../../chapters/user_interface.rst:352 +msgid "**While paused at Cue point (Cue button lit)**:" msgstr "" -#: ../../source/chapters/user_interface.rst:391 -msgid "The transport controls of the deck" +#: ../../chapters/user_interface.rst:354 +msgid "Holding down the Cue button plays the track from the Cue point, as long as the button is pressed. After releasing the Cue button, the track jumps back to Cue point and pauses again. Continue playback by pressing the Play/Pause button before releasing the Cue button." msgstr "" -#: ../../source/chapters/user_interface.rst:393 -msgid "Right-click on the Reverse button activates Reverse Roll (Censor)" +#: ../../chapters/user_interface.rst:358 +msgid "Tapping the Play/Pause button starts the track at the current position." msgstr "" -#: ../../source/chapters/user_interface.rst:399 -msgid "**Fast-Rewind button**" +#: ../../chapters/user_interface.rst:360 +msgid "**While paused not at Cue point (Play button flashing)**:" msgstr "" -#: ../../source/chapters/user_interface.rst:397 -msgid "As long as the button is pressed, the track will play in reverse with increased speed. Right-clicking on the button will seek the play position to the beginning of the track." +#: ../../chapters/user_interface.rst:362 +msgid "Tapping the Cue button moves the track back to Cue point." msgstr "" -#: ../../source/chapters/user_interface.rst:404 -msgid "**Fast-Forward button**" +#: ../../chapters/user_interface.rst:363 +msgid "Tab the Play/Pause button to start playing. The Cue point moves to the position where the track was started." msgstr "" -#: ../../source/chapters/user_interface.rst:402 -msgid "As long as the button is pressed, the track will play with increased speed. Right-clicking on the button will seek the play position to the end of the track." +#: ../../chapters/user_interface.rst:366 +msgid "**While playing**:" msgstr "" -#: ../../source/chapters/user_interface.rst:410 -msgid "**Reverse button**" +#: ../../chapters/user_interface.rst:368 +msgid "Tapping the Cue button causes the track to instantly jump to the location of the cue point where it pauses the playback." msgstr "" -#: ../../source/chapters/user_interface.rst:407 -msgid "As the name suggests, this button plays a track backwards. Right-clicking on the button puts a track into reverse while being held, resumes the track and disables Slip mode when released. Useful to censor expletives on the fly, or simply as part of your mix." +#: ../../chapters/user_interface.rst:372 +msgid "**Numark mode**" msgstr "" -#: ../../source/chapters/user_interface.rst:415 -msgid "Loop Controls" +#: ../../chapters/user_interface.rst:374 +msgid "It is basically the same as Denon mode but without a flashing Play/Pause button." msgstr "" -#: ../../source/chapters/user_interface.rst:428 -msgid "The beatloop and looping controls of the deck" +#: ../../chapters/user_interface.rst:376 +msgid "This mode is useful if you want to implement a custom skin with 3-button decks, featuring a Cue button, a dedicated Pause button, and a Play/Stutter button." msgstr "" -#: ../../source/chapters/user_interface.rst:430 -msgid "In this section of the Mixxx interface you can control (beat-)loops and set the loop points of a track." +#: ../../chapters/user_interface.rst:379 +msgid "**CUP (Cue + Play) mode**" msgstr "" -#: ../../source/chapters/user_interface.rst:433 -msgid "**Beatlooping Buttons**" +#: ../../chapters/user_interface.rst:383 +msgid "Continue playback by releasing the Cue button." msgstr "" -#: ../../source/chapters/user_interface.rst:435 -msgid "**Instant loop**: The numbered buttons represents a different :term:`bar` length. Clicking on any of that buttons will set a loop of the defined number of beats from the beat immediately following the current playback position. If a loop is set, a loop overlay will be drawn on the :ref:`waveforms `." +#: ../../chapters/user_interface.rst:387 +msgid "Tapping the Cue button stores the current position as new Cue point. Continue playback by releasing the Cue button." msgstr "" -#: ../../source/chapters/user_interface.rst:440 -msgid "**Loop roll**: Right-click on any of the numbered loop buttons to temporarily setup a rolling loop over the defined number of beats. Playback will resume where the track would have been if it had not entered the loop." +#: ../../chapters/user_interface.rst:392 +msgid "Tapping the Cue button causes the track to instantly jump to the location of the Cue point where it pauses the playback. Continue playback by releasing the Cue button." msgstr "" -#: ../../source/chapters/user_interface.rst:444 -msgid "**Double loop**: Clicking on the plus button will double the current loop's length up to 64 bars. The length of the loop overlay in the waveform will increase accordingly." +#: ../../chapters/user_interface.rst:397 +msgid "Use the :ref:`interface-hotcues` to place more reference points on a track." msgstr "" -#: ../../source/chapters/user_interface.rst:447 -msgid "**Halve loop**: Clicking on the minus button will halve the current loop's length down to 1/32 bars. The length of the loop overlay in the waveform will decrease accordingly." +#: ../../chapters/user_interface.rst:400 +msgid "You can also use keyboard shortcuts for Cueing. Go to :ref:`control-keyboard` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:451 -msgid "**Loop Buttons**" +#: ../../chapters/user_interface.rst:406 +msgid "Transport Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:453 -msgid "**Loop-In**: This button allow you to manually set the start point of a loop. A loop-in marker is placed on the waveform indicating the position. If clicked when a loop was already set, it moves the start point of a loop to a new position." +#: ../../chapters/user_interface.rst:419 +msgid "The transport controls of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:457 -msgid "**Loop-Out**: This button allow you to manually set the end point of a loop. A loop-out marker is placed on the waveform indicating the position. If clicked when a loop was already set, it moves the end point of a loop to a new position." +#: ../../chapters/user_interface.rst:421 +msgid "Right-click on the Reverse button activates Reverse Roll (Censor)" msgstr "" -#: ../../source/chapters/user_interface.rst:461 -msgid "**Loop**: Also dubbed Reloop, this button toggles whether the loop is active or not. This works for manually placed loops as well as automatic loops set by the beatlooping buttons. Depending on the current status of the loop, the loop overlay on the waveforms changes color." +#: ../../chapters/user_interface.rst:427 +msgid "**Fast-Rewind button**" msgstr "" -#: ../../source/chapters/user_interface.rst:466 -msgid "If you are playing inside a loop and want to move the end point beyond its current position in the track, click on the *Loop* button first and when the play position reaches the desired position, click on the Loop-Out button." +#: ../../chapters/user_interface.rst:425 +msgid "As long as the button is pressed, the track will play in reverse with increased speed. Right-clicking on the button will seek the play position to the beginning of the track." msgstr "" -#: ../../source/chapters/user_interface.rst:471 -msgid "If the :term:`Quantize ` mode is enabled, the loops will automatically snap to the nearest beat. This is disabled by default, click on the :ref:`Quantize Mode Toggle ` to enable it." +#: ../../chapters/user_interface.rst:432 +msgid "**Fast-Forward button**" msgstr "" -#: ../../source/chapters/user_interface.rst:479 -msgid "Hotcue Controls" +#: ../../chapters/user_interface.rst:430 +msgid "As long as the button is pressed, the track will play with increased speed. Right-clicking on the button will seek the play position to the end of the track." msgstr "" -#: ../../source/chapters/user_interface.rst:492 -msgid "The hotcue controls of the deck" +#: ../../chapters/user_interface.rst:439 +msgid "**Reverse button**" msgstr "" -#: ../../source/chapters/user_interface.rst:494 -msgid "To jump in between different parts of a track, you can use these numbered buttons. You can also use keyboard shortcuts, go to :ref:`control-keyboard` for more information." +#: ../../chapters/user_interface.rst:435 +msgid "As the name suggests, this button plays a track backwards. Right-clicking on the button puts a track into reverse while being held, resumes the track and disables Slip mode when released. Useful to censor expletives on the fly, or simply as part of your mix." msgstr "" -#: ../../source/chapters/user_interface.rst:499 -msgid "Setting Hotcues" +#: ../../chapters/user_interface.rst:444 +msgid "Vinyl Control Mode and Cueing controls" msgstr "" -#: ../../source/chapters/user_interface.rst:501 -msgid "Clicking on a numbered button will set a :term:`hotcue` at the current play position on the track. A marker with the corresponding number will appear in the waveform and the button will light up to indicate that the hotcue is set." +#: ../../chapters/user_interface.rst:456 +msgid "The Vinyl Control Mode and Cueing controls of a deck" msgstr "" -#: ../../source/chapters/user_interface.rst:506 -msgid "Playing Hotcues" +#: ../../chapters/user_interface.rst:458 +msgid "The control above the waveforms relate to the :term:`vinyl control` feature in Mixxx and is **hidden** in the default :ref:`Mixxx user interface `. Click the :ref:`VINYL section expansion button ` in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section." msgstr "" -#: ../../source/chapters/user_interface.rst:508 -msgid "**While playing**: Tap a hotcue button to cause the track to instantly jump to the location of the hotcue and continue playing. If you are playing inside a loop and tap a hotcue whose position is outside of the loop, then the track still instantly jumps to the hotcue but the loop will be deactivated." +#: ../../chapters/user_interface.rst:465 +msgid "**Abs/Rel/Const button**" msgstr "" -#: ../../source/chapters/user_interface.rst:513 -msgid "**While stopped**: Tap a hotcue button to cause the track to instantly jump to the location of the hotcue and start playing as long as the button is pressed. Press the :ref:`Play ` keyboard shortcut while the hotcue button is pressed to continue playback, then release the hotcue button." +#: ../../chapters/user_interface.rst:467 +msgid "**Absolute mode**: The track position equals needle position and speed." msgstr "" -#: ../../source/chapters/user_interface.rst:519 -msgid "Deleting Hotcues" +#: ../../chapters/user_interface.rst:468 +msgid "**Relative mode**: The track speed equals needle speed regardless of needle position." msgstr "" -#: ../../source/chapters/user_interface.rst:521 -msgid "To delete a hotcue, right-click on the numbered button. The marker in the waveform will be deleted as well." +#: ../../chapters/user_interface.rst:470 +msgid "**Constant mode**: The track speed equals last known-steady speed regardless of needle input." msgstr "" -#: ../../source/chapters/user_interface.rst:524 -msgid "Mixxx supports up to 36 hotcues per deck. By default, only some of them are visible in the user interface. You can customize your :ref:`keyboard ` or :ref:`controller ` mappings to use all of them." +#: ../../chapters/user_interface.rst:473 +msgid "**Off/One/Hot button**" msgstr "" -#: ../../source/chapters/user_interface.rst:529 -msgid "Just as with the loops (see above), if the :term:`quantize ` mode is enabled, the hotcues will automatically snap to the nearest beat. This is disabled by default, click on the :ref:`Quantize Mode Toggle ` to enable it." +#: ../../chapters/user_interface.rst:475 +msgid "This button determines how :term:`cue points ` are treated in vinyl control relative mode:" msgstr "" -#: ../../source/chapters/user_interface.rst:538 -msgid "The Mixer Section" +#: ../../chapters/user_interface.rst:478 +msgid "**Off**: Cue points are ignored." msgstr "" -#: ../../source/chapters/user_interface.rst:551 -msgid "The mixer section" +#: ../../chapters/user_interface.rst:479 +msgid "**One Cue**: If the needle is dropped after the cue point, the track will seek to that cue point." msgstr "" -#: ../../source/chapters/user_interface.rst:553 -msgid "The mixer section of the :ref:`Mixxx user interface ` allows you to control how the different decks and samplers are mixed together." +#: ../../chapters/user_interface.rst:481 +msgid "**Hot Cue**: The track will seek to nearest previous :term:`hotcue` point." msgstr "" -#: ../../source/chapters/user_interface.rst:559 -msgid "Channel Faders and Level Meters" +#: ../../chapters/user_interface.rst:483 +msgid "For more information on how to use Vinyl control in your setup, go to the chapter :ref:`vinyl-control`." msgstr "" -#: ../../source/chapters/user_interface.rst:569 -msgid "**Level meters**" +#: ../../chapters/user_interface.rst:489 +msgid "Sync and Rate Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:562 -msgid "In the center of the mixer section are 4 :term:`level meters `. The two outer-most level meters are for each deck, while the 2 inner-most level meters are the left and right level meters for the master output. These should stay at the top of the green region, with the loudest parts of the music (transients) briefly going into the yellow region. They should never be in the red region. Refer to :ref:`Setting your levels properly (gain staging) ` for more details." +#: ../../chapters/user_interface.rst:502 +msgid "Rate controls" msgstr "" -#: ../../source/chapters/user_interface.rst:577 -msgid "**Line faders**" +#: ../../chapters/user_interface.rst:504 +msgid "The rate controls allow you to change the rate at which tracks are played. This is very useful for :term:`beatmatching` two tracks together in a mix. You can control rate changes also from your computer's keyboard, see the chapter :ref:`control-keyboard` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:572 -msgid "The two large faders on either side of the level meters are the deck volume faders, also known as Channel- or Line-faders. Adjusting these controls the volume of each deck." +#: ../../chapters/user_interface.rst:509 +msgid "**SYNC button**" msgstr "" -#: ../../source/chapters/user_interface.rst:576 -msgid "Some DJ's prefer to use the line faders over the crossfader for fading between tracks. Try it, you may like it." +#: ../../chapters/user_interface.rst:511 +msgid "**Left-Click**: Changes the :term:`rate` of the track so that the :term:`BPM` and :term:`phase` of the track matches the other deck." msgstr "" -#: ../../source/chapters/user_interface.rst:582 -msgid "Section Expansion Buttons" +#: ../../chapters/user_interface.rst:513 +msgid "**Right-Click**: Only changes the :term:`rate` of the track to match the other deck but does not adjust the :term:`phase`." msgstr "" -#: ../../source/chapters/user_interface.rst:591 -msgid "The section expansion buttons" +#: ../../chapters/user_interface.rst:516 +msgid "Decks and samplers now pick which sync target to sync to on the fly. Decks can't sync to samplers and samplers can only sync to decks. The sync target for samplers is:" msgstr "" -#: ../../source/chapters/user_interface.rst:593 -msgid "Above the level meters in the mixer are the optional section expansion buttons." +#: ../../chapters/user_interface.rst:520 +msgid "The first deck (in numerical order) that is playing a track with a detected beatgrid, and has a rate different than zero." msgstr "" -#: ../../source/chapters/user_interface.rst:595 -msgid "If you click on either :guilabel:`MIC`, :guilabel:`SAMPLER`, or :guilabel:`VINYL` then you will enable control sections for interacting with:" +#: ../../chapters/user_interface.rst:522 +msgid "The first deck (in numerical order) that has a track loaded with a detected beatgrid, no matter if it is playing or stopped." msgstr "" -#: ../../source/chapters/user_interface.rst:598 -msgid ":ref:`interface-mic`" +#: ../../chapters/user_interface.rst:525 +msgid "So basically, if you sync a sampler and both deck 1 and deck 2 are playing a track with a beatgrid then deck 1 will win since numerically it is first. The sync targets for decks are chosen with the new master sync feature, see :ref:`master-sync` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:599 -msgid ":ref:`interface-sampler`" +#: ../../chapters/user_interface.rst:534 +#: ../../chapters/user_interface.rst:1060 +msgid "**Pitch/Rate slider**" msgstr "" -#: ../../source/chapters/user_interface.rst:600 -msgid ":ref:`interface-vc-mode`" +#: ../../chapters/user_interface.rst:531 +msgid "The slider allows you to change the speed of the song, by default up to 10% from the tracks original tempos. The speed will increase as you move the slider up, opposite to the behavior found on DJ turntables and :term:`CDJ`. Right-clicking on the slider will reset the tempo to its original value." msgstr "" -#: ../../source/chapters/user_interface.rst:602 -msgid "You can also use the specific :ref:`appendix-shortcuts`." +#: ../../chapters/user_interface.rst:539 +msgid "**Pitch Rate Display**" msgstr "" -#: ../../source/chapters/user_interface.rst:607 -msgid "Headphone and Master Mix Controls" +#: ../../chapters/user_interface.rst:537 +msgid "The percent that the track's rate is sped up or slowed down is noted here. Is the Pitch/Rate slider positioned at the center, the pitch rate display is at +0.0%, which indicates no change." msgstr "" -#: ../../source/chapters/user_interface.rst:616 -msgid "The headphone and master mix knobs" +#: ../../chapters/user_interface.rst:544 +msgid "**Pitch/Rate buttons**" +msgstr "" + +#: ../../chapters/user_interface.rst:542 +msgid "The plus and minus buttons increase or decrease the tempo in steps at which a song is played, same as pulling the pitch slider slightly. By right-clicking the buttons you get even finer adjustments." msgstr "" -#: ../../source/chapters/user_interface.rst:0 -msgid "Todo" +#: ../../chapters/user_interface.rst:551 +msgid "**Temporary Pitch/Rate buttons (Nudge)**" msgstr "" -#: ../../source/chapters/user_interface.rst:618 -msgid "Update section to reflect 1.12 GUI layout." +#: ../../chapters/user_interface.rst:547 +msgid "Pushing the left and right arrow buttons is like nudging the metal edge of a turntable, or the outer edge of a CD player. It will give the track a push or pull forwards or backwards. If the buttons are released the previous tempo is restored. The buttons can act as either a fixed :term:`pitch bend` or a :term:`ramping pitch bend`." msgstr "" -#: ../../source/chapters/user_interface.rst:620 -msgid "Headphone split cue option" +#: ../../chapters/user_interface.rst:553 +msgid "To customize the amount by which the buttons alter the pitch of the track, the slider range as well as the direction, go to :menuselection:`Preferences --> Interface`." msgstr "" -#: ../../source/chapters/user_interface.rst:630 -msgid "**Head-Mix Knob**" +#: ../../chapters/user_interface.rst:557 +msgid "If the tempo of a track changes, you'll notice that the tone changes based on the pitch used (e.g. playing at faster pitch gives a chipmunk sound). You can enable the :ref:`Keylock ` feature to maintain a constant tone." msgstr "" -#: ../../source/chapters/user_interface.rst:624 -msgid "Allows you to control how much of the master output you hear in your headphones. It works like a crossfader between the stereo Master and stereo Cueing signal. If the knob is set to the left, you only hear the cueing signal, which is the usual position for prelistening tracks." +#: ../../chapters/user_interface.rst:565 +msgid "Loop Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:629 -msgid "Don't forget to activate the :guilabel:`PFL` button on the deck you want to listen to in your headphones." +#: ../../chapters/user_interface.rst:578 +msgid "The beatloop and looping controls of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:637 -msgid "**Head-Split Button**" +#: ../../chapters/user_interface.rst:580 +msgid "In this section of the Mixxx interface you can control (beat-)loops and set the loop points of a track." msgstr "" -#: ../../source/chapters/user_interface.rst:633 -msgid "If activated, two mono signals are sent to the headphone output instead of one stereo signal. The master signal plays in the right channel, while the cueing signal plays in the left channel. You can still adjust the :guilabel:`Head-Mix Knob` to control the mix of the master and cue signals in the left channel." +#: ../../chapters/user_interface.rst:583 +msgid "**Beatlooping Buttons**" msgstr "" -#: ../../source/chapters/user_interface.rst:641 -msgid "**Balance Knob**" +#: ../../chapters/user_interface.rst:585 +msgid "**Instant loop**: The numbered buttons represents a different :term:`bar` length. Clicking on any of that buttons will set a loop of the defined number of beats from the beat immediately following the current playback position. If a loop is set, a loop overlay will be drawn on the :ref:`waveforms `." msgstr "" -#: ../../source/chapters/user_interface.rst:640 -msgid "This knob allows you to adjust the :term:`balance` (left/right orientation) of the master output." +#: ../../chapters/user_interface.rst:590 +msgid "**Loop roll**: Right-click on any of the numbered loop buttons to temporarily setup a rolling loop over the defined number of beats. Playback will resume where the track would have been if it had not entered the loop." msgstr "" -#: ../../source/chapters/user_interface.rst:670 -#: ../../source/chapters/user_interface.rst:748 -#: ../../source/chapters/user_interface.rst:1006 -msgid "**Gain Knob**" +#: ../../chapters/user_interface.rst:594 +msgid "**Double loop**: Clicking on the plus button will double the current loop's length up to 64 bars. The length of the loop overlay in the waveform will increase accordingly." msgstr "" -#: ../../source/chapters/user_interface.rst:646 -msgid "The Gain Knob controls the gain applied to the Master output signal that Mixxx sends to your sound card, Internet broadcasting servers, and recorded mixes. Generally, this knob should not be adjusted. To change the output volume, a gain control should be adjusted as close to the speakers as possible for the best signal-to-noise ratio throughout your signal chain. Ideally, the volume would only be adjusted by adjusting the gain on the power amplifier. On active speakers, including computer speakers, studio monitors, and PA systems that do not require a separate amplifier, this means adjusting the gain on the speakers (which may be labeled \"Volume\")." +#: ../../chapters/user_interface.rst:597 +msgid "**Halve loop**: Clicking on the minus button will halve the current loop's length down to 1/32 bars. The length of the loop overlay in the waveform will decrease accordingly." msgstr "" -#: ../../source/chapters/user_interface.rst:656 -msgid "As a DJ, you may not have access to the power amplifier. In that case, adjust the volume by adjusting the gain on the equipment closest to the power amplifier that you have access to. Typically, this is a DJ mixer. If you are not going through a mixer, adjust the gain of your sound card. If your sound card does not have any controls on it (for example, for sound cards built into computers), adjust the sound card settings with your :term:`OS ` mixer program. The Master Gain Knob in Mixxx should be a last resort for adjusting volume." +#: ../../chapters/user_interface.rst:601 +msgid "**Loop Buttons**" msgstr "" -#: ../../source/chapters/user_interface.rst:665 -msgid "**In no case should any part of the signal chain be clipping, indicated by a level meter going into its red region or an LED labeled \"clipping\" turning on.**" +#: ../../chapters/user_interface.rst:603 +msgid "**Loop-In**: This button allow you to manually set the start point of a loop. A loop-in marker is placed on the waveform indicating the position. If clicked when a loop was already set, it moves the start point of a loop to a new position." msgstr "" -#: ../../source/chapters/user_interface.rst:669 -#: ../../source/chapters/user_interface.rst:747 -msgid "For an explanation of why you should set your gains this way, see :ref:`Setting your levels properly (gain staging) `." +#: ../../chapters/user_interface.rst:607 +msgid "**Loop-Out**: This button allow you to manually set the end point of a loop. A loop-out marker is placed on the waveform indicating the position. If clicked when a loop was already set, it moves the end point of a loop to a new position." msgstr "" -#: ../../source/chapters/user_interface.rst:681 -msgid "**Head Gain Knob**" +#: ../../chapters/user_interface.rst:611 +msgid "**Loop**: Also dubbed Reloop, this button toggles whether the loop is active or not. This works for manually placed loops as well as automatic loops set by the beatlooping buttons. Depending on the current status of the loop, the loop overlay on the waveforms changes color." msgstr "" -#: ../../source/chapters/user_interface.rst:673 -msgid "This knob controls the gain applied to the headphone output signal that Mixxx sends to your sound card. Generally, this knob should not be adjusted. To adjust the volume in your headphones, adjust your sound card's gain on the headphone output. Most external sound cards have a gain knob specifically for the headphone jack. If you use an onboard sound card for your headphones, adjust the gain control in your :term:`OS ` mixer program. If your sound card only has one gain knob that controls both the main output and the headphone output, then adjust the :guilabel:`Head Gain Knob` in Mixxx to control the volume of your headphones without affecting your main output." +#: ../../chapters/user_interface.rst:616 +msgid "If you are playing inside a loop and want to move the end point beyond its current position in the track, click on the *Loop* button first and when the play position reaches the desired position, click on the Loop-Out button." msgstr "" -#: ../../source/chapters/user_interface.rst:686 -msgid "PFL/Headphone Button" +#: ../../chapters/user_interface.rst:621 +msgid "If the :term:`Quantize ` mode is enabled, the loops will automatically snap to the nearest beat. This is disabled by default, click on the :ref:`Quantize Mode Toggle ` to enable it." msgstr "" -#: ../../source/chapters/user_interface.rst:695 -msgid "The headphone buttons of both decks in the mixer" +#: ../../chapters/user_interface.rst:629 +msgid "Hotcue Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:697 -msgid "The headphone button is also known as the :term:`pre-fader listen or PFL ` button and allows you to use headphone cueing. That is, it allows you to hear the track you will play next in your headphones before your audience hears it. This helps you plan when to start the next track and manipulate it to make it blend better with the currently playing track (for example, by synchronizing the beats, setting a loop, or using EQs). Pressing the PFL button plays the track on the headphone output at full volume regardless of the position of the crossfader or the deck’s line fader. To play a track in your headphones but not have the audience hear it, press the PFL button and move the crossfader all the way to the opposite side of the deck or turn the deck’s volume fader all the way down." +#: ../../chapters/user_interface.rst:642 +msgid "The hotcue controls of the deck" msgstr "" -#: ../../source/chapters/user_interface.rst:709 -msgid "Headphone cueing is only available if you have configured a Headphone Output in :menuselection:`Preferences --> Sound Hardware`." +#: ../../chapters/user_interface.rst:644 +msgid "To jump in between different parts of a track, you can use these numbered buttons. You can also use keyboard shortcuts, go to :ref:`control-keyboard` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:712 -msgid "If you use an external hardware mixer, plug your headphones into that rather than your sound card. Use the headphone buttons on the mixer rather than the buttons in Mixxx." +#: ../../chapters/user_interface.rst:649 +msgid "Setting Hotcues" msgstr "" -#: ../../source/chapters/user_interface.rst:719 -msgid "Equalizers and Gain Knobs" +#: ../../chapters/user_interface.rst:651 +msgid "Clicking on a numbered button will set a :term:`hotcue` at the current play position on the track. A marker with the corresponding number will appear in the waveform and the button will light up to indicate that the hotcue is set." msgstr "" -#: ../../source/chapters/user_interface.rst:728 -msgid "EQ Controls" +#: ../../chapters/user_interface.rst:656 +msgid "Playing Hotcues" msgstr "" -#: ../../source/chapters/user_interface.rst:731 -msgid "Above these knobs, the gain knob allows you to adjust the gain applied to the deck. Use this to compensate for the differences in recording levels between tracks. In general, you should adjust this knob so that the track's :term:`level meter` stays around the top of the green region with the loudest parts of the track (the transients) briefly going into the yellow region. **Do NOT turn the Gain Knob up so much that the level meter is in the red region. At this point the track is clipping, which sounds bad and could damage equipment.**" +#: ../../chapters/user_interface.rst:658 +msgid "**While playing**: Tap a hotcue button to cause the track to instantly jump to the location of the hotcue and continue playing. If you are playing inside a loop and tap a hotcue whose position is outside of the loop, then the track still instantly jumps to the hotcue but the loop will be deactivated." msgstr "" -#: ../../source/chapters/user_interface.rst:739 -msgid "By default, Mixxx automatically applies an additional ReplayGain so tracks have approximately equal loudness at unity gain. Your tracks must be :ref:`analyzed ` to take advantage of this feature. When an unanalyzed track is loaded, Mixxx calculates its ReplayGain value, but will not apply a newly calculated ReplayGain value to a track after it has already started playing (to avoid a sudden change in the gain of a playing track)." +#: ../../chapters/user_interface.rst:663 +msgid "**While stopped**: Tap a hotcue button to cause the track to instantly jump to the location of the hotcue and start playing as long as the button is pressed. Press the :ref:`Play ` keyboard shortcut while the hotcue button is pressed to continue playback, then release the hotcue button." msgstr "" -#: ../../source/chapters/user_interface.rst:758 -msgid "**EQ Knobs**" +#: ../../chapters/user_interface.rst:669 +msgid "Deleting Hotcues" msgstr "" -#: ../../source/chapters/user_interface.rst:751 -msgid "The low, mid, and high knobs allow you to change the filters of the audio. This allows you to selectively reduce or boost certain frequency ranges of the audio." +#: ../../chapters/user_interface.rst:671 +msgid "To delete a hotcue, right-click on the numbered button. The marker in the waveform will be deleted as well." msgstr "" -#: ../../source/chapters/user_interface.rst:755 -msgid "Be careful not to raise the EQs so much that the signal clips, indicated by a :term:`level meter` being in the red region. See :ref:`Setting your levels properly (gain staging) ` for a more detailed explanation." +#: ../../chapters/user_interface.rst:674 +msgid "Mixxx supports up to 36 hotcues per deck. By default, only some of them are visible in the user interface. You can customize your :ref:`keyboard ` or :ref:`controller ` mappings to use all of them." msgstr "" -#: ../../source/chapters/user_interface.rst:765 -msgid "**Kill Switches**" +#: ../../chapters/user_interface.rst:679 +msgid "Just as with the loops (see above), if the :term:`quantize ` mode is enabled, the hotcues will automatically snap to the nearest beat. This is disabled by default, click on the :ref:`Quantize Mode Toggle ` to enable it." msgstr "" -#: ../../source/chapters/user_interface.rst:761 -msgid "The small boxes next to each EQ knob are called :term:`kills `. Hold these buttons to fully remove that frequency range. Short click on the buttons for latching. When in Latch mode, click again to restore the frequency range. If the Kill switches do not work as expected, check the high/low shelf EQ settings in the preferences." +#: ../../chapters/user_interface.rst:688 +msgid "The Mixer Section" msgstr "" -#: ../../source/chapters/user_interface.rst:767 -msgid "You can customize the EQ settings in :menuselection:`Preferences --> Equalizer`." +#: ../../chapters/user_interface.rst:701 +msgid "The mixer section" msgstr "" -#: ../../source/chapters/user_interface.rst:773 -msgid "Crossfader" +#: ../../chapters/user_interface.rst:703 +msgid "The mixer section of the :ref:`Mixxx user interface ` allows you to control how the different decks and samplers are mixed together." msgstr "" -#: ../../source/chapters/user_interface.rst:782 -msgid "The crossfader section of the mixer with Play/Pause and Cue buttons" +#: ../../chapters/user_interface.rst:709 +msgid "Channel Faders and Level Meters" msgstr "" -#: ../../source/chapters/user_interface.rst:784 -msgid "The :term:`crossfader` determines the actual volume of each deck when moving the slider from left to right. If both decks are playing and the crossfader is in its default center position, then you will hear both decks. Right-clicking on the crossfader will reset the slider to its default position." +#: ../../chapters/user_interface.rst:719 +msgid "**Level meters**" msgstr "" -#: ../../source/chapters/user_interface.rst:789 -msgid "You can reverse the configuration of the crossfader, so that the right deck is on the left end of the crossfader and vice versa. This is also known as *Hamster Style*. To adjust the crossfader to your style of mixing, go to :menuselection:`Preferences --> Crossfader`." +#: ../../chapters/user_interface.rst:712 +msgid "In the center of the mixer section are 4 :term:`level meters `. The two outer-most level meters are for each deck, while the 2 inner-most level meters are the left and right level meters for the master output. These should stay at the top of the green region, with the loudest parts of the music (transients) briefly going into the yellow region. They should never be in the red region. Refer to :ref:`Setting your levels properly (gain staging) ` for more details." msgstr "" -#: ../../source/chapters/user_interface.rst:794 -msgid "Using the :ref:`AutoDJ ` feature in Mixxx, you can automate the crossfade between the decks." +#: ../../chapters/user_interface.rst:727 +msgid "**Line faders**" msgstr "" -#: ../../source/chapters/user_interface.rst:800 -msgid "Play/Pause Button" +#: ../../chapters/user_interface.rst:722 +msgid "The two large faders on either side of the level meters are the deck volume faders, also known as Channel- or Line-faders. Adjusting these controls the volume of each deck." msgstr "" -#: ../../source/chapters/user_interface.rst:801 -msgid "Clicking the Play/Pause button starts and pauses the playback." +#: ../../chapters/user_interface.rst:726 +msgid "Some DJ's prefer to use the line faders over the crossfader for fading between tracks. Try it, you may like it." msgstr "" -#: ../../source/chapters/user_interface.rst:803 -msgid "The actual behavior of the Play/Pause button depends on the selected :ref:`Cue mode `." +#: ../../chapters/user_interface.rst:732 +msgid "Section Expansion Buttons" msgstr "" -#: ../../source/chapters/user_interface.rst:806 -msgid "To return to the beginning of the track, right-click on the deck's :ref:`Fast-Rewind Button `." +#: ../../chapters/user_interface.rst:741 +msgid "The section expansion buttons on top" msgstr "" -#: ../../source/chapters/user_interface.rst:812 -msgid "Cue Button" +#: ../../chapters/user_interface.rst:750 +msgid "The section expansion buttons on the bottom" msgstr "" -#: ../../source/chapters/user_interface.rst:818 -msgid "If the button is pressed while the track is playing, the play position jumps to the :term:`Cue point ` on the track and the track is paused. Once the track is paused at the Cue point, you can preview it by holding the Cue Button. If you have not moved the Cue point yet, the default point is at the track's beginning." +#: ../../chapters/user_interface.rst:752 +msgid "On top, and on the button of the user interface are the section expansion buttons." msgstr "" -#: ../../source/chapters/user_interface.rst:823 -msgid "The actual behavior of the Cue button depends on the selected :ref:`Cue mode `." +#: ../../chapters/user_interface.rst:754 +msgid "If you click on either :guilabel:`MIC`, :guilabel:`SAMPLER`, or :guilabel:`VINYL` then you will enable control sections for interacting with:" msgstr "" -#: ../../source/chapters/user_interface.rst:827 -msgid "Setting Cue points" +#: ../../chapters/user_interface.rst:757 +msgid ":ref:`interface-mic`" msgstr "" -#: ../../source/chapters/user_interface.rst:829 -msgid "Every track has a Cue point, by default on its beginning. Unlike with :ref:`Hotcues `, you can't delete, but only move Cue points." +#: ../../chapters/user_interface.rst:758 +msgid ":ref:`interface-sampler`" msgstr "" -#: ../../source/chapters/user_interface.rst:832 -msgid "The Cue point is moved according to the selected Cue mode, as explained below." +#: ../../chapters/user_interface.rst:759 +msgid ":ref:`interface-vc-mode`" msgstr "" -#: ../../source/chapters/user_interface.rst:837 -msgid "Using Cue Modes" +#: ../../chapters/user_interface.rst:761 +msgid "You can also use the specific :ref:`appendix-shortcuts`." msgstr "" -#: ../../source/chapters/user_interface.rst:839 -msgid "The Mixxx/Pioneer/Denon/Numark Cue modes gives users now even more flexibility." +#: ../../chapters/user_interface.rst:766 +msgid "Headphone and Master Mix Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:842 -msgid "Mixxx supports various Cue modes that adapt to fit other devices in your setup, or your personal preferences. The actual behavior of the Play, Pause, and Cue buttons depends on the selected Cue mode. To change the Cue mode, go to :menuselection:`Preferences --> Interface`." +#: ../../chapters/user_interface.rst:775 +msgid "The headphone and master mix knobs" msgstr "" -#: ../../source/chapters/user_interface.rst:847 -msgid "**Mixxx mode (default)**" +#: ../../chapters/user_interface.rst:779 +msgid "Headphone split cue option" msgstr "" -#: ../../source/chapters/user_interface.rst:849 -msgid "**While paused at Cue point (Cue button lit):**" +#: ../../chapters/user_interface.rst:789 +msgid "**Pre/Main Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:851 -msgid "Holding down the Cue button plays the track from the :term:`Cue point `, as long as the button is pressed. After releasing the Cue button, the track jumps back to Cue point and pauses again. Continue playback by pressing the Play/Pause button before releasing the Cue button." +#: ../../chapters/user_interface.rst:783 +msgid "Allows you to control how much of the master output you hear in your headphones. It works like a crossfader between the stereo Master and stereo Cueing signal. If the knob is set to the left, you only hear the cueing signal, which is the usual position for prelistening tracks." msgstr "" -#: ../../source/chapters/user_interface.rst:856 -msgid "**While paused not at Cue point (Cue button flashing)**:" +#: ../../chapters/user_interface.rst:788 +msgid "Don't forget to activate the :guilabel:`PFL` button on the deck you want to listen to in your headphones." msgstr "" -#: ../../source/chapters/user_interface.rst:858 -msgid "Tapping the Cue button stores the current position as new Cue point." +#: ../../chapters/user_interface.rst:796 +msgid "**Head-Split Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:860 -msgid "**While playing:**" +#: ../../chapters/user_interface.rst:792 +msgid "If activated, two mono signals are sent to the headphone output instead of one stereo signal. The master signal plays in the right channel, while the cueing signal plays in the left channel. You can still adjust the :guilabel:`Pre/Main Knob` to control the mix of the master and cue signals in the left channel." msgstr "" -#: ../../source/chapters/user_interface.rst:862 -msgid "Tapping the Cue button causes the track to instantly jump to the location of the Cue point where it pauses the playback." +#: ../../chapters/user_interface.rst:800 +msgid "**Balance Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:864 -#: ../../source/chapters/user_interface.rst:894 -msgid "Tapping the Play/Pause button pauses the track at the current position." +#: ../../chapters/user_interface.rst:799 +msgid "This knob allows you to adjust the :term:`balance` (left/right orientation) of the master output." msgstr "" -#: ../../source/chapters/user_interface.rst:866 -msgid "**Pioneer mode**" +#: ../../chapters/user_interface.rst:829 +msgid "**Master Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:868 -msgid "It is basically the same as Mixxx mode but the buttons are more flashy like a Pioneer CDJ player." +#: ../../chapters/user_interface.rst:805 +msgid "The Master Gain Knob controls the gain applied to the Master output signal that Mixxx sends to your sound card, Internet broadcasting servers, and recorded mixes. Generally, this knob should not be adjusted. To change the output volume, a gain control should be adjusted as close to the speakers as possible for the best signal-to-noise ratio throughout your signal chain. Ideally, the volume would only be adjusted by adjusting the gain on the power amplifier. On active speakers, including computer speakers, studio monitors, and PA systems that do not require a separate amplifier, this means adjusting the gain on the speakers (which may be labeled \"Volume\")." msgstr "" -#: ../../source/chapters/user_interface.rst:870 -msgid "The Play/Pause button flashes once per second when a track is paused." +#: ../../chapters/user_interface.rst:815 +msgid "As a DJ, you may not have access to the power amplifier. In that case, adjust the volume by adjusting the gain on the equipment closest to the power amplifier that you have access to. Typically, this is a DJ mixer. If you are not going through a mixer, adjust the gain of your sound card. If your sound card does not have any controls on it (for example, for sound cards built into computers), adjust the sound card settings with your :term:`OS ` mixer program. The Master Gain Knob in Mixxx should be a last resort for adjusting volume." msgstr "" -#: ../../source/chapters/user_interface.rst:871 -msgid "The Cue button flashes twice a second when the next push will move the Cue point." +#: ../../chapters/user_interface.rst:824 +msgid "**In no case should any part of the signal chain be clipping, indicated by a level meter going into its red region or an LED labeled \"clipping\" turning on.**" msgstr "" -#: ../../source/chapters/user_interface.rst:873 -msgid "**Denon mode**" +#: ../../chapters/user_interface.rst:828 +#: ../../chapters/user_interface.rst:906 +msgid "For an explanation of why you should set your gains this way, see :ref:`Setting your levels properly (gain staging) `." msgstr "" -#: ../../source/chapters/user_interface.rst:875 -msgid "**After track load:** Track is paused." +#: ../../chapters/user_interface.rst:840 +msgid "**Head Gain Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:876 -msgid "**While paused at Cue point (Cue button lit)**:" +#: ../../chapters/user_interface.rst:832 +msgid "This knob controls the gain applied to the headphone output signal that Mixxx sends to your sound card. Generally, this knob should not be adjusted. To adjust the volume in your headphones, adjust your sound card's gain on the headphone output. Most external sound cards have a gain knob specifically for the headphone jack. If you use an onboard sound card for your headphones, adjust the gain control in your :term:`OS ` mixer program. If your sound card only has one gain knob that controls both the main output and the headphone output, then adjust the :guilabel:`Head Gain` knob in Mixxx to control the volume of your headphones without affecting your main output." msgstr "" -#: ../../source/chapters/user_interface.rst:878 -msgid "Holding down the Cue button plays the track from the Cue point, as long as the button is pressed. After releasing the Cue button, the track jumps back to Cue point and pauses again. Continue playback by pressing the Play/Pause button before releasing the Cue button." +#: ../../chapters/user_interface.rst:845 +msgid "PFL/Headphone Button" msgstr "" -#: ../../source/chapters/user_interface.rst:882 -msgid "Tapping the Play/Pause button starts the track at the current position." +#: ../../chapters/user_interface.rst:854 +msgid "The headphone buttons of both decks in the mixer" msgstr "" -#: ../../source/chapters/user_interface.rst:884 -msgid "**While paused not at Cue point (Play button flashing)**:" +#: ../../chapters/user_interface.rst:856 +msgid "The headphone button is also known as the :term:`pre-fader listen or PFL ` button and allows you to use headphone cueing. That is, it allows you to hear the track you will play next in your headphones before your audience hears it. This helps you plan when to start the next track and manipulate it to make it blend better with the currently playing track (for example, by synchronizing the beats, setting a loop, or using EQs). Pressing the PFL button plays the track on the headphone output at full volume regardless of the position of the crossfader or the deck’s line fader. To play a track in your headphones but not have the audience hear it, press the PFL button and move the crossfader all the way to the opposite side of the deck or turn the deck’s volume fader all the way down." msgstr "" -#: ../../source/chapters/user_interface.rst:886 -msgid "Tapping the Cue button moves the track back to Cue point." +#: ../../chapters/user_interface.rst:868 +msgid "Headphone cueing is only available if you have configured a Headphone Output in :menuselection:`Preferences --> Sound Hardware`." msgstr "" -#: ../../source/chapters/user_interface.rst:887 -msgid "Tab the Play/Pause button to start playing. The Cue point moves to the position where the track was started." +#: ../../chapters/user_interface.rst:871 +msgid "If you use an external hardware mixer, plug your headphones into that rather than your sound card. Use the headphone buttons on the mixer rather than the buttons in Mixxx." msgstr "" -#: ../../source/chapters/user_interface.rst:890 -msgid "**While playing**:" +#: ../../chapters/user_interface.rst:878 +msgid "Equalizers and Gain Knobs" msgstr "" -#: ../../source/chapters/user_interface.rst:892 -msgid "Tapping the Cue button causes the track to instantly jump to the location of the cue point where it pauses the playback." +#: ../../chapters/user_interface.rst:887 +msgid "EQ Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:896 -msgid "**Numark mode**" +#: ../../chapters/user_interface.rst:907 +#: ../../chapters/user_interface.rst:1053 +msgid "**Gain Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:898 -msgid "It is basically the same as Denon mode but without a flashing Play/Pause button." +#: ../../chapters/user_interface.rst:890 +msgid "The gain knob allows you to adjust the gain applied to the deck. Use this to compensate for the differences in recording levels between tracks. In general, you should adjust this knob so that the track's :term:`level meter` stays around the top of the green region with the loudest parts of the track (the transients) briefly going into the yellow region. **Do NOT turn the Gain Knob up so much that the level meter is in the red region. At this point the track is clipping, which sounds bad and could damage equipment.**" msgstr "" -#: ../../source/chapters/user_interface.rst:900 -msgid "This mode is useful if you want to implement a custom skin with 3-button decks, featuring a Cue button, a dedicated Pause button, and a Play/Stutter button." +#: ../../chapters/user_interface.rst:898 +msgid "By default, Mixxx automatically applies an additional ReplayGain so tracks have approximately equal loudness at unity gain. Your tracks must be :ref:`analyzed ` to take advantage of this feature. When an unanalyzed track is loaded, Mixxx calculates its ReplayGain value, but will not apply a newly calculated ReplayGain value to a track after it has already started playing (to avoid a sudden change in the gain of a playing track)." msgstr "" -#: ../../source/chapters/user_interface.rst:903 -msgid "Use the :ref:`interface-hotcues` to place more reference points on a track." +#: ../../chapters/user_interface.rst:917 +msgid "**EQ Knobs**" msgstr "" -#: ../../source/chapters/user_interface.rst:906 -msgid "You can also use keyboard shortcuts for Cueing. Go to :ref:`control-keyboard` for more information." +#: ../../chapters/user_interface.rst:910 +msgid "The low, mid, and high EQ knobs allow you to change the filters of the audio. This allows you to selectively reduce or boost certain frequency ranges of the audio." +msgstr "" + +#: ../../chapters/user_interface.rst:914 +msgid "Be careful not to raise the EQs so much that the signal clips, indicated by a :term:`level meter` being in the red region. See :ref:`Setting your levels properly (gain staging) ` for a more detailed explanation." +msgstr "" + +#: ../../chapters/user_interface.rst:924 +msgid "**Kill Switches**" +msgstr "" + +#: ../../chapters/user_interface.rst:920 +msgid "The small boxes next to each EQ knob are called :term:`kills `. Hold these buttons to fully remove that frequency range. Short click on the buttons for latching. When in Latch mode, click again to restore the frequency range. If the Kill switches do not work as expected, check the high/low shelf EQ settings in the preferences." +msgstr "" + +#: ../../chapters/user_interface.rst:926 +msgid "You can customize the EQ settings in :menuselection:`Preferences --> Equalizer`." +msgstr "" + +#: ../../chapters/user_interface.rst:932 +msgid "Crossfader" +msgstr "" + +#: ../../chapters/user_interface.rst:941 +msgid "The crossfader section of the mixer" +msgstr "" + +#: ../../chapters/user_interface.rst:943 +msgid "The :term:`crossfader` determines the actual volume of each deck when moving the slider from left to right. If both decks are playing and the crossfader is in its default center position, then you will hear both decks. Right-clicking on the crossfader will reset the slider to its default position." msgstr "" -#: ../../source/chapters/user_interface.rst:912 +#: ../../chapters/user_interface.rst:948 +msgid "You can reverse the configuration of the crossfader, so that the right deck is on the left end of the crossfader and vice versa. This is also known as *Hamster Style*. To adjust the crossfader to your style of mixing, go to :menuselection:`Preferences --> Crossfader`." +msgstr "" + +#: ../../chapters/user_interface.rst:953 +msgid "Using the :ref:`AutoDJ ` feature in Mixxx, you can automate the crossfade between the decks." +msgstr "" + +#: ../../chapters/user_interface.rst:959 msgid "The Sampler Section" msgstr "" -#: ../../source/chapters/user_interface.rst:921 +#: ../../chapters/user_interface.rst:968 msgid "A sample deck" msgstr "" -#: ../../source/chapters/user_interface.rst:923 +#: ../../chapters/user_interface.rst:970 msgid "Samplers are miniature decks. They allow you to play short samples and jingles but also additional tracks in your mix. They come with a small overview waveform and a limited number of controls. All controls work just like on the regular decks, see :ref:`interface-decks`." msgstr "" -#: ../../source/chapters/user_interface.rst:928 -msgid "The Sampler section is **hidden** in the default :ref:`Mixxx user interface `. Click the :ref:`SAMPLER ` button in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section." +#: ../../chapters/user_interface.rst:975 +msgid "The Sampler section can be **hidden** in the :ref:`Mixxx user interface `. Click the :ref:`SAMPLER ` button, or use the specific :ref:`appendix-shortcuts` to show or hide the section." msgstr "" -#: ../../source/chapters/user_interface.rst:934 +#: ../../chapters/user_interface.rst:981 msgid "Waveform Display" msgstr "" -#: ../../source/chapters/user_interface.rst:937 +#: ../../chapters/user_interface.rst:984 msgid "The waveform shows the various markers within the track as well as the waveform envelope of the entire track. Clicking somewhere on the waveform allows you to jump to an arbitrary position in the track." msgstr "" -#: ../../source/chapters/user_interface.rst:942 +#: ../../chapters/user_interface.rst:989 msgid "While mixing, some additional markers can appear on the waveforms:" msgstr "" -#: ../../source/chapters/user_interface.rst:944 +#: ../../chapters/user_interface.rst:991 msgid "**Position marker**: A vertical line indicates the playback point of the sample deck." msgstr "" -#: ../../source/chapters/user_interface.rst:954 +#: ../../chapters/user_interface.rst:1001 msgid "**Track Artist/Title**" msgstr "" -#: ../../source/chapters/user_interface.rst:953 +#: ../../chapters/user_interface.rst:1000 msgid "The artist and title of the track that was loaded into a sampler deck is displayed here." msgstr "" -#: ../../source/chapters/user_interface.rst:957 +#: ../../chapters/user_interface.rst:1004 msgid "The number at the top right is the effective :term:`BPM` of the track. Tap the BPM to set the BPM to the speed you are tapping." msgstr "" -#: ../../source/chapters/user_interface.rst:962 +#: ../../chapters/user_interface.rst:1009 msgid "The buttons grid next to the waveform overview allow you to configure the sampler deck. Starting from the top-left and moving counterclockwise the buttons are as follows:" msgstr "" -#: ../../source/chapters/user_interface.rst:971 +#: ../../chapters/user_interface.rst:1018 msgid "Clicking this button ejects the track from the deck." msgstr "" -#: ../../source/chapters/user_interface.rst:974 -#: ../../source/chapters/user_interface.rst:1116 +#: ../../chapters/user_interface.rst:1021 +#: ../../chapters/user_interface.rst:1164 msgid "**Mix Orientation Toggle**" msgstr "" -#: ../../source/chapters/user_interface.rst:974 +#: ../../chapters/user_interface.rst:1021 msgid "This control determines the sampler input's mix orientation." msgstr "" -#: ../../source/chapters/user_interface.rst:977 +#: ../../chapters/user_interface.rst:1024 msgid ":term:`Keylock ` locks the track's pitch so that adjustments to its tempo via the rate slider do not affect its pitch." msgstr "" -#: ../../source/chapters/user_interface.rst:981 +#: ../../chapters/user_interface.rst:1028 msgid "Sample Deck Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:987 +#: ../../chapters/user_interface.rst:1034 msgid "**Play/Pause button**" msgstr "" -#: ../../source/chapters/user_interface.rst:984 +#: ../../chapters/user_interface.rst:1031 msgid "Clicking the button always starts playback from the :term:`cue point `. If playback is already enabled the play position will jump back to the :term:`cue point `. Right-clicking on the button will stop playback and seek the play position to the beginning of the sample." msgstr "" -#: ../../source/chapters/user_interface.rst:990 +#: ../../chapters/user_interface.rst:1037 msgid "**Sync Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:990 +#: ../../chapters/user_interface.rst:1037 msgid "Syncs the Sampler deck to a regular deck, as described in :ref:`interface-rate`." msgstr "" -#: ../../source/chapters/user_interface.rst:992 +#: ../../chapters/user_interface.rst:1039 msgid "**Left-Click**: Changes the :term:`rate` of the track so that the :term:`BPM` and :term:`phase` of the track matches the sync target." msgstr "" -#: ../../source/chapters/user_interface.rst:994 +#: ../../chapters/user_interface.rst:1041 msgid "**Right-Click**: Only changes the :term:`rate` of the track to match the sync target but does not adjust the :term:`phase`." msgstr "" -#: ../../source/chapters/user_interface.rst:999 +#: ../../chapters/user_interface.rst:1046 msgid "**Hotcue Controls**" msgstr "" -#: ../../source/chapters/user_interface.rst:998 +#: ../../chapters/user_interface.rst:1045 msgid "To jump in between different parts of a sample, you can use these numbered hotcue buttons." msgstr "" -#: ../../source/chapters/user_interface.rst:1003 +#: ../../chapters/user_interface.rst:1050 msgid "**PFL/Headphone Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:1002 +#: ../../chapters/user_interface.rst:1049 msgid "If active, the :term:`pre-fader listen or PFL ` button allows you to listen to the track in your headphones." msgstr "" -#: ../../source/chapters/user_interface.rst:1006 +#: ../../chapters/user_interface.rst:1053 msgid "Allows you to adjust the gain applied to the track." msgstr "" -#: ../../source/chapters/user_interface.rst:1009 +#: ../../chapters/user_interface.rst:1056 msgid "**Level Meter**" msgstr "" -#: ../../source/chapters/user_interface.rst:1009 +#: ../../chapters/user_interface.rst:1056 msgid "Shows the level of the signal and can be adjusted with the Gain knob." msgstr "" -#: ../../source/chapters/user_interface.rst:1012 +#: ../../chapters/user_interface.rst:1059 msgid "The slider allows you to change the speed of the sample. Right-clicking on the slider will reset the tempo to its original value." msgstr "" -#: ../../source/chapters/user_interface.rst:1018 +#: ../../chapters/user_interface.rst:1065 msgid "The Effects Section" msgstr "" -#: ../../source/chapters/user_interface.rst:1029 -msgid "A Effect Chain" -msgstr "" - -#: ../../source/chapters/user_interface.rst:1031 +#: ../../chapters/user_interface.rst:1079 msgid "Effect chains allow you to apply various effects to your mix. You can either add the effects to the master-output or individually for each deck." msgstr "" -#: ../../source/chapters/user_interface.rst:1034 +#: ../../chapters/user_interface.rst:1082 msgid "The Effects section is **hidden** in the default :ref:`Mixxx user interface ` to save room on small screens. Click the :ref:`EFFECTS ` button in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section." msgstr "" -#: ../../source/chapters/user_interface.rst:1039 +#: ../../chapters/user_interface.rst:1087 msgid "As an advanced user, you can route your audio signal to external software and then apply additional effects. Go to :ref:`advanced-external-fx` for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:1044 +#: ../../chapters/user_interface.rst:1092 msgid "General Effects Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:1047 +#: ../../chapters/user_interface.rst:1095 msgid "**Eject Effect Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:1047 +#: ../../chapters/user_interface.rst:1095 msgid "Eject the currently loaded effect." msgstr "" -#: ../../source/chapters/user_interface.rst:1050 +#: ../../chapters/user_interface.rst:1098 msgid "**Effect on/off Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:1050 +#: ../../chapters/user_interface.rst:1098 msgid "Turn the effect on or off." msgstr "" -#: ../../source/chapters/user_interface.rst:1053 +#: ../../chapters/user_interface.rst:1101 msgid "**Select Buttons**" msgstr "" -#: ../../source/chapters/user_interface.rst:1053 +#: ../../chapters/user_interface.rst:1101 msgid "Select an effect." msgstr "" -#: ../../source/chapters/user_interface.rst:1056 +#: ../../chapters/user_interface.rst:1104 msgid "**Mix Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:1056 +#: ../../chapters/user_interface.rst:1104 msgid "Allows to decide how **strong** the effect should be." msgstr "" -#: ../../source/chapters/user_interface.rst:1060 +#: ../../chapters/user_interface.rst:1108 msgid "**Channel Buttons**" msgstr "" -#: ../../source/chapters/user_interface.rst:1059 +#: ../../chapters/user_interface.rst:1107 msgid "Select if the effect should be applied to master/pfl or different decks. The buttons will light up if the effect is applied to a specific deck." msgstr "" -#: ../../source/chapters/user_interface.rst:1063 +#: ../../chapters/user_interface.rst:1111 msgid "Specific Effect Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:1065 +#: ../../chapters/user_interface.rst:1113 msgid "Each effect provides it's own set of controls, see the :ref:`Use Effects ` section for more information." msgstr "" -#: ../../source/chapters/user_interface.rst:1071 +#: ../../chapters/user_interface.rst:1119 msgid "The Microphone Section" msgstr "" -#: ../../source/chapters/user_interface.rst:1083 +#: ../../chapters/user_interface.rst:1131 msgid "The Microphone section" msgstr "" -#: ../../source/chapters/user_interface.rst:1085 +#: ../../chapters/user_interface.rst:1133 msgid "The microphone section is **hidden** in the default :ref:`Mixxx user interface `. Click the :ref:`MIC ` button in the mixer section, or use the specific :ref:`appendix-shortcuts` to show or hide the section." msgstr "" -#: ../../source/chapters/user_interface.rst:1090 +#: ../../chapters/user_interface.rst:1138 msgid "**Setup the microphone**" msgstr "" -#: ../../source/chapters/user_interface.rst:1092 +#: ../../chapters/user_interface.rst:1140 msgid "Microphone can accept stereo or mono input now." msgstr "" -#: ../../source/chapters/user_interface.rst:1095 +#: ../../chapters/user_interface.rst:1143 msgid "Most computers have built-in microphones, while some are connected through USB. These work adequately, but don't expect them to be high-quality." msgstr "" -#: ../../source/chapters/user_interface.rst:1097 +#: ../../chapters/user_interface.rst:1145 msgid "The best solution is to connect a good external microphone to the “Mic” or “Line” input on your audio device. If available, use the “Gain” knob on the device to adjust the input signal." msgstr "" -#: ../../source/chapters/user_interface.rst:1100 +#: ../../chapters/user_interface.rst:1148 msgid "Select the microphone input in :menuselection:`Preference --> Sound Hardware --> Input --> Microphone` and click :guilabel:`Apply`." msgstr "" -#: ../../source/chapters/user_interface.rst:1105 +#: ../../chapters/user_interface.rst:1153 msgid "Microphone Controls" msgstr "" -#: ../../source/chapters/user_interface.rst:1111 +#: ../../chapters/user_interface.rst:1159 msgid "**Talk Button**" msgstr "" -#: ../../source/chapters/user_interface.rst:1108 +#: ../../chapters/user_interface.rst:1156 msgid "Hold this button and talk to mix the microphone input into the Mixxx master output. Short click on the button for latching. This is handy for talking for an extended period, for example when :ref:`streaming ` a radio show. When in Latch mode, click again to mute the microphone input." msgstr "" -#: ../../source/chapters/user_interface.rst:1114 +#: ../../chapters/user_interface.rst:1162 msgid "This control determines the microphone input's mix orientation. Either to the left side of crossfader, to the right side or to the center (default). Clicking cycles through all the options." msgstr "" -#: ../../source/chapters/user_interface.rst:1119 +#: ../../chapters/user_interface.rst:1167 msgid "**Microphone Volume Meter**" msgstr "" -#: ../../source/chapters/user_interface.rst:1119 +#: ../../chapters/user_interface.rst:1167 msgid "This displays the microphone volume input signal strength." msgstr "" -#: ../../source/chapters/user_interface.rst:1123 +#: ../../chapters/user_interface.rst:1171 msgid "**Microphone Gain Knob**" msgstr "" -#: ../../source/chapters/user_interface.rst:1122 +#: ../../chapters/user_interface.rst:1170 msgid "Use this knob to adjust the gain of the microphone output. Try to keep the volume at a reasonable level to avoid signal clipping." msgstr "" -#: ../../source/chapters/user_interface.rst:1128 +#: ../../chapters/user_interface.rst:1176 msgid "Preview Deck Section" msgstr "" -#: ../../source/chapters/user_interface.rst:1140 +#: ../../chapters/user_interface.rst:1188 msgid "The Preview Deck with a track loaded" msgstr "" -#: ../../source/chapters/user_interface.rst:1142 +#: ../../chapters/user_interface.rst:1190 msgid "The Preview Deck is a special deck that allows you to pre-listen to tracks in the headphones before using them in your mix. Pre-listening a track does not change the tracks's :guilabel:`Played` state as well as the play counter and is not logged in the :ref:`History `. Press :kbd:`CTRL` + :kbd:`4` (Windows/Linux) or :kbd:`CMD` + :kbd:`4` (Mac) to display the Preview Deck." msgstr "" -#: ../../source/chapters/user_interface.rst:1148 +#: ../../chapters/user_interface.rst:1196 msgid "The features in detail:" msgstr "" -#: ../../source/chapters/user_interface.rst:1150 +#: ../../chapters/user_interface.rst:1198 msgid "**Track Artist/Title**: The artist and title of the track is displayed here. This is the same listed under the :guilabel:`Track` and :guilabel:`Title` column in the Mixxx library. This information is initially loaded from the track's :term:`metadata`." msgstr "" -#: ../../source/chapters/user_interface.rst:1155 -msgid "**Eject Track**: Clicking this button ejects the track from the deck." +#: ../../chapters/user_interface.rst:1203 +msgid "**Eject Track button**: Clicking this button ejects the track from the deck." +msgstr "" + +#: ../../chapters/user_interface.rst:1206 +msgid "**Play/Pause button**: Clicking the button starts and pauses the playback. Right-clicking on the button will stop playback and seek the play position to the beginning of the tracks." msgstr "" -#: ../../source/chapters/user_interface.rst:1158 +#: ../../chapters/user_interface.rst:1211 msgid "**Waveform overview**: Shows the various markers (Cues, Hotcues) within the track as well as the waveform envelope of the entire track. Clicking somewhere on the waveform allows you to jump to an arbitrary position in the track." msgstr "" -#: ../../source/chapters/user_interface.rst:1163 -msgid "**Gain**: Move the slider to adjust the gain of the track." +#: ../../chapters/user_interface.rst:1216 +msgid "**Gain slider**: Move the slider to adjust the gain of the track." msgstr "" -#: ../../source/chapters/user_interface.rst:1166 -msgid "**VU-Meter**: Shows the current volume of the track. If it's too loud and distorted, a peak indicator flashes red." +#: ../../chapters/user_interface.rst:1219 +msgid "**Volume Meter**: Shows the current volume of the track. If it's too loud and distorted, a peak indicator flashes red." msgstr "" -#: ../../source/chapters/user_interface.rst:1170 -msgid "For more information, go to the chapter :ref:`djing-previewing-tracks`." +#: ../../chapters/user_interface.rst:1223 +msgid "For more information, go to the chapter :ref:`library-previewing-tracks`." msgstr "" diff --git a/source/locale/pot/chapters/vinyl_control.pot b/source/locale/pot/chapters/vinyl_control.pot index 69076e0788..f86a4c645f 100644 --- a/source/locale/pot/chapters/vinyl_control.pot +++ b/source/locale/pot/chapters/vinyl_control.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,532 +16,532 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/chapters/vinyl_control.rst:6 +#: ../../chapters/vinyl_control.rst:6 msgid "Vinyl Control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:13 +#: ../../chapters/vinyl_control.rst:13 msgid "Vinyl control allows a user to manipulate the playback of a track in Mixxx using a real turntable as a controller. In effect, it simulates the sound and feel of having your digital music collection on vinyl. Many DJs prefer the tactile feel of vinyl, and vinyl control allows that feel to be preserved while retaining the benefits of using digital audio." msgstr "" -#: ../../source/chapters/vinyl_control.rst:20 +#: ../../chapters/vinyl_control.rst:20 msgid "How does it work?" msgstr "" -#: ../../source/chapters/vinyl_control.rst:22 +#: ../../chapters/vinyl_control.rst:22 msgid "Vinyl control uses special :term:`timecode` records or CD's which are placed on real turntables or :term:`CDJ`. The audio output of the turntables is plugged into a soundcard connected to a computer on which Mixxx is running. When a record is played on one of the attached turntables, Mixxx reads the timecode from the record and uses the information to manipulate whatever track is loaded." msgstr "" -#: ../../source/chapters/vinyl_control.rst:34 +#: ../../chapters/vinyl_control.rst:34 msgid "What do I need to use it?" msgstr "" -#: ../../source/chapters/vinyl_control.rst:36 +#: ../../chapters/vinyl_control.rst:36 msgid "It is possible to use Mixxx's vinyl control with a variety of setups. Unlike some proprietary DJ software, Mixxx can use several types of timecode media and any soundcard that your :term:`operating system` has drivers to use. Optionally, any :ref:`MIDI/HID controller ` can be used together with timecode control. The basic setups for timecode control are:" msgstr "" -#: ../../source/chapters/vinyl_control.rst:42 +#: ../../chapters/vinyl_control.rst:42 msgid "**Setup 1: Vinyl DJ**" msgstr "" -#: ../../source/chapters/vinyl_control.rst:44 +#: ../../chapters/vinyl_control.rst:44 msgid "2-4 timecode vinyls, 2-4 turntables with phono pre-amplifiers (or line-level output), and 2-4 stereo sound inputs." msgstr "" -#: ../../source/chapters/vinyl_control.rst:47 +#: ../../chapters/vinyl_control.rst:47 msgid "Your sound card inputs must match the turntable outputs. Turntables output very quiet phono-level outputs that must be amplified for Mixxx to use. You should either find a sound card that has phono pre-amplifiers built in (one for each deck), use standalone phono pre-amplifiers, or use turntables with built in phono pre-amplifiers." msgstr "" -#: ../../source/chapters/vinyl_control.rst:53 +#: ../../chapters/vinyl_control.rst:53 msgid "You can try skipping the phono pre-amps if you use the software pre-amp in Mixxx on the Vinyl Control preferences pane. This may not work for everyone. Line-level signals are preferred and recommended." msgstr "" -#: ../../source/chapters/vinyl_control.rst:57 +#: ../../chapters/vinyl_control.rst:57 msgid "For turntables a typical setup is depicted in the figure below. First, connect the RCA cables from the turntables to the inputs on your sound card. Second, connect the outputs of your sound card to the inputs on your mixer." msgstr "" -#: ../../source/chapters/vinyl_control.rst:68 +#: ../../chapters/vinyl_control.rst:68 msgid "Using Mixxx together with turntables and external mixer" msgstr "" -#: ../../source/chapters/vinyl_control.rst:70 +#: ../../chapters/vinyl_control.rst:70 msgid "Many modern turntables have a *Line/Phono* select switch. If yours does, make sure it matches the input or switch setting on your sound card." msgstr "" -#: ../../source/chapters/vinyl_control.rst:78 +#: ../../chapters/vinyl_control.rst:78 msgid "**Setup 2: CDJ**" msgstr "" -#: ../../source/chapters/vinyl_control.rst:80 +#: ../../chapters/vinyl_control.rst:80 msgid "2-4 timecode CDs, 2-4 CD decks, and 2-4 stereo sound inputs." msgstr "" -#: ../../source/chapters/vinyl_control.rst:82 +#: ../../chapters/vinyl_control.rst:82 msgid "Setting up CDJs for use with timecode CDs is similar to setting up turntables. The figure below outlines a typical configuration. First, connect the RCA cables of the CDJs to inputs of your sound card. Second, connect the inputs of your mixer to the outputs of your sound card. Make sure the input mode of your sound card is set to *Line*." msgstr "" -#: ../../source/chapters/vinyl_control.rst:95 +#: ../../chapters/vinyl_control.rst:95 msgid "Using Mixxx together with CDJs and external mixer" msgstr "" -#: ../../source/chapters/vinyl_control.rst:97 +#: ../../chapters/vinyl_control.rst:97 msgid "**Sound inputs**" msgstr "" -#: ../../source/chapters/vinyl_control.rst:99 +#: ../../chapters/vinyl_control.rst:99 msgid "It is recommended to use a proper DJ sound card that has **multiple** stereo line inputs on it." msgstr "" -#: ../../source/chapters/vinyl_control.rst:101 +#: ../../chapters/vinyl_control.rst:101 msgid "Alternatively you can use multiple sound cards, each with a single stereo line in, but this is strongly discouraged." msgstr "" -#: ../../source/chapters/vinyl_control.rst:104 +#: ../../chapters/vinyl_control.rst:104 msgid "Mixxx supports vinyl control input through a single soundcard with at least 4-channels of input (two stereo line-in jacks), or through multiple separate soundcards which each have 2-channels of input (a single stereo line-in jack). Vinyl control requires the use of stereo line-in jacks - Mono or microphone inputs will not work." msgstr "" -#: ../../source/chapters/vinyl_control.rst:110 +#: ../../chapters/vinyl_control.rst:110 msgid "It is strongly recommended to use a soundcard that comes with native low latency drivers such as ASIO (Windows) or CoreAudio (Mac). Linux users depend on the quality of the corresponding open source driver." msgstr "" -#: ../../source/chapters/vinyl_control.rst:114 +#: ../../chapters/vinyl_control.rst:114 msgid "For best scratch performance with vinyl control, we recommend using a system capable of :term:`latencies ` of 10ms. With higher latencies the scratch sound will start to become distorted." msgstr "" -#: ../../source/chapters/vinyl_control.rst:118 +#: ../../chapters/vinyl_control.rst:118 msgid "An external hardware mixer is not required for using timecode control. You can use a :ref:`MIDI or HID controller` to mix in software instead." msgstr "" -#: ../../source/chapters/vinyl_control.rst:124 +#: ../../chapters/vinyl_control.rst:124 msgid "Supported Timecode media" msgstr "" -#: ../../source/chapters/vinyl_control.rst:126 +#: ../../chapters/vinyl_control.rst:126 msgid "You can use any of the timecode media supported by Mixxx:" msgstr "" -#: ../../source/chapters/vinyl_control.rst:129 +#: ../../chapters/vinyl_control.rst:129 msgid "Type" msgstr "" -#: ../../source/chapters/vinyl_control.rst:129 +#: ../../chapters/vinyl_control.rst:129 msgid "Responsiveness" msgstr "" -#: ../../source/chapters/vinyl_control.rst:131 +#: ../../chapters/vinyl_control.rst:131 msgid "Serato CV02 Vinyl" msgstr "" -#: ../../source/chapters/vinyl_control.rst:131 -#: ../../source/chapters/vinyl_control.rst:133 -#: ../../source/chapters/vinyl_control.rst:135 -#: ../../source/chapters/vinyl_control.rst:139 +#: ../../chapters/vinyl_control.rst:131 +#: ../../chapters/vinyl_control.rst:133 +#: ../../chapters/vinyl_control.rst:135 +#: ../../chapters/vinyl_control.rst:139 msgid "Very high" msgstr "" -#: ../../source/chapters/vinyl_control.rst:133 +#: ../../chapters/vinyl_control.rst:133 msgid "Serato CV02 CD" msgstr "" -#: ../../source/chapters/vinyl_control.rst:135 +#: ../../chapters/vinyl_control.rst:135 msgid "Traktor Scratch MK1 Vinyl" msgstr "" -#: ../../source/chapters/vinyl_control.rst:137 +#: ../../chapters/vinyl_control.rst:137 msgid "Traktor Scratch MK2 Vinyl" msgstr "" -#: ../../source/chapters/vinyl_control.rst:137 +#: ../../chapters/vinyl_control.rst:137 msgid "Not supported" msgstr "" -#: ../../source/chapters/vinyl_control.rst:139 +#: ../../chapters/vinyl_control.rst:139 msgid "MixVibes DVS V2 Vinyl" msgstr "" -#: ../../source/chapters/vinyl_control.rst:142 +#: ../../chapters/vinyl_control.rst:142 msgid "At the present time, Serato records are recommended if you are looking to buy vinyl. If you want to use CDs, you can download a free copy for personal use from `Serato`_." msgstr "" -#: ../../source/chapters/vinyl_control.rst:151 +#: ../../chapters/vinyl_control.rst:151 msgid "Configuring Input and Output devices" msgstr "" -#: ../../source/chapters/vinyl_control.rst:160 +#: ../../chapters/vinyl_control.rst:160 msgid "Mixxx preferences - Setting up Input and Output devices for Vinyl Control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:162 +#: ../../chapters/vinyl_control.rst:162 msgid "Mixxx can be controlled by up to 4 decks with either timecoded vinyl or timecoded CDs." msgstr "" -#: ../../source/chapters/vinyl_control.rst:165 +#: ../../chapters/vinyl_control.rst:165 msgid "Open :menuselection:`Preferences --> Sound Hardware`" msgstr "" -#: ../../source/chapters/vinyl_control.rst:166 +#: ../../chapters/vinyl_control.rst:166 msgid "Select the :guilabel:`Input` tab" msgstr "" -#: ../../source/chapters/vinyl_control.rst:167 +#: ../../chapters/vinyl_control.rst:167 msgid "From the :guilabel:`Vinyl Control 1` - :guilabel:`Vinyl Control 4` drop-down menus, select the soundcard(s) which your decks are plugged into" msgstr "" -#: ../../source/chapters/vinyl_control.rst:169 +#: ../../chapters/vinyl_control.rst:169 msgid "In the channel selection drop-down menu, select the channel pairs corresponding to the plug on your soundcard that your deck(s) are plugged into, typically :guilabel:`Channels 1-2` and :guilabel:`Channels 3-4` etc." msgstr "" -#: ../../source/chapters/vinyl_control.rst:172 -#: ../../source/chapters/vinyl_control.rst:176 +#: ../../chapters/vinyl_control.rst:172 +#: ../../chapters/vinyl_control.rst:176 msgid "Click :guilabel:`Apply` to save the changes." msgstr "" -#: ../../source/chapters/vinyl_control.rst:173 +#: ../../chapters/vinyl_control.rst:173 msgid "Select the :guilabel:`Output` tab" msgstr "" -#: ../../source/chapters/vinyl_control.rst:174 +#: ../../chapters/vinyl_control.rst:174 msgid "Specify :guilabel:`Deck 1` - :guilabel:`Deck 4` to route Mixxx's output directly to the external mixer" msgstr "" -#: ../../source/chapters/vinyl_control.rst:179 +#: ../../chapters/vinyl_control.rst:179 msgid "Configuring Vinyl Control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:188 +#: ../../chapters/vinyl_control.rst:188 msgid "Mixxx preferences - Setting up vinyl control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:190 +#: ../../chapters/vinyl_control.rst:190 msgid "You can configure vinyl control in :menuselection:`Preferences --> Vinyl Control`." msgstr "" -#: ../../source/chapters/vinyl_control.rst:194 -msgid "Turntable Input Preamp" +#: ../../chapters/vinyl_control.rst:194 +msgid "Turntable Input Signal Boost" msgstr "" -#: ../../source/chapters/vinyl_control.rst:196 -msgid "Many turntables provide unamplified “phono level” output which must be boosted to a “line level” signal. Normally, a mixer or soundcard provides this amplification, but if you're plugging a turntable's phono output directly into a soundcard that doesn't support phono input, Mixxx can do the amplification. The :guilabel:`Turntable Input Preamp` slider allows you to adjust the level of preamplification applied to your decks' signal. However it is always preferable to use a proper phono preamplifier if you have one." +#: ../../chapters/vinyl_control.rst:196 +msgid "Many turntables provide unamplified “phono level” output which must be boosted to a “line level” signal. Normally, a mixer or soundcard provides this amplification, but if you're plugging a turntable's phono output directly into a soundcard that doesn't support phono input, Mixxx can do the amplification. The :guilabel:`Turntable Input Signal Boost` slider allows you to adjust the level of preamplification applied to your decks' signal. However it is always preferable to use a proper phono preamplifier if you have one." msgstr "" -#: ../../source/chapters/vinyl_control.rst:205 +#: ../../chapters/vinyl_control.rst:205 msgid "Vinyl Configuration" msgstr "" -#: ../../source/chapters/vinyl_control.rst:207 +#: ../../chapters/vinyl_control.rst:207 msgid "**Vinyl Type**: Several types of timecoded media can be used to control Mixxx. Configure the drop-down menus to match what type of timecoded media you are using on your decks." msgstr "" -#: ../../source/chapters/vinyl_control.rst:210 +#: ../../chapters/vinyl_control.rst:210 msgid "**Deck Vinyl Tempo**: Change this if you prefer to scratch with your turntable or CDJ set at 45 RPM, default is 33 RPM." msgstr "" -#: ../../source/chapters/vinyl_control.rst:212 +#: ../../chapters/vinyl_control.rst:212 msgid "**Lead-in Time**: Allows you to set a dead-zone at the start of your vinyl or CD, where the time code will be ignored. This is useful in situations where the time code begins very close to the edge of a vinyl which can make back-cueing over the first beat in a track tricky to do without your turntable's needle falling off the vinyl. Setting a lead-in time of 20 seconds or more helps alleviate this by giving you more room on the vinyl to cue with. It's also useful when you've worn the grooves at the edge of a control record to the point that it no longer works reliably: you simply set the lead-in so that the start of the tracks begin in good groove area. You can keep doing this until you run out of groove area, thereby decreasing your record replacement frequency." msgstr "" -#: ../../source/chapters/vinyl_control.rst:223 +#: ../../chapters/vinyl_control.rst:223 msgid "**Show Signal Quality in Skins**: If enabled, a circular representation of the incoming timecode signal is displayed in real-time on the :ref:`Vinyl Widget ` in the Mixxx Interface." msgstr "" -#: ../../source/chapters/vinyl_control.rst:227 +#: ../../chapters/vinyl_control.rst:227 msgid "Although not recommended, you can use different kinds of timecode media per deck." msgstr "" -#: ../../source/chapters/vinyl_control.rst:233 +#: ../../chapters/vinyl_control.rst:233 msgid "Control Mode" msgstr "" -#: ../../source/chapters/vinyl_control.rst:235 +#: ../../chapters/vinyl_control.rst:235 msgid "Mixxx has three control modes regardless of which control records you use." msgstr "" -#: ../../source/chapters/vinyl_control.rst:237 +#: ../../chapters/vinyl_control.rst:237 msgid "**Absolute Mode**: Provides Mixxx with both pitch and position information from the timecode, and allows you to seek by needle dropping on your vinyl or seeking on your CDJ." msgstr "" -#: ../../source/chapters/vinyl_control.rst:240 +#: ../../chapters/vinyl_control.rst:240 msgid "**Relative Mode**: Takes the position to be relative to your deck's starting point, and only controls the pitch in Mixxx. It is not possible to seek using your deck in relative mode, with one exception. If you drop the needle in the :guilabel:`Lead-in Time` area (see `Vinyl Configuration`_), Mixxx will seek back to the beginning of the track. Once a track is playing in Relative Mode, Mixxx will not allow you to select Absolute mode. Otherwise, the track would suddenly jump to a new position. Make sure the record is stopped and then you're free to select Absolute mode." msgstr "" -#: ../../source/chapters/vinyl_control.rst:248 +#: ../../chapters/vinyl_control.rst:248 msgid "**Constant Mode**: This special mode is usually only activated when Mixxx needs to keep playing a track even if the vinyl control signal isn't present. Constant mode is automatically enabled when the needle reaches the end of a vinyl control record." msgstr "" -#: ../../source/chapters/vinyl_control.rst:254 +#: ../../chapters/vinyl_control.rst:254 msgid "Cueing Modes" msgstr "" -#: ../../source/chapters/vinyl_control.rst:256 +#: ../../chapters/vinyl_control.rst:256 msgid "Mixxx has two optional cueing modes for vinyl control which **only** apply to **Relative Mode**. These modes are useful for quickly seeking to specific positions in a track without touching the laptop. Turntablists often need to find a break or a vocal sample, and cueing modes make these easy to find." msgstr "" -#: ../../source/chapters/vinyl_control.rst:261 +#: ../../chapters/vinyl_control.rst:261 msgid "**Cue**: In this mode, when you drop the needle on the record *after* the Cue point, Mixxx will seek to that cue point." msgstr "" -#: ../../source/chapters/vinyl_control.rst:263 +#: ../../chapters/vinyl_control.rst:263 msgid "**Hot Cue**: When the needle is dropped Mixxx will seek to the nearest hotcue point, working backwards. So if you have a hotcue at the one-minute mark, and another at the two-minute mark, you can drop the needle anywhere between one and two minutes and Mixxx will seek to the one-minute hotcue." msgstr "" -#: ../../source/chapters/vinyl_control.rst:268 +#: ../../chapters/vinyl_control.rst:268 msgid "You can change the Control and Cueing Modes directly in the Mixxx user interface while mixing, go to :ref:`interface-vc-mode`. Alternatively, use the :ref:`appendix-shortcuts`." msgstr "" -#: ../../source/chapters/vinyl_control.rst:275 +#: ../../chapters/vinyl_control.rst:275 msgid "Signal Quality" msgstr "" -#: ../../source/chapters/vinyl_control.rst:277 +#: ../../chapters/vinyl_control.rst:277 msgid "A successful vinyl control setup hinges on good signal quality. Many factors can affect signal quality, but the most important one is ensuring the volume level of your timecode signal is moderate. A signal that is too loud or too quiet will cause adverse performance, often characterized by a loss of position data causing absolute mode to behave like relative mode." msgstr "" -#: ../../source/chapters/vinyl_control.rst:283 +#: ../../chapters/vinyl_control.rst:283 msgid "Mixxx represents the quality of the timecode signal as a circular graphic coming from the vinyl control audio itself. The graphs correspond to your active input devices :guilabel:`Deck 1` - :guilabel:`Deck 4` ." msgstr "" -#: ../../source/chapters/vinyl_control.rst:287 +#: ../../chapters/vinyl_control.rst:287 msgid "If your vinyl signal is working, you should see a round, green circle drawn with two lines. This vinyl “doughnut” should be as circular as possible, and the lines should be clear with a minimum amount of fuzz." msgstr "" -#: ../../source/chapters/vinyl_control.rst:291 +#: ../../chapters/vinyl_control.rst:291 msgid "You can display the signal quality in the Mixxx user interface while mixing, see :ref:`vinyl-control-config` ." msgstr "" -#: ../../source/chapters/vinyl_control.rst:295 +#: ../../chapters/vinyl_control.rst:295 msgid "Enabling Vinyl Control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:297 +#: ../../chapters/vinyl_control.rst:297 msgid "For each deck, select :menuselection:`Options --> Vinyl Control --> Enable Vinyl Control`, or use the :ref:`appendix-shortcuts`." msgstr "" -#: ../../source/chapters/vinyl_control.rst:301 +#: ../../chapters/vinyl_control.rst:301 msgid "Vinyl Control Status Display" msgstr "" -#: ../../source/chapters/vinyl_control.rst:310 +#: ../../chapters/vinyl_control.rst:310 msgid "The vinyl control status, and signal quality display of the deck" msgstr "" -#: ../../source/chapters/vinyl_control.rst:312 +#: ../../chapters/vinyl_control.rst:312 msgid "A rectangle provides visual feedback with regards to vinyl control status of a deck." msgstr "" -#: ../../source/chapters/vinyl_control.rst:315 +#: ../../chapters/vinyl_control.rst:315 msgid "**Off**: Vinyl control disabled on the deck." msgstr "" -#: ../../source/chapters/vinyl_control.rst:316 +#: ../../chapters/vinyl_control.rst:316 msgid "**Green**: Vinyl control is enabled on the deck." msgstr "" -#: ../../source/chapters/vinyl_control.rst:317 +#: ../../chapters/vinyl_control.rst:317 msgid "**Yellow**: The needle has reached End-Of-Record." msgstr "" -#: ../../source/chapters/vinyl_control.rst:320 +#: ../../chapters/vinyl_control.rst:320 msgid "Single Deck Control" msgstr "" -#: ../../source/chapters/vinyl_control.rst:322 +#: ../../chapters/vinyl_control.rst:322 msgid "If you only have one turntable, you can still use Mixxx to play your sets. In the :menuselection:`Preferences --> Sound Hardware --> Input` tab, use the same audio input for both :guilabel:`Vinyl Control` decks." msgstr "" -#: ../../source/chapters/vinyl_control.rst:326 +#: ../../chapters/vinyl_control.rst:326 msgid "When mixing, you'll have one track playing automatically while the other is controlled by the turntable. Start by enabling vinyl control on the first deck, and start mixing. When you're ready to cue up the next record, just disable vinyl control on the first deck and enable it on the second deck. Playback will continue on the first deck without interruption. Cue up the second track and mix it in. When you're ready to cue the first deck again, just toggle the second deck off and the first deck on again." msgstr "" -#: ../../source/chapters/vinyl_control.rst:334 +#: ../../chapters/vinyl_control.rst:334 msgid "Use the :ref:`appendix-shortcuts` to swap focus from one deck to the other. Alternatively, select :menuselection:`Vinyl --> Single Deck mode` in the :ref:`advanced-controller-wizard`, to assign the control to a key on your controller." msgstr "" -#: ../../source/chapters/vinyl_control.rst:340 +#: ../../chapters/vinyl_control.rst:340 msgid "End-Of-Record Mode" msgstr "" -#: ../../source/chapters/vinyl_control.rst:342 +#: ../../chapters/vinyl_control.rst:342 msgid "Sometimes the track you are playing is longer than the timecode area on your record. If the needle reaches the end of the vinyl timecode, Mixxx will enter a special *End-Of-Record Mode*. When this happens, the vinyl indicator (usually a green rectangle) will blink yellow as a warning. At the same time, Mixxx will automatically enable *Constant Mode* and will ignore the turntable's pitch. At this point the track will simply continue playing until the end. When you load a new track, *End-Of-Record Mode* will be automatically disabled and *Constant Mode* turned off." msgstr "" -#: ../../source/chapters/vinyl_control.rst:351 +#: ../../chapters/vinyl_control.rst:351 msgid "When you're in *End-Of-Record Mode* and you want to still use the turntable for pitch control, simply lift the needle and place it anywhere in the main timecode area. It's OK, the track won't stop playing. As soon as Mixxx detects that the needle has settled, it will automatically switch to *Relative Mode*." msgstr "" -#: ../../source/chapters/vinyl_control.rst:357 +#: ../../chapters/vinyl_control.rst:357 msgid "Control Track" msgstr "" -#: ../../source/chapters/vinyl_control.rst:359 +#: ../../chapters/vinyl_control.rst:359 msgid "Some vinyl control records have a special portion of grooves near the center of the record for selecting and loading tracks in the user interface. You can see these grooves because there is a gap between the main timecode area and the inner circle. Some control records have not been tested with Mixxx, and their control areas are not supported. Serato CV02 Vinyl and Traktor Vinyl MK1 are known to work. Serato CV02 CDs are known not to work." msgstr "" -#: ../../source/chapters/vinyl_control.rst:366 +#: ../../chapters/vinyl_control.rst:366 msgid "Just drop the needle in the control area and let the record play forward or backward. The highlighted row in the library should move up or down. Simply lift the needle and drop it anywhere in the main timecode area to load the track." msgstr "" -#: ../../source/chapters/vinyl_control.rst:372 -#: ../../source/chapters/vinyl_control.rst:395 +#: ../../chapters/vinyl_control.rst:372 +#: ../../chapters/vinyl_control.rst:395 msgid "Troubleshooting" msgstr "" -#: ../../source/chapters/vinyl_control.rst:374 +#: ../../chapters/vinyl_control.rst:374 msgid "**Configuration**" msgstr "" -#: ../../source/chapters/vinyl_control.rst:376 +#: ../../chapters/vinyl_control.rst:376 msgid "To complete your setup you must configure Mixxx properly. Make sure you have:" msgstr "" -#: ../../source/chapters/vinyl_control.rst:378 +#: ../../chapters/vinyl_control.rst:378 msgid "specified :guilabel:`Deck 1` - :guilabel:`Deck 4` in :menuselection:`Preferences --> Sound Hardware` to route Mixxx's output directly to the external mixer" msgstr "" -#: ../../source/chapters/vinyl_control.rst:381 +#: ../../chapters/vinyl_control.rst:381 msgid "specified :guilabel:`Vinyl Control 1` - :guilabel:`Vinyl Control 4` under :menuselection:`Preferences --> Sound Hardware --> Input`" msgstr "" -#: ../../source/chapters/vinyl_control.rst:383 +#: ../../chapters/vinyl_control.rst:383 msgid "selected the correct control type under :menuselection:`Preferences --> Vinyl Control --> Vinyl type` in the preferences. See the list of `Supported Timecode media`_" msgstr "" -#: ../../source/chapters/vinyl_control.rst:386 +#: ../../chapters/vinyl_control.rst:386 msgid "enabled vinyl control via the menu under :menuselection:`Options -> Vinyl Control --> Enable Vinyl Control`." msgstr "" -#: ../../source/chapters/vinyl_control.rst:389 +#: ../../chapters/vinyl_control.rst:389 msgid "**Signal Quality**" msgstr "" -#: ../../source/chapters/vinyl_control.rst:391 +#: ../../chapters/vinyl_control.rst:391 msgid "The graph is displayed in :menuselection:`Preferences --> Vinyl Control`, see :ref:`vinyl-control-signal-quality`." msgstr "" -#: ../../source/chapters/vinyl_control.rst:395 +#: ../../chapters/vinyl_control.rst:395 msgid "Signal" msgstr "" -#: ../../source/chapters/vinyl_control.rst:395 +#: ../../chapters/vinyl_control.rst:395 msgid "Meaning" msgstr "" -#: ../../source/chapters/vinyl_control.rst:397 +#: ../../chapters/vinyl_control.rst:397 msgid "|miss_config|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:397 +#: ../../chapters/vinyl_control.rst:397 msgid "Vinyl control input channels not correctly set up. Vinyl control will not work." msgstr "" -#: ../../source/chapters/vinyl_control.rst:397 +#: ../../chapters/vinyl_control.rst:397 msgid "Open Preferences/ Sound Hardware and set up the devices you want to use, see `Configuring Input and Output devices`_" msgstr "" -#: ../../source/chapters/vinyl_control.rst:402 +#: ../../chapters/vinyl_control.rst:402 msgid "|no_signal|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:402 +#: ../../chapters/vinyl_control.rst:402 msgid "Vinyl control input channels set up correctly. Waiting for timecode input signal." msgstr "" -#: ../../source/chapters/vinyl_control.rst:402 +#: ../../chapters/vinyl_control.rst:402 msgid "Start your turntable or CDJ with the selected timecode vinyl or CD." msgstr "" -#: ../../source/chapters/vinyl_control.rst:406 +#: ../../chapters/vinyl_control.rst:406 msgid "|ok|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:406 +#: ../../chapters/vinyl_control.rst:406 msgid "Nearly perfect green doughnut about about half the width of the graph. Rotating radar sweeps in the direction your record on the turntable is spinning." msgstr "" -#: ../../source/chapters/vinyl_control.rst:406 +#: ../../chapters/vinyl_control.rst:406 msgid "Everything is OK, nothing to do. Go spin some beats." msgstr "" -#: ../../source/chapters/vinyl_control.rst:412 +#: ../../chapters/vinyl_control.rst:412 msgid "|wrong_type|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:412 +#: ../../chapters/vinyl_control.rst:412 msgid "Incorrect choice of vinyl control source. Doughnut looks good but has a solid red color." msgstr "" -#: ../../source/chapters/vinyl_control.rst:412 +#: ../../chapters/vinyl_control.rst:412 msgid "Select the correct vinyl type in the preferences. E.g. maybe you selected side B of the Serato Vinyl but your record is on side A." msgstr "" -#: ../../source/chapters/vinyl_control.rst:417 +#: ../../chapters/vinyl_control.rst:417 msgid "|bad_signal|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:417 +#: ../../chapters/vinyl_control.rst:417 msgid "Input signal is bad. As the vinyl signal gets worse, you'll see the color of the doughnut change from green over orange to red." msgstr "" -#: ../../source/chapters/vinyl_control.rst:417 +#: ../../chapters/vinyl_control.rst:417 msgid "Check the wiring / grounding on your turntable / CDJ. You timecode record / CD might be worn out or the needle on your turntable is dirty." msgstr "" -#: ../../source/chapters/vinyl_control.rst:422 +#: ../../chapters/vinyl_control.rst:422 msgid "|wrong_dir|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:422 +#: ../../chapters/vinyl_control.rst:422 msgid "Wrong direction. The green doughnut looks good but the radar sweeps in the opposite direction of the record on your turntable / CDJ." msgstr "" -#: ../../source/chapters/vinyl_control.rst:422 +#: ../../chapters/vinyl_control.rst:422 msgid "You probably have a wiring problem. Try reversing the left and right inputs on your turntable. You may also have to rewire the headshell." msgstr "" -#: ../../source/chapters/vinyl_control.rst:427 +#: ../../chapters/vinyl_control.rst:427 msgid "|not_timecode|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:427 +#: ../../chapters/vinyl_control.rst:427 msgid "Input signal is no timecode signal. Mixxx receives a normal audio signal while it expects a timecode signal." msgstr "" -#: ../../source/chapters/vinyl_control.rst:427 +#: ../../chapters/vinyl_control.rst:427 msgid "Start your turntable or CDJ with the selected timecode vinyl or CD. You may want to check if the inputs devices are set up correctly in the preferences." msgstr "" -#: ../../source/chapters/vinyl_control.rst:433 +#: ../../chapters/vinyl_control.rst:433 msgid "|unbalanced|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:433 +#: ../../chapters/vinyl_control.rst:433 msgid "Left or right channel is missing. Mixxx receives only a mono signal but needs a stereo timecode signal to operate." msgstr "" -#: ../../source/chapters/vinyl_control.rst:433 +#: ../../chapters/vinyl_control.rst:433 msgid "Check the wiring on your turntable / CDJ and also the headshell and needle on your turntable." msgstr "" -#: ../../source/chapters/vinyl_control.rst:438 +#: ../../chapters/vinyl_control.rst:438 msgid "|too_loud|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:438 +#: ../../chapters/vinyl_control.rst:438 msgid "Timecode signal too loud. Mixxx receives a signal which has too much amplification." msgstr "" -#: ../../source/chapters/vinyl_control.rst:438 -msgid "Lower the amplification, either on your external Mixer, soundcard or with the `Turntable Input Preamp`_" +#: ../../chapters/vinyl_control.rst:438 +msgid "Lower the amplification, either on your external Mixer, soundcard or with the `Turntable Input Signal Boost`_" msgstr "" -#: ../../source/chapters/vinyl_control.rst:442 +#: ../../chapters/vinyl_control.rst:443 msgid "|too_quiet|" msgstr "" -#: ../../source/chapters/vinyl_control.rst:442 +#: ../../chapters/vinyl_control.rst:443 msgid "Timecode signal too quiet. Mixxx receives a signal which has not enough amplification." msgstr "" -#: ../../source/chapters/vinyl_control.rst:442 -msgid "Boost the amplification, either on your external Mixer, soundcard or with the `Turntable Input Preamp`_" +#: ../../chapters/vinyl_control.rst:443 +msgid "Boost the amplification, either on your external Mixer, soundcard or with the `Turntable Input Signal Boost`_" msgstr "" diff --git a/source/locale/pot/glossary.pot b/source/locale/pot/glossary.pot index ef86a65b54..96a2b7171c 100644 --- a/source/locale/pot/glossary.pot +++ b/source/locale/pot/glossary.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,607 +16,639 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/glossary.rst:2 +#: ../../glossary.rst:2 msgid "Glossary of Terms" msgstr "" -#: ../../source/glossary.rst:217 +#: ../../glossary.rst:223 msgid "AAC" msgstr "" -#: ../../source/glossary.rst:219 -msgid "Advanced Audio Coding (AAC) is a patented audio compression algorithm which uses a form of :term:`lossy` data compression. Designed to be the successor to :term:`MP3`, AAC generally achieves better sound quality at similar bit rates. While the .AAC extension is sometimes used for AAC-encoded files, they are typically saved with an .M4A file extension." +#: ../../glossary.rst:225 +msgid "Advanced Audio Coding (AAC) is a patented audio compression algorithm which uses a form of :term:`lossy` data compression. Designed to be the successor to :term:`MP3`, AAC generally achieves better sound quality at similar bit rates. While the .aac extension is sometimes used for AAC-encoded files, they are typically saved with an .m4a file extension." msgstr "" -#: ../../source/glossary.rst:417 +#: ../../glossary.rst:427 msgid "AcoustID" msgstr "" -#: ../../source/glossary.rst:419 +#: ../../glossary.rst:429 msgid "An acoustic fingerprint system built entirely on :term:`open-source` technology. It aims to create a free database of user-submitted audio fingerprints with mapping to the :term:`MusicBrainz` :term:`metadata` database and provide a web service for audio file identification using this database. For more information, see``_." msgstr "" -#: ../../source/glossary.rst:229 +#: ../../glossary.rst:235 msgid "AIFF" msgstr "" -#: ../../source/glossary.rst:231 -msgid "Short for Audio Interchange File Format. High-quality digital audio file format, similar to .wav files. Contains CD-quality audio stored in a non-compressed, :term:`lossless` format. AIFF files generally end with a .AIFF or .AIF extension." +#: ../../glossary.rst:237 +msgid "Short for Audio Interchange File Format. High-quality digital audio file format, similar to .wav files. Contains CD-quality audio stored in a non-compressed, :term:`lossless` format. AIFF files generally end with a .aiff or .aif extension." msgstr "" -#: ../../source/glossary.rst:182 +#: ../../glossary.rst:434 +msgid "API" +msgstr "" + +#: ../../glossary.rst:436 +msgid "An Application Program Interface (API) is a specification and set of rules for how software programs interact with each other. In Mixxx, an example of this is the Sound API that Mixxx uses to communicate with the :term:`Operating System` to make use of the :term:`soundcards` connected to the computer." +msgstr "" + +#: ../../glossary.rst:188 msgid "balance" msgstr "" -#: ../../source/glossary.rst:184 +#: ../../glossary.rst:190 msgid "A balance control on a mixer allows you to adjust the balance between the left and right channel. The balance refers to the relative volume of the corresponding channel in a stereo audio signal." msgstr "" -#: ../../source/glossary.rst:333 +#: ../../glossary.rst:340 msgid "bar" msgstr "" -#: ../../source/glossary.rst:335 +#: ../../glossary.rst:342 msgid "In musical notation, a bar (or measure) is a segment of time defined by a given number of beats. Typically, a piece consists of several bars of the same length." msgstr "" -#: ../../source/glossary.rst:83 +#: ../../glossary.rst:84 msgid "beatgrid" msgstr "" -#: ../../source/glossary.rst:85 +#: ../../glossary.rst:86 msgid "A series of markers that point to the location of beats within the track. Beatgrids are used for advanced mixing functions such as track :term:`sync`, precise effects synchronization, looping and accurate :term:`BPM` representation." msgstr "" -#: ../../source/glossary.rst:79 +#: ../../glossary.rst:80 msgid "beatmatching" msgstr "" -#: ../../source/glossary.rst:81 +#: ../../glossary.rst:82 msgid "A mixing technique used to establish a similar tempo with two or more tracks, making them sound like just one track." msgstr "" -#: ../../source/glossary.rst:310 +#: ../../glossary.rst:316 msgid "binaries" msgstr "" -#: ../../source/glossary.rst:312 +#: ../../glossary.rst:318 msgid "Files that contain compiled computer code, which was compiled from source code. Source code, which is usually a bunch of text files, is processed with a program called a compiler. The compiler then generates a binary, which is something like an an .exe or a .dll file. By using binaries you are relieved of the task of having to compile the code by yourself." msgstr "" -#: ../../source/glossary.rst:255 +#: ../../glossary.rst:261 msgid "bitrate" msgstr "" -#: ../../source/glossary.rst:257 +#: ../../glossary.rst:263 msgid "Describe the quality of an audio or video file. For audio data the bitrate is commonly measured in :term:`Kbps`. For example, an MP3 audio file that is compressed at 192 Kbps will have a greater dynamic range and may sound slightly more clear than the same audio file compressed at 128 Kbps." msgstr "" -#: ../../source/glossary.rst:74 +#: ../../glossary.rst:75 msgid "BPM" msgstr "" -#: ../../source/glossary.rst:76 +#: ../../glossary.rst:77 msgid "Beats per minute (BPM) is used as a measure of tempo in music. If you tap your foot to music you are following the “beat”. If you count how many taps you do in a minute you have calculated the BPM." msgstr "" -#: ../../source/glossary.rst:305 +#: ../../glossary.rst:311 msgid "bug report" msgstr "" -#: ../../source/glossary.rst:307 +#: ../../glossary.rst:313 msgid "Every software has bugs. When you come across a bug in this software, you should submit a report about it to the developers. They can use this to identify, replicate and fix the issue." msgstr "" -#: ../../source/glossary.rst:294 +#: ../../glossary.rst:300 msgid "CDJ" msgstr "" -#: ../../source/glossary.rst:296 +#: ../../glossary.rst:302 msgid "CDJ is a term originally used to describe a line of CD players from Pioneer Electronics. Today CDJ generally refers to DJ CD players that work like a record player. They allow analog control of music using CDs, usually using a touch sensitive emulated vinyl control surface." msgstr "" -#: ../../source/glossary.rst:246 +#: ../../glossary.rst:252 msgid "codec" msgstr "" -#: ../../source/glossary.rst:248 +#: ../../glossary.rst:254 msgid "Short for compressor/decompressor, a codec is any technology for compressing and decompressing audio and video data. Some popular codecs for computer audio include :term:`MP3` and :term:`Ogg Vorbis`." msgstr "" -#: ../../source/glossary.rst:102 +#: ../../glossary.rst:103 msgid "controller" msgstr "" -#: ../../source/glossary.rst:104 +#: ../../glossary.rst:105 msgid "An external hardware device that generates and transmits signals to a computer, usually via USB, to control software with physical controls other than a mouse and keyboard. Controllers have many uses for music such as controlling DJ programs like Mixxx. They typically send :term:`MIDI` signals but some controllers use :term:`HID` signals. Many DJs prefer to control DJ software using physical knobs, faders, and wheels on controllers instead of using a computer keyboard and mouse." msgstr "" -#: ../../source/glossary.rst:11 +#: ../../glossary.rst:11 msgid "crossfader" msgstr "" -#: ../../source/glossary.rst:13 +#: ../../glossary.rst:13 msgid "The crossfader is a slider that determines how much each deck of audio contributes to the :term:`master output`." msgstr "" -#: ../../source/glossary.rst:323 +#: ../../glossary.rst:330 msgid "cue" msgstr "" -#: ../../source/glossary.rst:325 +#: ../../glossary.rst:332 msgid "A Cue or Cue point is a reference point in the track usually placed on the position the DJ wants the track to start at by default. This is useful to instantly jump to that point without seeking through the track." msgstr "" -#: ../../source/glossary.rst:279 +#: ../../glossary.rst:285 msgid "cue sheet" msgstr "" -#: ../../source/glossary.rst:281 +#: ../../glossary.rst:287 msgid "A cue sheet (or CUE file, CUE sheet, etc.) is a formatted plain text file which is used to provide index information for a large audio file. For example, it can be used to tell software extra details about the layout of a CD to burn." msgstr "" -#: ../../source/glossary.rst:6 +#: ../../glossary.rst:6 msgid "cueing" msgstr "" -#: ../../source/glossary.rst:8 +#: ../../glossary.rst:8 msgid "Headphone cueing, or just cueing, is listening to the next track you would like to mix in in your headphones. The audience will not hear what you are cueing in your headphones. Being able to cue is a crucial aspect to DJing." msgstr "" -#: ../../source/glossary.rst:273 +#: ../../glossary.rst:279 msgid "db" msgstr "" -#: ../../source/glossary.rst:275 +#: ../../glossary.rst:281 msgid "Short for decibels. A Decibel is a logarithmic measurement of sound level. Whispering is around 25 dB while unbearable sound such as a jet engine is around 160 db. Rule of thumb: A volume increase of 10 dB is perceived as twice as loud." msgstr "" -#: ../../source/glossary.rst:64 +#: ../../glossary.rst:65 msgid "deck" msgstr "" -#: ../../source/glossary.rst:66 +#: ../../glossary.rst:67 msgid "A deck is like a virtual vinyl turntable. You can load a :term:`track` into it and play the track, just like you would put a record on turntable and play it." msgstr "" -#: ../../source/glossary.rst:350 +#: ../../glossary.rst:357 msgid "DRM" msgstr "" -#: ../../source/glossary.rst:352 +#: ../../glossary.rst:359 msgid "Digital Rights Management (DRM) technologies attempt to control what you can and can't do with the media and hardware you've purchased. Typically, a DRM system either encrypts the data so that it can only be accessed in a way authorized by copyright holders or marks content with a digital watermark or similar method so that the content can not be freely distributed. For information about how you can get involved in activism against DRM, see `Defective by Design `_." msgstr "" -#: ../../source/glossary.rst:134 +#: ../../glossary.rst:140 msgid "fast-forward" msgstr "" -#: ../../source/glossary.rst:136 +#: ../../glossary.rst:142 msgid "To cause something to advance at quicker than normal speed. In terms of audio software that means if you press the fast-forward button the audio will play with increased speed as long as the button is pressed. This is useful to seek through a track." msgstr "" -#: ../../source/glossary.rst:140 +#: ../../glossary.rst:146 msgid "fast-rewind" msgstr "" -#: ../../source/glossary.rst:142 +#: ../../glossary.rst:148 msgid "The opposite of :term:`fast-forward`. If you press the fast-rewind button the audio will play in reverse with increased speed as long as the button is pressed." msgstr "" -#: ../../source/glossary.rst:48 +#: ../../glossary.rst:49 msgid "file manager" msgstr "" -#: ../../source/glossary.rst:50 +#: ../../glossary.rst:51 msgid "A computer program that organizes data files into groups and shows you where they are when you need to find them again. Popular file managers for the :term:`operating systems ` Mixxx supports are Explorer on Windows, Finder on Mac OS X and Nautilus on GNU/Linux." msgstr "" -#: ../../source/glossary.rst:224 +#: ../../glossary.rst:230 msgid "FLAC" msgstr "" -#: ../../source/glossary.rst:226 -msgid "Free Lossless Audio Compression (FLAC), a patent-free audio compression similar to :term:`MP3` but :term:`lossless` (i.e. there is no loss in audio quality when used). FLAC files generally end with a .FLAC extension." +#: ../../glossary.rst:232 +msgid "Free Lossless Audio Compression (FLAC), a patent-free audio compression similar to :term:`MP3` but :term:`lossless` (i.e. there is no loss in audio quality when used). FLAC files generally end with a .flac extension." msgstr "" -#: ../../source/glossary.rst:338 +#: ../../glossary.rst:345 msgid "flanger" msgstr "" -#: ../../source/glossary.rst:340 +#: ../../glossary.rst:347 msgid "A flanger is an effect that mixes the input signal with a delayed copy of itself which leads to interferences in the signal and creates a comb-filter effect. By routing the output of the effect back into the input (feedback), the effect is enhanced." msgstr "" -#: ../../source/glossary.rst:406 +#: ../../glossary.rst:413 msgid "GUI" msgstr "" -#: ../../source/glossary.rst:408 +#: ../../glossary.rst:415 msgid "Short for “Graphical User Interface” and is pronounced “gooey”. It refers to a user interface based on graphics (icons, pictures and menus) instead of text. In Mixxx, it uses a mouse, keyboard, or :term:`MIDI` / :term:`HID` :term:`controllers ` as input devices." msgstr "" -#: ../../source/glossary.rst:54 +#: ../../glossary.rst:55 msgid "head/mix button" msgstr "" -#: ../../source/glossary.rst:56 +#: ../../glossary.rst:57 msgid "The head/mix button is used to control how much you mix the :term:`master output` into your :term:`headphone output`. This can be very useful when :term:`cueing` a track, because you can test out how it sounds when mixed with the main mix in your headphones, before letting the audience hear the track." msgstr "" -#: ../../source/glossary.rst:39 +#: ../../glossary.rst:40 msgid "headphone button" msgstr "" -#: ../../source/glossary.rst:41 +#: ../../glossary.rst:42 msgid "The headphone button is used to indicate whether or not you are pre-listening to a deck or sampler in your headphones." msgstr "" -#: ../../source/glossary.rst:18 +#: ../../glossary.rst:18 msgid "headphone output" msgstr "" -#: ../../source/glossary.rst:20 +#: ../../glossary.rst:20 msgid "The headphone output is what you hear in your headphones." msgstr "" -#: ../../source/glossary.rst:96 +#: ../../glossary.rst:97 msgid "HID" msgstr "" -#: ../../source/glossary.rst:98 +#: ../../glossary.rst:99 msgid "Short for for Human Interface Device, a part of the USB specification. It specifies a device class (a type of computer hardware) for human interface devices such as keyboards, mice, game controllers, and some DJ :term:`controllers `." msgstr "" -#: ../../source/glossary.rst:328 +#: ../../glossary.rst:335 msgid "hotcue" msgstr "" -#: ../../source/glossary.rst:330 +#: ../../glossary.rst:337 msgid "Similar to the main :term:`cue` point, a hotcue is a reference point in the track. DJs usually place hotcues at distinctive positions within a track such as drops, breaks or kicks and snares. Mixxx supports up to 36 hotcues." msgstr "" -#: ../../source/glossary.rst:392 +#: ../../glossary.rst:399 msgid "HSV" msgstr "" -#: ../../source/glossary.rst:394 +#: ../../glossary.rst:401 msgid "HSV stands for hue, saturation, and value, and is also often called HSB (B for brightness). The HSV Color Model represents color in a way more suited to the human perception of color. For example, the relationships “stronger than”, “darker than”, and “the opposite of” are easily expressed in HSV. In contrast, the representation of the hardware-oriented :term:`RGB` model is close to what most monitors show." msgstr "" -#: ../../source/glossary.rst:364 +#: ../../glossary.rst:371 msgid "icecast" msgstr "" -#: ../../source/glossary.rst:366 +#: ../../glossary.rst:373 msgid "Icecast is free and :term:`open-source` software that allows digital audio content to be broadcast to and from media player software, enabling the creation of Internet radio stations. Unlike :term:`Shoutcast `, the software provides the ability to stream in free file formats like :term:`Ogg Vorbis` and run your own directory server." msgstr "" -#: ../../source/glossary.rst:69 +#: ../../glossary.rst:70 msgid "IRC" msgstr "" -#: ../../source/glossary.rst:71 +#: ../../glossary.rst:72 msgid "Internet Relay Chat (IRC) is a an online chat network. The Mixxx IRC channel can be found on the `FreeNode IRC Network `_ in the #mixxx channel." msgstr "" -#: ../../source/glossary.rst:261 +#: ../../glossary.rst:267 msgid "kbps" msgstr "" -#: ../../source/glossary.rst:263 +#: ../../glossary.rst:269 msgid "Short for kilobits per second. Here used to measure the quality of audio data. See :term:`bitrate`" msgstr "" -#: ../../source/glossary.rst:34 +#: ../../glossary.rst:419 +msgid "key" +msgstr "" + +#: ../../glossary.rst:421 +msgid "Short for \"musical key\" (i.e. C major)." +msgstr "" + +#: ../../glossary.rst:34 msgid "key lock" msgstr "" -#: ../../source/glossary.rst:36 +#: ../../glossary.rst:35 +msgid "keylock" +msgstr "" + +#: ../../glossary.rst:37 msgid "With key lock enabled, the tempo of the track will change but the pitch remains consistent. When unlocked, the pitch slider will speed up (or slow down) the track and the pitch will increase (or decrease) along with it." msgstr "" -#: ../../source/glossary.rst:170 +#: ../../glossary.rst:176 msgid "kill switch" msgstr "" -#: ../../source/glossary.rst:172 +#: ../../glossary.rst:178 msgid "A button to turn on and off individual frequency ranges within a channel, i.e. treble, mid and bass. Useful for effects where the DJ drops a track out for a period or creates room for a transition." msgstr "" -#: ../../source/glossary.rst:251 +#: ../../glossary.rst:257 msgid "LAME" msgstr "" -#: ../../source/glossary.rst:253 +#: ../../glossary.rst:259 msgid "LAME is a free software :term:`codec` used to encode/compress audio into the :term:`lossy` :term:`MP3` file format." msgstr "" -#: ../../source/glossary.rst:164 +#: ../../glossary.rst:170 msgid "latency" msgstr "" -#: ../../source/glossary.rst:166 +#: ../../glossary.rst:172 msgid "Latency refers to a short period of delay (usually measured in milliseconds) between when an audio signal enters and when it emerges from a system. Being able to lower the latency as much as possible makes a huge difference in responsiveness." msgstr "" -#: ../../source/glossary.rst:175 +#: ../../glossary.rst:181 msgid "level meter" msgstr "" -#: ../../source/glossary.rst:177 +#: ../../glossary.rst:183 msgid "The level meter is used to show the average levels of audio signals. The level should average around the top of the green region, with the loudest parts of the music (the transients) briefly going into the yellow region. If the level meter is in the red, the signal is clipping and the gain should be turned down." msgstr "" -#: ../../source/glossary.rst:204 +#: ../../glossary.rst:210 msgid "lossless" msgstr "" -#: ../../source/glossary.rst:206 +#: ../../glossary.rst:212 msgid "Used when describing audio compression algorithms, a lossless algorithm is one which results in no loss in audio quality when used." msgstr "" -#: ../../source/glossary.rst:208 +#: ../../glossary.rst:214 msgid "lossy" msgstr "" -#: ../../source/glossary.rst:210 +#: ../../glossary.rst:216 msgid "Used when describing audio compression algorithms, a lossy algorithm is one which results in a loss in audio quality when used." msgstr "" -#: ../../source/glossary.rst:15 +#: ../../glossary.rst:15 msgid "master output" msgstr "" -#: ../../source/glossary.rst:17 +#: ../../glossary.rst:17 msgid "The master output is the main audio output. It is what your audience hears." msgstr "" -#: ../../source/glossary.rst:285 +#: ../../glossary.rst:128 +msgid "master sync" +msgstr "" + +#: ../../glossary.rst:130 +msgid "Master sync mode persistently adjusts a track's :term:`tempo` and :term:`phase` (if :term:`quantization` is enabled) in order to stay in sync with other decks that are in master sync mode." +msgstr "" + +#: ../../glossary.rst:291 msgid "metadata" msgstr "" -#: ../../source/glossary.rst:287 +#: ../../glossary.rst:293 msgid "In general, any piece of information about a music file that Mixxx uses (e.g. title, artist, album, hotcue locations, loops, etc.). Various file metadata formats allow information such as the title, artist, album, and track number to be stored in the audio file itself, see ``_ . Mixxx stores additional metadata about music files in its database, like :term:`beatgrid`, waveform data, :term:`hotcues `, playlists, crates, number of plays, etc." msgstr "" -#: ../../source/glossary.rst:89 +#: ../../glossary.rst:90 msgid "MIDI" msgstr "" -#: ../../source/glossary.rst:91 +#: ../../glossary.rst:92 msgid "Short for for Musical Instrument Digital Interface. A digital communications language and hardware specification enabling compatible electronic instruments, sequencers, computers, etc., to communicate with each other in a network. Most DJ :term:`controllers ` use MIDI to communicate with computers." msgstr "" -#: ../../source/glossary.rst:212 +#: ../../glossary.rst:218 msgid "MP3" msgstr "" -#: ../../source/glossary.rst:214 -msgid "A patented audio compression algorithm which uses a form of :term:`lossy` data compression. It is de-facto standard of digital audio compression for music. MP3 files generally end with a .MP3 extension." +#: ../../glossary.rst:220 +msgid "A patented audio compression algorithm which uses a form of :term:`lossy` data compression. It is de-facto standard of digital audio compression for music. MP3 files generally end with a .mp3 extension." msgstr "" -#: ../../source/glossary.rst:412 +#: ../../glossary.rst:422 msgid "MusicBrainz" msgstr "" -#: ../../source/glossary.rst:414 +#: ../../glossary.rst:424 msgid "A open-source music encyclopedia that collects music :term:`metadata` and makes it available to the public. For more information, see ``_." msgstr "" -#: ../../source/glossary.rst:198 +#: ../../glossary.rst:204 msgid "Ogg Vorbis" msgstr "" -#: ../../source/glossary.rst:200 -msgid "A patent-free audio compression algorithm which uses a form of lossy data compression. It is designed to provide for efficient streaming and manipulation of high quality digital audio. Ogg Vorbis files generally end with a .OGG or .OGA extension." +#: ../../glossary.rst:206 +msgid "A patent-free audio compression algorithm which uses a form of lossy data compression. It is designed to provide for efficient streaming and manipulation of high quality digital audio. Ogg Vorbis files generally end with a .ogg or .oga extension." msgstr "" -#: ../../source/glossary.rst:371 +#: ../../glossary.rst:378 msgid "open-source" msgstr "" -#: ../../source/glossary.rst:373 +#: ../../glossary.rst:380 msgid "Generically, open-source refers to a program for which the source code is available to the public for use and/or modification from its original design free of charge. Open source code is typically created as a collaborative effort in which programmers improve upon the code and share the changes within the community. Open source sprouted in the technological community as a response to proprietary software owned by corporations. For more information, see `Wikipedia `_." msgstr "" -#: ../../source/glossary.rst:300 +#: ../../glossary.rst:306 msgid "OpenGL" msgstr "" -#: ../../source/glossary.rst:302 +#: ../../glossary.rst:308 msgid "An :term:`operating system` feature used to draw hardware-accelerated graphics. Mixxx uses OpenGL to draw the waveform displays and spinning vinyl widgets." msgstr "" -#: ../../source/glossary.rst:43 +#: ../../glossary.rst:44 msgid "operating system" msgstr "" -#: ../../source/glossary.rst:45 +#: ../../glossary.rst:46 msgid "Your operating system (OS) is the computing environment on your computer. For example, Windows, Mac OS X, or GNU/Linux are the three operating systems that Mixxx supports." msgstr "" -#: ../../source/glossary.rst:242 -msgid "OPUS" +#: ../../glossary.rst:248 +msgid "Opus" msgstr "" -#: ../../source/glossary.rst:244 -msgid "Opus is a totally open, royalty-free, highly versatile :term:`lossy` audio codec. The .OPUS filename extension is recommended." +#: ../../glossary.rst:250 +msgid "Opus is a totally open, royalty-free, highly versatile :term:`lossy` audio codec. The .opus filename extension is recommended." msgstr "" -#: ../../source/glossary.rst:21 +#: ../../glossary.rst:21 msgid "PFL" msgstr "" -#: ../../source/glossary.rst:23 +#: ../../glossary.rst:23 msgid "``PFL`` or “pre-fader listen” is a fancy word for whether or not you are “pre-listening” to a deck in your headphones. See also: :term:`headphone button`." msgstr "" -#: ../../source/glossary.rst:145 +#: ../../glossary.rst:151 msgid "phase" msgstr "" -#: ../../source/glossary.rst:147 +#: ../../glossary.rst:153 msgid "The phase of a track is its position relative to another track. If two tracks are :term:`sync'd ` to the same tempo and in-phase then they should be playing so that their beats are aligned." msgstr "" -#: ../../source/glossary.rst:150 +#: ../../glossary.rst:156 msgid "pitch bend" msgstr "" -#: ../../source/glossary.rst:152 +#: ../../glossary.rst:158 msgid "A technique used by DJs that temporarily `bends` the rate of a track up or down, usually while a button is held. This technique is usually used to make micro-adjustments to the synchronization of tracks while beatmatching. Before digital DJing, this was accomplished by dragging one's finger alongside the turntable to slow it down or by twisting the record spindle to speed it up." msgstr "" -#: ../../source/glossary.rst:344 +#: ../../glossary.rst:351 msgid "podcast" msgstr "" -#: ../../source/glossary.rst:346 +#: ../../glossary.rst:353 msgid "A podcast is a feed of audio or video files made available for free or for purchase over the Internet. Podcast clients such as iTunes allow listeners to subscribe to the feed and automatically download content to their portable audio players as it becomes available." msgstr "" -#: ../../source/glossary.rst:387 +#: ../../glossary.rst:394 msgid "quantization" msgstr "" -#: ../../source/glossary.rst:389 +#: ../../glossary.rst:396 msgid "Quantization is the process of aligning notes and other events like loops or cuepoints so that they start or finish exactly on beats or fractions of beats." msgstr "" -#: ../../source/glossary.rst:158 +#: ../../glossary.rst:164 msgid "ramping pitch bend" msgstr "" -#: ../../source/glossary.rst:160 +#: ../../glossary.rst:166 msgid "Basically identical to the regular :term:`pitch bend` with the difference that the pitch changes gradually, instead of all at once. Often uses for temporary pitch changes. It simulates the effect of touching a turntable to temporarily slow down or speed up a record." msgstr "" -#: ../../source/glossary.rst:127 +#: ../../glossary.rst:133 msgid "rate" msgstr "" -#: ../../source/glossary.rst:129 +#: ../../glossary.rst:135 msgid "The speed at which a track is played back, usually expressed in terms of a percentage of the speed relative to the tracks normal rate. Often while mixing, DJs adjust the rates of tracks so that they can play at the same tempo as other tracks. This allows DJs to :term:`beatmix `, and is an essential part of DJing." msgstr "" -#: ../../source/glossary.rst:265 +#: ../../glossary.rst:271 msgid "ReplayGain" msgstr "" -#: ../../source/glossary.rst:267 +#: ../../glossary.rst:273 msgid "ReplayGain normalizes audio data in a non-destructive way, so the tracks in your music library don't all play at different volumes. Audio files are scanned by a psychoacoustic algorithm to determine the loudness of the audio data. ReplayGain information is stored as :term:`metadata` in a digital audio file in order for the sound to be correctly played at the right level of loudness." msgstr "" -#: ../../source/glossary.rst:195 +#: ../../glossary.rst:201 msgid "reverse" msgstr "" -#: ../../source/glossary.rst:197 +#: ../../glossary.rst:203 msgid "Reverse plays a track backwards." msgstr "" -#: ../../source/glossary.rst:400 +#: ../../glossary.rst:407 msgid "RGB" msgstr "" -#: ../../source/glossary.rst:402 +#: ../../glossary.rst:409 msgid "The RGB color model is an additive color model in which red, green, and blue light are added together in various ways to reproduce a broad array of colors. The name of the model comes from the initials of the three additive primary colors, red, green, and blue." msgstr "" -#: ../../source/glossary.rst:359 +#: ../../glossary.rst:366 msgid "shoutcast" msgstr "" -#: ../../source/glossary.rst:361 +#: ../../glossary.rst:368 msgid "Shoutcast is proprietary software that allows digital audio content to be broadcast to and from media player software, enabling the creation of Internet radio stations." msgstr "" -#: ../../source/glossary.rst:317 +#: ../../glossary.rst:323 msgid "soundcard" msgstr "" -#: ../../source/glossary.rst:319 +#: ../../glossary.rst:324 +msgid "soundcards" +msgstr "" + +#: ../../glossary.rst:326 msgid "Also known as an audio card, it is an internal computer expansion card or external expansion device that facilitates the input and output of audio signals to and from a computer. Today DJ-soundcards are usually connected via USB and have at least 2 stereo audio outputs to support :term:`cueing`." msgstr "" -#: ../../source/glossary.rst:123 +#: ../../glossary.rst:124 msgid "sync" msgstr "" -#: ../../source/glossary.rst:125 +#: ../../glossary.rst:126 msgid "Sync allows you to automatically adjust a track's :term:`tempo` and :term:`phase` to be in sync with another deck that is playing." msgstr "" -#: ../../source/glossary.rst:187 +#: ../../glossary.rst:193 msgid "tempo" msgstr "" -#: ../../source/glossary.rst:189 +#: ../../glossary.rst:195 msgid "The speed of a track measured in :term:`bpm`." msgstr "" -#: ../../source/glossary.rst:117 +#: ../../glossary.rst:118 msgid "timecode" msgstr "" -#: ../../source/glossary.rst:119 +#: ../../glossary.rst:120 msgid "Used here in conjunction with :term:`vinyl control`. A special audio signal on a control vinyl or control CD (timecode media) that a computer can listen to in order to determine speed, direction and position of the playback." msgstr "" -#: ../../source/glossary.rst:61 +#: ../../glossary.rst:62 msgid "track" msgstr "" -#: ../../source/glossary.rst:63 +#: ../../glossary.rst:64 msgid "A track is another word for a song." msgstr "" -#: ../../source/glossary.rst:381 +#: ../../glossary.rst:388 msgid "url" msgstr "" -#: ../../source/glossary.rst:383 +#: ../../glossary.rst:390 msgid "Uniform Resource Locator. The address that defines the route to a file on an Internet server. URLs are typed into a Web browser to access Web pages and files, and URLs are embedded within the pages themselves as hypertext links. One example of a URL is ``_ ." msgstr "" -#: ../../source/glossary.rst:111 +#: ../../glossary.rst:112 msgid "vinyl control" msgstr "" -#: ../../source/glossary.rst:113 +#: ../../glossary.rst:114 msgid "A method of controlling DJ applications which simulates the traditional DJing paradigm of two turntables. Using special :term:`timecode` media, the DJ application analyzes the timecode signal and simulates the sound and feel of having your music collection on vinyl." msgstr "" -#: ../../source/glossary.rst:190 +#: ../../glossary.rst:196 msgid "volume" msgstr "" -#: ../../source/glossary.rst:192 +#: ../../glossary.rst:198 msgid "A term that refers to the degree of sound intensity or audibility; loudness. Volume is determined by people's perception and does not directly correspond to any physical property of sound." msgstr "" -#: ../../source/glossary.rst:235 +#: ../../glossary.rst:241 msgid "WAV" msgstr "" -#: ../../source/glossary.rst:237 -msgid "Standard digital audio file format used for storing waveform data; allows audio recordings to be saved with different sampling rates and bitrates; often saved in a 44.1 KHz, 16-bit, stereo format, which is the standard format used for CD audio. Wave files are not compressed, and are therefore :term:`lossless`. Wave files generally end with a .WAV extension." +#: ../../glossary.rst:243 +msgid "Standard digital audio file format used for storing waveform data; allows audio recordings to be saved with different sampling rates and bitrates; often saved in a 44.1 KHz, 16-bit, stereo format, which is the standard format used for CD audio. Wave files are not compressed, and are therefore :term:`lossless`. Wave files generally end with a .wav extension." msgstr "" -#: ../../source/glossary.rst:30 +#: ../../glossary.rst:30 msgid "waveform overview" msgstr "" -#: ../../source/glossary.rst:32 +#: ../../glossary.rst:32 msgid "The waveform overview shows the waveform envelope of the entire track, and is useful because they allow DJs to see breakdowns far in advance." msgstr "" -#: ../../source/glossary.rst:26 +#: ../../glossary.rst:26 msgid "waveform summary" msgstr "" -#: ../../source/glossary.rst:28 +#: ../../glossary.rst:28 msgid "The waveform summary shows the waveform envelope of the track near the current playback position." msgstr "" diff --git a/source/locale/pot/index.pot b/source/locale/pot/index.pot index a41fcae3ef..9663c93333 100644 --- a/source/locale/pot/index.pot +++ b/source/locale/pot/index.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,23 +16,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/index.rst:7 +#: ../../index.rst:7 msgid "Mixxx |version| User Manual" msgstr "" -#: ../../source/index.rst:9 -msgid "Mixxx is free [#f1]_ DJ software for Windows, Mac OS X and Linux. It's easy to use so you can start mixing your favourite songs in no time, even if you've never DJed before. Mixxx offers a variety of features for experienced DJs and beginners alike, such as automatic beat and key detection, master sync, hotcues, looping, 4 decks, effects and many more. You can perform with Mixxx using :term:`MIDI` and :term:`HID` controllers, CD players, vinyl turntables or even just your computer's keyboard and mouse." +#: ../../index.rst:9 +msgid "Mixxx is free [#f1]_ DJ software for Windows, Mac OS X and Linux. It's easy to use so you can start mixing your favorite songs in no time, even if you've never DJed before. Mixxx offers a variety of features for experienced DJs and beginners alike, such as automatic beat and key detection, master sync, hotcues, looping, 4 decks, effects and many more. You can perform with Mixxx using :term:`MIDI` and :term:`HID` controllers, CD players, vinyl turntables or even just your computer's keyboard and mouse." msgstr "" -#: ../../source/index.rst:20 +#: ../../index.rst:20 msgid "Table of Contents" msgstr "" -#: ../../source/index.rst:45 -msgid "**For documentation writers**" -msgstr "" - -#: ../../source/index.rst:53 +#: ../../index.rst:46 msgid "Yes, free with a capital F free. Free as in beer and free as in speech. For more information about what this means, see `Wikipedia `_." msgstr "" diff --git a/source/locale/pot/index_developer.pot b/source/locale/pot/index_developer.pot new file mode 100644 index 0000000000..f640d8533e --- /dev/null +++ b/source/locale/pot/index_developer.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2011-2017, The Mixxx Development Team +# This file is distributed under the same license as the Mixxx package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Mixxx 2.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../../index_developer.rst:1 +msgid "**For documentation writers**" +msgstr "" + diff --git a/source/locale/pot/manual_guidelines.pot b/source/locale/pot/manual_guidelines.pot index 904b2318f5..67bbf8af29 100644 --- a/source/locale/pot/manual_guidelines.pot +++ b/source/locale/pot/manual_guidelines.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,271 +16,271 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/manual_guidelines.rst:4 +#: ../../manual_guidelines.rst:4 msgid "Guidelines for Mixxx Manual writers" msgstr "" -#: ../../source/manual_guidelines.rst:9 +#: ../../manual_guidelines.rst:9 msgid "What is the intended outcome of the manual?" msgstr "" -#: ../../source/manual_guidelines.rst:10 -msgid "A user who doesn\\'t know Mixxx yet should be able to mix two tracks from its music library in the shortest possible time. Assuming he will be more motivated to explore the software and get creative." +#: ../../manual_guidelines.rst:10 +msgid "A user who doesn\\'t know Mixxx yet should be able to mix two tracks from their music library in the shortest possible time." msgstr "" -#: ../../source/manual_guidelines.rst:14 +#: ../../manual_guidelines.rst:13 msgid "(Future) characteristics of the Mixxx manual:" msgstr "" -#: ../../source/manual_guidelines.rst:21 +#: ../../manual_guidelines.rst:19 msgid "**User-friendly**" msgstr "" -#: ../../source/manual_guidelines.rst:17 -msgid "Easy to use when, where, and how you need it. Examine, how someone else is using the application. Watch someone else use the manual (preferably someone who has never seen it before). Be consistent with the instructional design so users can follow a set pattern. Don't use the terms you use as a developer, try to find the terminology of the user." +#: ../../manual_guidelines.rst:16 +msgid "Easy to use when, where, and how you need it. Watch how someone else uses the application. Watch them look for information in the manual (preferably someone who has never seen it before). Be consistent with the instructional design so users can follow a set pattern. Don't use software development terms." msgstr "" -#: ../../source/manual_guidelines.rst:27 +#: ../../manual_guidelines.rst:25 msgid "**Based on sound learning principles**" msgstr "" -#: ../../source/manual_guidelines.rst:24 -msgid "For example users should actually learn from it, not just refer to it. Use the KISS principle; keep it sweet and simple. Too much information can be overwhelming, so present one concept at a time. Explain simple features in a matrix." +#: ../../manual_guidelines.rst:22 +msgid "For example users should actually learn from it, not just refer to it. Use the KISS principle: keep it short and simple. Too much information can be overwhelming, so present one concept at a time. Explain simple features in a matrix." msgstr "" -#: ../../source/manual_guidelines.rst:31 +#: ../../manual_guidelines.rst:29 msgid "**Motivational**" msgstr "" -#: ../../source/manual_guidelines.rst:30 +#: ../../manual_guidelines.rst:28 msgid "Keeps users willing to push forward to higher levels. Present general concepts first to provide a frame of reference. Then move to more complex topics." msgstr "" -#: ../../source/manual_guidelines.rst:33 -msgid "Group problems the user might hit in a particular task right there with the instruction for that task. Do not force a user to go to a separate “Troubleshooting” section. We can have such separate sections, but as a author you should duplicate pitfalls and problems and include a solution in the task." +#: ../../manual_guidelines.rst:31 +msgid "Group problems the user might hit in a particular task right there with the instruction for that task. Do not force a user to go to a separate “Troubleshooting” section. We can have such separate sections, but as an author you should duplicate pitfalls and problems and include a solution in the task." msgstr "" -#: ../../source/manual_guidelines.rst:39 +#: ../../manual_guidelines.rst:37 msgid "Technical conventions" msgstr "" -#: ../../source/manual_guidelines.rst:42 +#: ../../manual_guidelines.rst:40 msgid "Line Widths" msgstr "" -#: ../../source/manual_guidelines.rst:44 +#: ../../manual_guidelines.rst:42 msgid "Please configure your editor to have a max column-width of 80-columns. While it is not a strict requirement, 80-column cleanliness makes it easy to tile multiple buffers of code across a laptop screen, which provides significant efficiency gains to developers." msgstr "" -#: ../../source/manual_guidelines.rst:50 +#: ../../manual_guidelines.rst:48 msgid "Screenshots" msgstr "" -#: ../../source/manual_guidelines.rst:52 +#: ../../manual_guidelines.rst:50 msgid "Use English language settings when creating screen-shots of the Mixxx interface. This might change if we ever have true `i18n `_. The preferred file format is PNG. **Don't add shadows** to application window screen-shots as they are added automatically to the document with style-sheets." msgstr "" -#: ../../source/manual_guidelines.rst:58 +#: ../../manual_guidelines.rst:56 msgid "Always include descriptive alt text and a figure description. The latter will be numbered in the PDF export. That sets them apart from the text below. Place screen-shots above the context you are going to explain." msgstr "" -#: ../../source/manual_guidelines.rst:62 +#: ../../manual_guidelines.rst:60 msgid "Screenshots should only show the necessary area and not the entire screen where not necessary. Use annotation on the screenshot if necessary to emphasize elements, use color ``#FF1F90`` if possible for consistency." msgstr "" -#: ../../source/manual_guidelines.rst:68 +#: ../../manual_guidelines.rst:66 msgid "Use this directive to place images like Screen-shots. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:79 +#: ../../manual_guidelines.rst:77 msgid "Nice screenshot tools with build-in editor for annotations:" msgstr "" -#: ../../source/manual_guidelines.rst:81 +#: ../../manual_guidelines.rst:79 msgid "MacOSX: `Skitch `_" msgstr "" -#: ../../source/manual_guidelines.rst:82 +#: ../../manual_guidelines.rst:80 msgid "Linux: `Shutter `_" msgstr "" -#: ../../source/manual_guidelines.rst:83 +#: ../../manual_guidelines.rst:81 msgid "Windows: `PickPic `_" msgstr "" -#: ../../source/manual_guidelines.rst:85 +#: ../../manual_guidelines.rst:83 msgid "Alternatively, import your screenshots into `Inkscape `_, add annotations and export as .png to :file:`/static`. Then save the original work as .svg to :file:`/static` as well, so any future contributor can work on your annotations at a later time." msgstr "" -#: ../../source/manual_guidelines.rst:91 +#: ../../manual_guidelines.rst:89 msgid "File naming" msgstr "" -#: ../../source/manual_guidelines.rst:93 +#: ../../manual_guidelines.rst:91 msgid "As the manual grows over the time with new versions of Mixxx and new screenshots, it is important to have files named consistently. Save files to the :file:`/static` folder or create a sub-folder in there." msgstr "" -#: ../../source/manual_guidelines.rst:101 +#: ../../manual_guidelines.rst:99 msgid "This scheme makes it easy to know which version a screenshot was taken from and where it belongs and if it must replaced, like e.g. :file:`Mixxx-111-Preferences-Recording.png`" msgstr "" -#: ../../source/manual_guidelines.rst:105 +#: ../../manual_guidelines.rst:103 msgid "Do not include any dot in the file names of your screenshots your file name or you wont be able to generate PDF with LaTeX." msgstr "" -#: ../../source/manual_guidelines.rst:109 +#: ../../manual_guidelines.rst:107 msgid "Double quotes" msgstr "" -#: ../../source/manual_guidelines.rst:111 +#: ../../manual_guidelines.rst:109 msgid "Use curly double quotes (“ ”). Avoid typewriter double quotes (\" \") produced by the convenient quotation mark button on your keyboard. For details and key combinations, see `Wikipedia `_ ." msgstr "" -#: ../../source/manual_guidelines.rst:117 +#: ../../manual_guidelines.rst:115 msgid "Admonitions" msgstr "" -#: ../../source/manual_guidelines.rst:119 +#: ../../manual_guidelines.rst:117 msgid "The following admonitions are in use:" msgstr "" -#: ../../source/manual_guidelines.rst:123 +#: ../../manual_guidelines.rst:121 msgid "For anything that should receive a bit more attention. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:130 +#: ../../manual_guidelines.rst:128 msgid "For supplementary information that lightens the work load. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:137 +#: ../../manual_guidelines.rst:135 msgid "For references to other documents or websites if they need special attention. References to other documents can also be included in the text inline. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:146 +#: ../../manual_guidelines.rst:144 msgid "Recommended over :rst:dir:`note` for anything that needs to be done with caution. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:154 +#: ../../manual_guidelines.rst:152 msgid "Allow inserting todo items into documents and to keep a :ref:`automatically generated TODO list ` Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:161 +#: ../../manual_guidelines.rst:159 msgid "Substitution" msgstr "" -#: ../../source/manual_guidelines.rst:163 +#: ../../manual_guidelines.rst:161 msgid "Replacement images or text can be included in the text. They are added through a substitution (aka alias). This may be appropriate when the replacement image or text is repeated many times throughout one or more documents, especially if it may need to change later." msgstr "" -#: ../../source/manual_guidelines.rst:168 +#: ../../manual_guidelines.rst:166 msgid "All replacements are kept in the file :file:`shortcuts.rstext` which is included at the beginning of each file in which a substitution is used." msgstr "" -#: ../../source/manual_guidelines.rst:171 +#: ../../manual_guidelines.rst:169 msgid "To use an alias for the Mixxx logo, simply put the definition into :file:`shortcuts.rstext`." msgstr "" -#: ../../source/manual_guidelines.rst:178 +#: ../../manual_guidelines.rst:176 msgid "Using this image alias, you can insert it easily in the text with ``|logo|`` , like this: |logo|" msgstr "" -#: ../../source/manual_guidelines.rst:181 +#: ../../manual_guidelines.rst:179 msgid "For a text replacement the code looks similar:" msgstr "" -#: ../../source/manual_guidelines.rst:188 +#: ../../manual_guidelines.rst:186 msgid "Using this text alias, you can insert it easily with ``|longtext|`` , like this:" msgstr "" -#: ../../source/manual_guidelines.rst:188 +#: ../../manual_guidelines.rst:186 msgid "|longtext| ." msgstr "" -#: ../../source/manual_guidelines.rst:190 +#: ../../manual_guidelines.rst:188 msgid "The substitute section in the docs. `Here `_ and `also here `_" msgstr "" -#: ../../source/manual_guidelines.rst:195 +#: ../../manual_guidelines.rst:193 msgid "Headings" msgstr "" -#: ../../source/manual_guidelines.rst:196 +#: ../../manual_guidelines.rst:194 msgid "Normally, there are no heading levels assigned to certain characters as the structure is determined from the succession of headings. However, for the Python documentation, this convention is used which you may follow:" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``#`` with overline, for parts" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``*`` with overline, for chapters" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``=`` for sections" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``-`` for subsections" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``^`` for subsubsections" msgstr "" -#: ../../source/manual_guidelines.rst:0 +#: ../../manual_guidelines.rst:0 msgid "``\"`` for paragraphs" msgstr "" -#: ../../source/manual_guidelines.rst:207 +#: ../../manual_guidelines.rst:205 msgid "Of course, you are free to use your own marker characters (see the reST documentation), and use a deeper nesting level, but keep in mind that most target formats (HTML, LaTeX) have a limited supported nesting depth." msgstr "" -#: ../../source/manual_guidelines.rst:212 +#: ../../manual_guidelines.rst:210 msgid "Paragraph-level markup" msgstr "" -#: ../../source/manual_guidelines.rst:214 +#: ../../manual_guidelines.rst:212 msgid "These directives create short paragraphs and can be used inside information units as well as normal text:" msgstr "" -#: ../../source/manual_guidelines.rst:219 +#: ../../manual_guidelines.rst:217 msgid "This directive documents the version of the project which added the described feature. Example markup: ::" msgstr "" -#: ../../source/manual_guidelines.rst:226 +#: ../../manual_guidelines.rst:224 msgid "Similar to :rst:dir:`versionadded`, but describes when and what changed in the named feature in some way (new parameters, changed side effects, etc.)." msgstr "" -#: ../../source/manual_guidelines.rst:230 +#: ../../manual_guidelines.rst:228 msgid "Other semantic markup" msgstr "" -#: ../../source/manual_guidelines.rst:231 +#: ../../manual_guidelines.rst:229 msgid "The following roles don't do anything special except formatting the text in a different style. Nonetheless, use them:" msgstr "" -#: ../../source/manual_guidelines.rst:236 +#: ../../manual_guidelines.rst:234 msgid "Any label used in the interface should be marked with this role, including button labels, window titles, field names, menu and menu selection names, and even values in selection lists. An accelerator key for the GUI label can be included using an ampersand; this will be stripped and displayed underlined in the output. To include a literal ampersand, double it. Example markup: :guilabel:`&Cancel` ::" msgstr "" -#: ../../source/manual_guidelines.rst:247 +#: ../../manual_guidelines.rst:245 msgid "Mark a sequence of keystrokes. Example markup: :kbd:`STRG` + :kbd:`G` ::" msgstr "" -#: ../../source/manual_guidelines.rst:253 +#: ../../manual_guidelines.rst:251 msgid "This is used to mark a complete sequence of menu selections, including selecting submenus and choosing a specific operation. Example markup: :menuselection:`Options --> Enable Live Broadcasting` ::" msgstr "" -#: ../../source/manual_guidelines.rst:261 +#: ../../manual_guidelines.rst:259 msgid "The name of a file or directory. Example markup: :file:`Mixxx/Recordings` ::" msgstr "" -#: ../../source/manual_guidelines.rst:266 +#: ../../manual_guidelines.rst:264 msgid "Meta-information markup" msgstr "" -#: ../../source/manual_guidelines.rst:270 +#: ../../manual_guidelines.rst:268 msgid "Identifies the author of the current section and helps to keep track of contributions. By default, this markup isn't reflected in the output in any way. Example markup: ::" msgstr "" diff --git a/source/locale/pot/sphinx.pot b/source/locale/pot/sphinx.pot index 32ce6370d1..76308aa8f8 100644 --- a/source/locale/pot/sphinx.pot +++ b/source/locale/pot/sphinx.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,59 +16,59 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/_templates/layout.html:30 +#: ../../_templates/layout.html:30 msgid "Navigation" msgstr "" -#: ../../source/_templates/layout.html:130 +#: ../../_templates/layout.html:131 msgid "Search within %(docstitle)s" msgstr "" -#: ../../source/_templates/layout.html:139 +#: ../../_templates/layout.html:140 msgid "About these documents" msgstr "" -#: ../../source/_templates/layout.html:142 +#: ../../_templates/layout.html:143 msgid "Index" msgstr "" -#: ../../source/_templates/layout.html:145 +#: ../../_templates/layout.html:146 msgid "Search" msgstr "" -#: ../../source/_templates/layout.html:148 +#: ../../_templates/layout.html:149 msgid "Copyright" msgstr "" -#: ../../source/_templates/layout.html:197 +#: ../../_templates/layout.html:198 msgid "© Copyright %(copyright)s." msgstr "" -#: ../../source/_templates/layout.html:199 +#: ../../_templates/layout.html:200 msgid "© Copyright %(copyright)s." msgstr "" -#: ../../source/_templates/layout.html:203 +#: ../../_templates/layout.html:204 msgid "Last updated on %(last_updated)s." msgstr "" -#: ../../source/_templates/layout.html:206 +#: ../../_templates/layout.html:207 msgid "Created using Sphinx %(sphinx_version)s." msgstr "" -#: ../../source/_templates/searchbox.html:12 +#: ../../_templates/searchbox.html:12 msgid "Quick search" msgstr "" -#: ../../source/_templates/searchbox.html:15 +#: ../../_templates/searchbox.html:15 msgid "Go" msgstr "" -#: ../../source/_templates/searchbox.html:20 +#: ../../_templates/searchbox.html:20 msgid "Looking for something?" msgstr "" -#: ../../source/_templates/localtoc.html:11 +#: ../../_templates/localtoc.html:11 msgid "In This Section" msgstr "" diff --git a/source/locale/pot/todolist.pot b/source/locale/pot/todolist.pot index 22e5a9a442..5135a35eb5 100644 --- a/source/locale/pot/todolist.pot +++ b/source/locale/pot/todolist.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2011-2015, The Mixxx Development Team +# Copyright (C) 2011-2017, The Mixxx Development Team # This file is distributed under the same license as the Mixxx package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mixxx 2.0\n" +"Project-Id-Version: Mixxx 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-24 17:11+0100\n" +"POT-Creation-Date: 2017-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,15 +16,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../source/todolist.rst:6 +#: ../../todolist.rst:6 msgid "Automatically generated TODO list" msgstr "" -#: ../../source/todolist.rst:8 +#: ../../todolist.rst:8 msgid "The following list is automatically generated from ``.. TODO::`` directives in the text." msgstr "" -#: ../../source/todolist.rst:11 +#: ../../todolist.rst:11 msgid "TODO items" msgstr "" diff --git a/source/manual_guidelines.rst b/source/manual_guidelines.rst index 00b35ffc74..743ec677b1 100644 --- a/source/manual_guidelines.rst +++ b/source/manual_guidelines.rst @@ -8,7 +8,7 @@ Guidelines for Mixxx Manual writers What is the intended outcome of the manual? =========================================== A user who doesn\'t know Mixxx yet should be able to mix two tracks from their -music library in the shortest possible time. +music library in the shortest possible time. (Future) characteristics of the Mixxx manual: @@ -76,9 +76,9 @@ elements, use color ``#FF1F90`` if possible for consistency. Nice screenshot tools with build-in editor for annotations: -* MacOSX: `Skitch `_ +* macOS: `Skitch `_ * Linux: `Shutter `_ -* Windows: `PickPic `_ +* Windows: `ShareX `_ Alternatively, import your screenshots into `Inkscape `_, add annotations and export as .png to diff --git a/source/themes/mixxx/static/mixxx.css_t b/source/themes/mixxx/static/mixxx.css_t index 900b20b4fb..1b804318fe 100644 --- a/source/themes/mixxx/static/mixxx.css_t +++ b/source/themes/mixxx/static/mixxx.css_t @@ -5,7 +5,7 @@ * Sphinx stylesheet -- mixxx theme. Adapted from nature. * * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :copyright: Copyright 2011-2013 RJ Ryan, S.Brandt + * :copyright: Copyright 2011-2018 RJ Ryan, S.Brandt * :license: BSD, see LICENSE for details. * */ diff --git a/source/todolist.rst b/source/todolist.rst index 4203408416..d17023df61 100644 --- a/source/todolist.rst +++ b/source/todolist.rst @@ -2,12 +2,14 @@ .. _todo-list: -Automatically generated TODO list +Automatically generated todo list ================================= -The following list is automatically generated from ``.. TODO::`` directives in the text. +The following list is automatically generated from ``.. todo::`` directives in +the text. It will only show up in the output if ``todo_include_todos = True``. +See ``_ -TODO items +todo items ---------- .. todolist::