diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-12-26 09:27:13 -0800 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-12-26 09:27:13 -0800 |
| commit | 974bb2ad1b7ad1a06ddfc167903d29d977b142cc (patch) | |
| tree | cd06248fb943ddc3f5de7ac861964ad50df4332f /build | |
| parent | c05360f110f0280c028cf4d42fc4add94924f7c8 (diff) | |
| parent | 84ca00e624d8ceaa0ce9d503f699ec37b0718e39 (diff) | |
Merge remote-tracking branch 'mixxxdj/master' into remove-vamp
Diffstat (limited to 'build')
44 files changed, 775 insertions, 749 deletions
diff --git a/build/appveyor/build_mixxx.bat b/build/appveyor/build_mixxx.bat index e9f08e4b82..69e8371bf9 100644 --- a/build/appveyor/build_mixxx.bat +++ b/build/appveyor/build_mixxx.bat @@ -78,7 +78,7 @@ SET BIN_DIR=%WINLIB_DIR%\bin SET LIB_DIR=%WINLIB_DIR%\lib SET INCLUDE_DIR=%WINLIB_DIR%\include REM TODO(rryan): Remove hard-coding of Qt version. -set QT_VERSION=5.11.2 +set QT_VERSION=5.12.0 SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION% if NOT EXIST "%BIN_DIR%\scons.py" ( diff --git a/build/debian/control b/build/debian/control index b26aa9483f..a869259a8c 100644 --- a/build/debian/control +++ b/build/debian/control @@ -23,6 +23,7 @@ Build-Depends: debhelper (>= 9), libqt5svg5-dev, # Only needed for running tests that use SQLite. libqt5sql5-sqlite, + libqt5x11extras5-dev, scons, libjack-dev, portaudio19-dev, @@ -121,4 +122,4 @@ Depends: ${shlibs:Depends}, libqt5xml5, libqt5sql5, libqt5sql5-sqlite -Description: The Mixxx test suite.
\ No newline at end of file +Description: The Mixxx test suite. diff --git a/build/depends.py b/build/depends.py index 9e3de4a61d..8a34d59659 100644 --- a/build/depends.py +++ b/build/depends.py @@ -279,6 +279,9 @@ class Qt(Dependence): if not conf.CheckForPKG('Qt5Core', '5.0'): raise Exception('Qt >= 5.0 not found') + if not conf.CheckLib('Qt5X11Extras'): + raise Exception('Could not find Qt5X11Extras or its development headers') + qt_modules.extend(['QtDBus']) # This automatically converts QtXXX to Qt5XXX where appropriate. build.env.EnableQt5Modules(qt_modules, debug=False) @@ -374,6 +377,7 @@ class Qt(Dependence): build.env.Append(LIBS = 'userenv') # qt5core build.env.Append(LIBS = 'uxtheme') # ? build.env.Append(LIBS = 'version') # ? + build.env.Append(LIBS = 'wtsapi32') # ? build.env.Append(LIBS = 'qtfreetype') build.env.Append(LIBS = 'qtharfbuzz') @@ -1212,6 +1216,7 @@ class MixxxCore(Feature): "src/util/screensaver.cpp", "src/util/indexrange.cpp", "src/util/desktophelper.cpp", + "src/util/widgetrendertimer.cpp", ] proto_args = { @@ -1435,6 +1440,7 @@ class MixxxCore(Feature): # system libraries. This cuts down on Mixxx's compilation output # significantly when using Homebrew installed to /usr/local. build.env.Append(CCFLAGS=['-isystem', '/usr/local/include']) + elif build.platform_is_bsd: build.env.Append(CPPDEFINES='__BSD__') build.env.Append(CPPPATH=['/usr/include', diff --git a/build/features.py b/build/features.py index cc66181715..399ce035d3 100644 --- a/build/features.py +++ b/build/features.py @@ -328,6 +328,7 @@ class VinylControl(Feature): return sources + class ModPlug(Feature): def description(self): return "Modplug module decoder plugin" diff --git a/build/osx/golden_environment b/build/osx/golden_environment index d23d7c3577..0951151201 100644 --- a/build/osx/golden_environment +++ b/build/osx/golden_environment @@ -1 +1 @@ -2.3-j00001-6fe69c4-osx10.11-x86_64-release +2.3-j00002-e5dbf6e0-osx10.11-x86_64-release diff --git a/build/windows/golden_environment b/build/windows/golden_environment index 57aa525c91..6dfe2d5740 100644 --- a/build/windows/golden_environment +++ b/build/windows/golden_environment @@ -1 +1 @@ -2.3-j00009-PLATFORM-CONFIGURATION-static-f588d481-minimal
\ No newline at end of file +2.3-j00013-PLATFORM-CONFIGURATION-static-36f44bd2-minimal diff --git a/build/wix/Localization/README-Translations.md b/build/wix/Localization/README-Translations.md index 682aff2a98..78a6d5b7fc 100644 --- a/build/wix/Localization/README-Translations.md +++ b/build/wix/Localization/README-Translations.md @@ -24,13 +24,13 @@ Updating translations from Transifex First, pull new translations from Transifex -`$ tx pull -r mixxxdj-windows-installer.mixxxpot -a --minimum-perc=60` +`$ tx pull -r mixxxdj-windows-installer.mixxxpot -a --minimum-perc=1` Then, rebuild wxl files from po files ``` $ cd build/wix/Localization -build/wix/Localization$ for i in po/*.po; do destfile=${i#po/}; /path/to/po2wxl.py -l Language -f -p 60 $i mixxx_${destfile%.po}.wxl; done +build/wix/Localization$ for i in po/*.po; do destfile=${i#po/}; /path/to/po2wxl.py -l Language -f -p 1 $i mixxx_${destfile%.po}.wxl; done ``` Explanations for the above line : diff --git a/build/wix/Localization/mixxx_ca-ES.wxl b/build/wix/Localization/mixxx_ca-ES.wxl index 7cd4d909b0..94195cb30f 100644 --- a/build/wix/Localization/mixxx_ca-ES.wxl +++ b/build/wix/Localization/mixxx_ca-ES.wxl @@ -22,7 +22,7 @@ <!-- Error messages --> <!-- DO NOT BREAK LINES BECAUSE LINE BREAKS WILL SHOW UP AS-IS IN THE INTERFACE --> - <String Id="OS2Old">Aquesta aplicació requereix Windows XP o una versió més recent.</String> + <String Id="OS2Old">Aquesta aplicació requereix Windows 7 o una versió més recent.</String> <String Id="NewerInstalled">Ja teniu instal·lada aquesta versió del Mixxx o una més recent.</String> <String Id="x64VersionRequired">Heu d'instal·lar la versió de 64 bits d'aquest producte en un Windows de 64 bits.</String> <String Id="x86VersionRequired">Heu d'instal·lar la versió de 32 bits d'aquest producte en un Windows de 32 bits.</String> @@ -31,7 +31,7 @@ <String Id="bitWidthMismatch32">Esteu a punt d'instal·lar la versió de 32 bits tot i que teniu instal·lada una versió de 64 bits. Això pot provocar un comportament no desitjat. Desinstal·leu primer la versió existent del Mixxx o baixeu l'instal·lador de 64 bits per actualitzar la versió (a no ser que sapigueu exactament què esteu fent).</String> <String Id="bitWidthMismatch64">Esteu a punt d'instal·lar la versió de 64 bits tot i que teniu instal·lada una versió de 32 bits. Això pot provocar un comportament no desitjat. Desinstal·leu primer la versió existent del Mixxx o baixeu l'instal·lador de 32 bits per a actualitzar la versió (a no ser que sapigueu exactament què esteu fent).</String> <String Id="OlderVersionFound">S'ha detectat una versió anterior del Mixxx. Atès la limitació de l'instal·lador, no és possible actualitzar automàticament. Desinstal·leu la versió existent abans d'instal·lar aquesta versió.</String> - <String Id="VCredistNotFound">Installer was not able to find Microsoft Visual C++ 2015 Redistributable on this system. This is likely an installer bug that should be reported to Mixxx developers.</String> + <String Id="VCredistNotFound">L'instal·lador no ha trobat les llibreries de Microsoft Visual C++ 2015 en aquest ordinador. Probablement es tracta d'un error de l'instal·lador que hauríeu de reportar als desenvolupadors del Mixxx.</String> <!-- Custom Warning Dialog --> <String Id="WarningDlgTitle">{\WixUI_Font_Title}Avís</String> @@ -53,52 +53,52 @@ <String Id="FeatureTranslationsDescription">Fitxers de recursos addicionals que permeten mostrar el Mixxx en idiomes alternatius a l'anglès.</String> <!-- Bootstrapper --> - <String Id="Caption">[WixBundleName] Setup</String> + <String Id="Caption">[WixBundleName] Configuració</String> <String Id="Title">[WixBundleName]</String> - <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String> - <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String> - <String Id="HelpHeader">Setup Help</String> - <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or creates a complete local copy of the bundle in directory. Install is the default. /passive | /quiet - displays minimal user interface with no prompts or displays no user interface and no prompts. By default user interface and all prompts are displayed. /norestart - suppress any attempts to restart. By default user interface will prompt before restart. /log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String> - <String Id="HelpCloseButton">&Close</String> - <String Id="InstallHeader">Welcome</String> - <String Id="InstallMessage">Setup will install Mixxx on your computer. It will first install required third party libraries, then Mixxx itself. Click Install to continue or Close to exit.</String> - <String Id="InstallVersion">Version [WixBundleVersion]</String> - <String Id="InstallOptionsButton">&Options</String> - <String Id="InstallInstallButton">&Install</String> - <String Id="InstallCloseButton">&Close</String> - <String Id="OptionsHeader">Setup Options</String> - <String Id="OptionsLocationLabel">Install location:</String> - <String Id="OptionsBrowseButton">&Browse</String> - <String Id="OptionsOkButton">&OK</String> - <String Id="OptionsCancelButton">&Cancel</String> - <String Id="FilesInUseHeader">Files In Use</String> - <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> - <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> - <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> - <String Id="FilesInUseOkButton">&OK</String> - <String Id="FilesInUseCancelButton">&Cancel</String> - <String Id="ProgressHeader">Setup Progress</String> - <String Id="ProgressLabel">Processing:</String> - <String Id="OverallProgressPackageText">Initializing...</String> - <String Id="ProgressCancelButton">&Cancel</String> - <String Id="ModifyHeader">Modify Setup</String> - <String Id="ModifyRepairButton">&Repair</String> - <String Id="ModifyUninstallButton">&Uninstall</String> - <String Id="ModifyCloseButton">&Close</String> - <String Id="SuccessHeader">Setup Successful</String> - <String Id="SuccessInstallHeader">Mixxx installation has been successful</String> - <String Id="SuccessRepairHeader">Mixxx repair has been successful</String> - <String Id="SuccessUninstallHeader">Mixxx uninstall has been successful</String> - <String Id="SuccessLaunchButton">&Launch</String> - <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String> - <String Id="SuccessRestartButton">&Restart</String> - <String Id="SuccessCloseButton">&Close</String> - <String Id="FailureHeader">Setup Failed</String> - <String Id="FailureInstallHeader">Mixxx installation failed</String> - <String Id="FailureRepairHeader">Mixxx repair failed</String> - <String Id="FailureUninstallHeader">Mixxx uninstall failed</String> - <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String> - <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> - <String Id="FailureRestartButton">&Restart</String> - <String Id="FailureCloseButton">&Close</String> + <String Id="ConfirmCancelMessage">Confirmeu que voleu cancel·lar?</String> + <String Id="ExecuteUpgradeRelatedBundleMessage">Versió prèvia</String> + <String Id="HelpHeader">Ajuda sobre la configuració</String> + <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - instal·la, repara, desinstal·la or genera una copia completa en el directori indicat. La opció per defectes és instal·la. /passive | /quiet - mostra una interfície mínima sense preguntes, o bé no mostra ni pregunta res. Per defecte, es mostra la interfície i es demana confirmació. /norestart - descarta els intents de reiniciar per part de l'instal·lador. Per defecte, es demana a l'usuari si vol reiniciar. /log log.txt - Escriu el log de la instal·lació en el fitxer indicat. Per defecte es crea en el directori %TEMP%.</String> + <String Id="HelpCloseButton">&Tanca</String> + <String Id="InstallHeader">Benvinguts</String> + <String Id="InstallMessage">Aquesta aplicació instal·larà el Mixxx en el vostre ordinador. Primer instal·larà les llibreries de tercers necessaries, i després el Mixxx. Feu clic a Instal·la per continuar o Tanca per sortir.</String> + <String Id="InstallVersion">Versió [WixBundleVersion]</String> + <String Id="InstallOptionsButton">&Opcions</String> + <String Id="InstallInstallButton">&Instal·la</String> + <String Id="InstallCloseButton">&Tanca</String> + <String Id="OptionsHeader">Opcions de configuració</String> + <String Id="OptionsLocationLabel">Carpeta de destinació:</String> + <String Id="OptionsBrowseButton">&Navega</String> + <String Id="OptionsOkButton">&Accepta</String> + <String Id="OptionsCancelButton">&Cancel·la</String> + <String Id="FilesInUseHeader">Fitxers en ús</String> + <String Id="FilesInUseLabel">Les següents aplicacions estan utilitzant fitxers que cal actualitzar:</String> + <String Id="FilesInUseCloseRadioButton">Tanca les &aplicacions i intenta reiniciar-les després.</String> + <String Id="FilesInUseDontCloseRadioButton">&No tanquis les aplicacions. Serà necessari reiniciar.</String> + <String Id="FilesInUseOkButton">Accepta</String> + <String Id="FilesInUseCancelButton">&Cancel·la</String> + <String Id="ProgressHeader">Progrés de la instal·lació</String> + <String Id="ProgressLabel">Processant:</String> + <String Id="OverallProgressPackageText">Inicialitzant...</String> + <String Id="ProgressCancelButton">&Cancel·la</String> + <String Id="ModifyHeader">Canvia la configuració</String> + <String Id="ModifyRepairButton">&Repara</String> + <String Id="ModifyUninstallButton">&Desinstal·la</String> + <String Id="ModifyCloseButton">&Tanca</String> + <String Id="SuccessHeader">Configuració correcta</String> + <String Id="SuccessInstallHeader">La instal·lació del Mixxx s'ha realitzat correctament</String> + <String Id="SuccessRepairHeader">La reparació del Mixxx s'ha realitzat correctament</String> + <String Id="SuccessUninstallHeader">La desinstal·lació del Mixxx s'ha realitzat correctament</String> + <String Id="SuccessLaunchButton">&Inicia</String> + <String Id="SuccessRestartText">Heu de reiniciar l'ordinador abans de poder utilitzar l'aplicació.</String> + <String Id="SuccessRestartButton">&Reinicia</String> + <String Id="SuccessCloseButton">&Tanca</String> + <String Id="FailureHeader">Configuració fallida</String> + <String Id="FailureInstallHeader">La instal·lació del Mixxx ha fallat</String> + <String Id="FailureRepairHeader">La reparació del Mixxx ha fallat</String> + <String Id="FailureUninstallHeader">La desinstal·lació del Mixxx ha fallat</String> + <String Id="FailureHyperlinkLogText">Hi ha hagut un o més problemes durant la instal·lació. Si us plau, corregiu-los i intenteu-ho de nou. Per a més informació consulteu el <a href="#">fitxer de log</a>.</String> + <String Id="FailureRestartText">Heu de reiniciar l'ordinador per acabar de restaurar el sistema a abans de la instal·lació.</String> + <String Id="FailureRestartButton">&Reinicia</String> + <String Id="FailureCloseButton">&Tanca</String> </WixLocalization> diff --git a/build/wix/Localization/mixxx_cs-CZ.wxl b/build/wix/Localization/mixxx_cs-CZ.wxl index 7be8d629bf..2b1e3f4e4f 100644 --- a/build/wix/Localization/mixxx_cs-CZ.wxl +++ b/build/wix/Localization/mixxx_cs-CZ.wxl @@ -22,14 +22,14 @@ <!-- Error messages --> <!-- DO NOT BREAK LINES BECAUSE LINE BREAKS WILL SHOW UP AS-IS IN THE INTERFACE --> - <String Id="OS2Old">Tento výrobek vyžaduje Windows XP nebo vyšší.</String> + <String Id="OS2Old">Tento výrobek vyžaduje Windows 7 nebo vyšší.</String> <String Id="NewerInstalled">Již je nainstalována stejná nebo novější verze tohoto výrobku.</String> <String Id="x64VersionRequired">Do 64bitových Windows musíte nainstalovat 64bitovou verzi tohoto výrobku.</String> <String Id="x86VersionRequired">Do 32bitových Windows musíte nainstalovat 32bitovou verzi tohoto výrobku.</String> <String Id="x86VersionWarning">Chystáte se nainstalovat 32bitovou verzi do 64bitového operačního systému. Doporučujeme použít 64bitovou verzi kvůli lepšímu výkonu. Instalační balíček pro 64bitový systém můžete stáhnout z http://mixxx.org/download/</String> <String Id="XPWarning">Instalujete Mixxx do zastaralého operačního systému. Některé funkce nemusí pracovat dobře, nebo nebudou pracovat vůbec. Doporučujeme vám povýšení operačního sytému.</String> - <String Id="bitWidthMismatch32">Chystáte se nainstalovat 32bitovou verzi, ale již je nainstalována 64bitová verze. To může vést k neobvyklému chování. Odinstalujte, prosím, nejprve stávající verzi Mixxxu, nebo pro povýšení verze stáhněte instalační balíček pro 64bitový systém (pokud přesně nevíte, co děláte).</String> - <String Id="bitWidthMismatch64">Chystáte se nainstalovat 64bitovou verzi, ale již je nainstalována 32bitová verze. To může vést k neobvyklému chování. Odinstalujte, prosím, nejprve stávající verzi Mixxxu, nebo pro povýšení verze stáhněte instalační balíček pro 32bitový systém (pokud přesně nevíte, co děláte).</String> + <String Id="bitWidthMismatch32">Chystáte se nainstalovat 32bitovou verzi, ale již je nainstalována 64bitová verze. To může vést k neobvyklému chování. Odinstalujte, prosím, nejprve stávající verzi Mixxxu, nebo pro povýšení verze stáhněte instalační balíček pro 64bitový systém (pokud přesně nevíte, co děláte).</String> + <String Id="bitWidthMismatch64">Chystáte se nainstalovat 64bitovou verzi, ale již je nainstalována 32bitová verze. To může vést k neobvyklému chování. Odinstalujte, prosím, nejprve stávající verzi Mixxxu, nebo pro povýšení verze stáhněte instalační balíček pro 32bitový systém (pokud přesně nevíte, co děláte).</String> <String Id="OlderVersionFound">Byla zjištěna starší verze Mixxxu. Protože byl změněn instalátor, není možné povýšení provést hladce. Odinstalujte, prosím, starší verzi, předtím než začnete instalovat tuto.</String> <String Id="VCredistNotFound">Installer was not able to find Microsoft Visual C++ 2015 Redistributable on this system. This is likely an installer bug that should be reported to Mixxx developers.</String> @@ -53,52 +53,52 @@ <String Id="FeatureTranslationsDescription">Zdrojové soubory, které Mixxx umožní provedení instalace Mixxxu v jiných jazycích, než je americká angličtina</String> <!-- Bootstrapper --> - <String Id="Caption">[WixBundleName] Setup</String> + <String Id="Caption">[wixBundleName]Instalace</String> <String Id="Title">[WixBundleName]</String> - <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String> - <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String> - <String Id="HelpHeader">Setup Help</String> + <String Id="ConfirmCancelMessage">Chcete opravdu ukončit instalaci ? </String> + <String Id="ExecuteUpgradeRelatedBundleMessage">Předchozí verze</String> + <String Id="HelpHeader">Nápověda k instalaci.</String> <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or creates a complete local copy of the bundle in directory. Install is the default. /passive | /quiet - displays minimal user interface with no prompts or displays no user interface and no prompts. By default user interface and all prompts are displayed. /norestart - suppress any attempts to restart. By default user interface will prompt before restart. /log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String> - <String Id="HelpCloseButton">&Close</String> - <String Id="InstallHeader">Welcome</String> - <String Id="InstallMessage">Setup will install Mixxx on your computer. It will first install required third party libraries, then Mixxx itself. Click Install to continue or Close to exit.</String> - <String Id="InstallVersion">Version [WixBundleVersion]</String> - <String Id="InstallOptionsButton">&Options</String> - <String Id="InstallInstallButton">&Install</String> - <String Id="InstallCloseButton">&Close</String> - <String Id="OptionsHeader">Setup Options</String> - <String Id="OptionsLocationLabel">Install location:</String> - <String Id="OptionsBrowseButton">&Browse</String> - <String Id="OptionsOkButton">&OK</String> - <String Id="OptionsCancelButton">&Cancel</String> - <String Id="FilesInUseHeader">Files In Use</String> - <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String> - <String Id="FilesInUseCloseRadioButton">Close the &applications and attempt to restart them.</String> - <String Id="FilesInUseDontCloseRadioButton">&Do not close applications. A reboot will be required.</String> - <String Id="FilesInUseOkButton">&OK</String> - <String Id="FilesInUseCancelButton">&Cancel</String> - <String Id="ProgressHeader">Setup Progress</String> - <String Id="ProgressLabel">Processing:</String> - <String Id="OverallProgressPackageText">Initializing...</String> - <String Id="ProgressCancelButton">&Cancel</String> - <String Id="ModifyHeader">Modify Setup</String> - <String Id="ModifyRepairButton">&Repair</String> - <String Id="ModifyUninstallButton">&Uninstall</String> - <String Id="ModifyCloseButton">&Close</String> - <String Id="SuccessHeader">Setup Successful</String> - <String Id="SuccessInstallHeader">Mixxx installation has been successful</String> - <String Id="SuccessRepairHeader">Mixxx repair has been successful</String> - <String Id="SuccessUninstallHeader">Mixxx uninstall has been successful</String> - <String Id="SuccessLaunchButton">&Launch</String> - <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String> - <String Id="SuccessRestartButton">&Restart</String> - <String Id="SuccessCloseButton">&Close</String> - <String Id="FailureHeader">Setup Failed</String> - <String Id="FailureInstallHeader">Mixxx installation failed</String> - <String Id="FailureRepairHeader">Mixxx repair failed</String> - <String Id="FailureUninstallHeader">Mixxx uninstall failed</String> + <String Id="HelpCloseButton">Zavřít.</String> + <String Id="InstallHeader">Vítejte.</String> + <String Id="InstallMessage">Mixx bude nainstalován na váš počítač. Nejprve nainstaluje požadované knihovny, potom samotní Mixx. Kliknete Instalovat pro pokračování nebo Zavřít pro ukončení.</String> + <String Id="InstallVersion">Verze [WixBundleVersion]</String> + <String Id="InstallOptionsButton">Možnosti</String> + <String Id="InstallInstallButton">Instalovat</String> + <String Id="InstallCloseButton">Ukončit</String> + <String Id="OptionsHeader">Nastavení instalace</String> + <String Id="OptionsLocationLabel">Umístnení instalace</String> + <String Id="OptionsBrowseButton">Prohledávat</String> + <String Id="OptionsOkButton">OK</String> + <String Id="OptionsCancelButton">Ukončit</String> + <String Id="FilesInUseHeader">Používané soubory</String> + <String Id="FilesInUseLabel">Tyto aplikace používají soubory, které je třeba aktualizovat:</String> + <String Id="FilesInUseCloseRadioButton">Zavřít aplikace a pokusit se je restartovat. </String> + <String Id="FilesInUseDontCloseRadioButton">Nezavírejte tyto aplikace. Požaduje se restart. </String> + <String Id="FilesInUseOkButton">OK</String> + <String Id="FilesInUseCancelButton">Ukončit</String> + <String Id="ProgressHeader">Průběh instalace</String> + <String Id="ProgressLabel">Spracováva se: </String> + <String Id="OverallProgressPackageText">Načítávam...</String> + <String Id="ProgressCancelButton">Ukončit</String> + <String Id="ModifyHeader">Upravit Instalaci</String> + <String Id="ModifyRepairButton">Opravit</String> + <String Id="ModifyUninstallButton">Odinstalovat</String> + <String Id="ModifyCloseButton">Ukončit</String> + <String Id="SuccessHeader">Instalace úspěšná</String> + <String Id="SuccessInstallHeader">Mixxx byl úspěšne nainstalován</String> + <String Id="SuccessRepairHeader">Mixxx byl úspěšne nainstalován</String> + <String Id="SuccessUninstallHeader">Mixx byl úspěšne odinstalován</String> + <String Id="SuccessLaunchButton">Spustit</String> + <String Id="SuccessRestartText">Prosím restartujte počítač pro bezchybný chod softwaru. </String> + <String Id="SuccessRestartButton">Restartovat</String> + <String Id="SuccessCloseButton">Ukončit</String> + <String Id="FailureHeader">Instalace se nezdařila</String> + <String Id="FailureInstallHeader">Mixxx instalace zlyhala</String> + <String Id="FailureRepairHeader">Mixxx oprava zlyhala</String> + <String Id="FailureUninstallHeader">Mixxx odinstalování zlyhalo</String> <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String> - <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> - <String Id="FailureRestartButton">&Restart</String> - <String Id="FailureCloseButton">&Close</String> + <String Id="FailureRestartText">Je potřebné restartovat počítač pro dokončení vrácení instalace.</String> + <String Id="FailureRestartButton">Restartovat</String> + <String Id="FailureCloseButton">Ukončit</String> </WixLocalization> diff --git a/build/wix/Localization/mixxx_de-DE.wxl b/build/wix/Localization/mixxx_de-DE.wxl index a069001f46..15623815de 100644 --- a/build/wix/Localization/mixxx_de-DE.wxl +++ b/build/wix/Localization/mixxx_de-DE.wxl @@ -22,15 +22,15 @@ <!-- Error messages --> <!-- DO NOT BREAK LINES BECAUSE LINE BREAKS WILL SHOW UP AS-IS IN THE INTERFACE --> - <String Id="OS2Old">Dieses Produkt erfordert Windows XP oder höher.</String> + <String Id="OS2Old">Dieses Produkt erfordert Windows 7 oder höher.</String> <String Id="NewerInstalled">Die gleiche oder eine neuere Version dieses Produkts ist bereits installiert.</String> <String Id="x64VersionRequired">Sie |