Merge remote-tracking branch 'upstream/2.1'

Conflicts:
	LICENSE

LICENSE

@@ -1,8 +1,21 @@
 Mixxx version 2.2, Digital DJ'ing software.
 Copyright (C) 2001-2018 Mixxx Development Team
 
-Promotional tracks are copyright their respective owners and
-distributed with permission.
+Mixxx is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version. The full text of the GNU
+General Public License, version 2 can be found below. The licenses
+of software libraries distributed together with Mixxx can be found
+below as well.
+
+Mixxx is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+This distribution of Mixxx may include skins that are licensed under a
+Creative Commons license. Full licensing information is available
+individually for each skin, located in their "skin.xml" file.
 
 Depending on your platform, you may receive a copy of PortAudio
 (http://www.portaudio.com/) which is distributed under the
@@ -16,31 +29,8 @@ available at http://www.steinberg.net/en/company/developer.html .
 
 On Windows you may receive a copy of the Microsoft Visual Studio runtime
 libraries. These are distributed only for the purpose of allowing
-Mixxx to run as per the license agreement for Visual Studio and are copyright
-of Microsoft.
-
-This distribution of Mixxx may include skins that are licensed under a
-Creative Commons license. Full licensing information is available
-individually for each skin, located in their "skin.xml" file.
-
-The source code for Mixxx itself is licensed under the GPL v2 and
-the GPL v2 with an App Store exception as follows:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Mixxx comes with ABSOLUTELY NO WARRANTY;
+Mixxx to run as per the license agreement for Visual Studio and
+are copyright of Microsoft.
 
 
 		    GNU GENERAL PUBLIC LICENSE

build/wix/Localization/po/cs-CZ.po

@@ -1,13 +1,14 @@
 # 
 # Translators:
+# Filip Klačanský <klacanskyf@protonmail.com>, 2018
 # fri, 2016-2017
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-07-15 15:06+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2018-02-23 04:55+0000\n"
+"Last-Translator: Filip Klačanský <klacanskyf@protonmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,23 +164,23 @@ msgstr "Zdrojové soubory, které Mixxx umožní provedení instalace Mixxxu v j
 #.  Bootstrapper
 msgctxt "Caption"
 msgid "[WixBundleName] Setup"
-msgstr ""
+msgstr "[wixBundleName]Instalace"
 
 msgctxt "Title"
 msgid "[WixBundleName]"
 msgstr ""
 
 msgctxt "ConfirmCancelMessage"
 msgid "Are you sure you want to cancel?"
-msgstr ""
+msgstr "Chcete opravdu ukončit instalaci ? "
 
 msgctxt "ExecuteUpgradeRelatedBundleMessage"
 msgid "Previous version"
-msgstr ""
+msgstr "Předchozí verze"
 
 msgctxt "HelpHeader"
 msgid "Setup Help"
-msgstr ""
+msgstr "Nápověda k instalaci."
 
 msgctxt "HelpText"
 msgid ""
@@ -197,158 +198,158 @@ msgstr ""
 
 msgctxt "HelpCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "Zavřít."
 
 msgctxt "InstallHeader"
 msgid "Welcome"
-msgstr ""
+msgstr "Vítejte."
 
 msgctxt "InstallMessage"
 msgid ""
 "Setup will install Mixxx on your computer.\n"
 "It will first install required third party libraries, then Mixxx itself.\n"
 "Click Install to continue or Close to exit."
-msgstr ""
+msgstr "Mixx bude nainstalován na váš počítač.\nNejprve nainstaluje požadované knihovny, potom samotní Mixx.\nKliknete Instalovat pro pokračování nebo Zavřít pro ukončení."
 
 msgctxt "InstallVersion"
 msgid "Version [WixBundleVersion]"
-msgstr ""
+msgstr "Verze [WixBundleVersion]"
 
 msgctxt "InstallOptionsButton"
 msgid "&Options"
-msgstr ""
+msgstr "Možnosti"
 
 msgctxt "InstallInstallButton"
 msgid "&Install"
-msgstr ""
+msgstr "Instalovat"
 
 msgctxt "InstallCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "OptionsHeader"
 msgid "Setup Options"
-msgstr ""
+msgstr "Nastavení instalace"
 
 msgctxt "OptionsLocationLabel"
 msgid "Install location:"
-msgstr ""
+msgstr "Umístnení instalace"
 
 msgctxt "OptionsBrowseButton"
 msgid "&Browse"
-msgstr ""
+msgstr "Prohledávat"
 
 msgctxt "OptionsOkButton"
 msgid "&OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "OptionsCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "FilesInUseHeader"
 msgid "Files In Use"
-msgstr ""
+msgstr "Používané soubory"
 
 msgctxt "FilesInUseLabel"
 msgid "The following applications are using files that need to be updated:"
-msgstr ""
+msgstr "Tyto aplikace používají soubory, které je třeba aktualizovat:"
 
 msgctxt "FilesInUseCloseRadioButton"
 msgid "Close the &applications and attempt to restart them."
-msgstr ""
+msgstr "Zavřít aplikace a pokusit se je restartovat. "
 
 msgctxt "FilesInUseDontCloseRadioButton"
 msgid "&Do not close applications. A reboot will be required."
-msgstr ""
+msgstr "Nezavírejte tyto aplikace. Požaduje se restart. "
 
 msgctxt "FilesInUseOkButton"
 msgid "&OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "FilesInUseCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "ProgressHeader"
 msgid "Setup Progress"
-msgstr ""
+msgstr "Průběh instalace"
 
 msgctxt "ProgressLabel"
 msgid "Processing:"
-msgstr ""
+msgstr "Spracováva se: "
 
 msgctxt "OverallProgressPackageText"
 msgid "Initializing..."
-msgstr ""
+msgstr "Načítávam..."
 
 msgctxt "ProgressCancelButton"
 msgid "&Cancel"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "ModifyHeader"
 msgid "Modify Setup"
-msgstr ""
+msgstr "Upravit Instalaci"
 
 msgctxt "ModifyRepairButton"
 msgid "&Repair"
-msgstr ""
+msgstr "Opravit"
 
 msgctxt "ModifyUninstallButton"
 msgid "&Uninstall"
-msgstr ""
+msgstr "Odinstalovat"
 
 msgctxt "ModifyCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "SuccessHeader"
 msgid "Setup Successful"
-msgstr ""
+msgstr "Instalace úspěšná"
 
 msgctxt "SuccessInstallHeader"
 msgid "Mixxx installation has been successful"
-msgstr ""
+msgstr "Mixxx byl úspěšne nainstalován"
 
 msgctxt "SuccessRepairHeader"
 msgid "Mixxx repair has been successful"
-msgstr ""
+msgstr "Mixxx byl úspěšne nainstalován"
 
 msgctxt "SuccessUninstallHeader"
 msgid "Mixxx uninstall has been successful"
-msgstr ""
+msgstr "Mixx byl úspěšne odinstalován"
 
 msgctxt "SuccessLaunchButton"
 msgid "&Launch"
-msgstr ""
+msgstr "Spustit"
 
 msgctxt "SuccessRestartText"
 msgid "You must restart your computer before you can use the software."
-msgstr ""
+msgstr "Prosím restartujte počítač pro bezchybný chod softwaru. "
 
 msgctxt "SuccessRestartButton"
 msgid "&Restart"
-msgstr ""
+msgstr "Restartovat"
 
 msgctxt "SuccessCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "Ukončit"
 
 msgctxt "FailureHeader"
 msgid "Setup Failed"
-msgstr ""
+msgstr "Instalace se nezdařila"
 
 msgctxt "FailureInstallHeader"
 msgid "Mixxx installation failed"
-msgstr ""
+msgstr "Mixxx instalace zlyhala"
 
 msgctxt "FailureRepairHeader"
 msgid "Mixxx repair failed"
-msgstr ""
+msgstr "Mixxx oprava zlyhala"
 
 msgctxt "FailureUninstallHeader"
 msgid "Mixxx uninstall failed"
-msgstr ""
+msgstr "Mixxx odinstalování zlyhalo"
 
 msgctxt "FailureHyperlinkLogText"
 msgid ""
@@ -359,12 +360,12 @@ msgstr ""
 msgctxt "FailureRestartText"
 msgid ""
 "You must restart your computer to complete the rollback of the software."
-msgstr ""
+msgstr "Je potřebné restartovat počítač pro dokončení vrácení instalace."
 
 msgctxt "FailureRestartButton"
 msgid "&Restart"
-msgstr ""
+msgstr "Restartovat"
 
 msgctxt "FailureCloseButton"
 msgid "&Close"
-msgstr ""
+msgstr "Ukončit"

build/wix/Localization/po/de-DE.po

@@ -2,14 +2,14 @@
 # Translators:
 # Inpromtu <kmbredt@gmail.com>, 2016
 # Inpromtu <kmbredt@gmail.com>, 2016
-# S.Brandt <s.brandt@mixxx.org>, 2017
+# S.Brandt <s.brandt@mixxx.org>, 2017-2018
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016-2017
 # Sebastien BLAISOT <sebastien@blaisot.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mixxx DJ Windows installer\n"
-"PO-Revision-Date: 2017-07-15 15:08+0000\n"
-"Last-Translator: Sebastien BLAISOT <sebastien@blaisot.org>\n"
+"PO-Revision-Date: 2018-03-22 21:11+0000\n"
+"Last-Translator: S.Brandt <s.brandt@mixxx.org>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/mixxx-dj-software/mixxxdj-windows-installer/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +63,7 @@ msgid ""
 "You are about to install the 32-bit version on a 64-bit operating system.\r\n"
 "We recommend using the 64-bit version for better performance.\r\n"
 "You can download the 64-bit installation package from http://mixxx.org/download/"
-msgstr "Sie sind dabei, die 32-Bit-Version auf einem 64-Bit-Betriebssystem zu installieren.\nWir empfehlen mit der 64-Bit-Version für bessere Performance.\nSie können das der 64-Bit-Installationspaket von http://mixxx.org/download/ herunterladen."
+msgstr "Sie installieren gerade die 32-Bit-Version auf einem 64-Bit-Betriebssystem. Wir empfehlen stattdessen die 64-Bit-Version für eine bessere Performance zu installieren. Sie können das 64-Bit-Installationspaket hier herunterladen: http://mixxx.org/download/"
 
 msgctxt "XPWarning"
 msgid ""
@@ -92,7 +92,7 @@ msgid ""
 "An older version of Mixxx has been detected. As we changed installer, we can"
 " not smoothly upgrade. Please uninstall older version before installing this"
 " one."
-msgstr "Eine ältere Version von Mixxx wurde erkannt. Da wir die Installer-Software geändert haben, können wir nicht problemlos aktualisieren. Bitte deinstallieren Sie ältere Version vor der Installation dieser neuen Version."
+msgstr "Eine ältere Version von Mixxx wurde erkannt. Da wir die Installer-Software geändert haben, können wir nicht problemlos aktualisieren. Bitte deinstallieren Sie die ältere Version vor der Installation dieser neuen Version."
 
 msgctxt "VCredistNotFound"
 msgid ""

res/controllers/Denon MC4000.midi.xml

@@ -941,10 +941,10 @@
                     <selectknob/>
                 </options>
             </control>
-            <!-- Library encoder button push maps to ChooseItem -->
+            <!-- Library encoder button push maps to GoToItem -->
             <control>
                 <group>[Library]</group>
-                <key>ChooseItem</key>
+                <key>GoToItem</key>
                 <status>0x9F</status>
                 <midino>0x1F</midino>
                 <options>