From 8af64c9e718bc147bd2952b0454aa8a35b5191dd Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 6 Aug 2016 20:12:39 +0200 Subject: [PATCH] Merge with develop --- .../nel/src/3d/driver/direct3d/CMakeLists.txt | 2 +- .../src/sound/driver/dsound/CMakeLists.txt | 2 +- code/nel/src/sound/driver/dsound/stddsound.h | 1 + .../src/sound/driver/xaudio2/CMakeLists.txt | 2 +- .../client/ryzom_installer/CMakeLists.txt | 4 +- .../client/ryzom_installer/src/configfile.cpp | 3 +- .../tools/client/ryzom_installer/src/main.cpp | 6 +- .../ryzom_installer/src/settingsdialog.cpp | 20 +- .../ryzom_installer/src/settingsdialog.h | 7 + .../translations/ryzom_installer_de.ts | 744 ++++++++++++++++++ .../translations/ryzom_installer_en.ts | 744 ++++++++++++++++++ .../translations/ryzom_installer_es.ts | 744 ++++++++++++++++++ .../translations/ryzom_installer_fr.ts | 744 ++++++++++++++++++ .../translations/ryzom_installer_ru.ts | 744 ++++++++++++++++++ .../translations/translations.qrc | 9 + .../ryzom_installer/ui/settingsdialog.ui | 54 +- .../georges_plugin_sound/CMakeLists.txt | 2 +- 17 files changed, 3799 insertions(+), 33 deletions(-) create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_en.ts create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts create mode 100644 code/ryzom/tools/client/ryzom_installer/translations/translations.qrc diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt index 125815dc0..d74bdeceb 100644 --- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt +++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt @@ -4,7 +4,7 @@ NL_TARGET_DRIVER(nel_drv_direct3d_win ${SRC}) INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d nelmisc ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY}) +TARGET_LINK_LIBRARIES(nel_drv_direct3d_win nel3d nelmisc ${DXSDK_D3DX9_LIBRARY} ${DXSDK_D3D9_LIBRARY}) NL_DEFAULT_PROPS(nel_drv_direct3d_win "NeL, Driver, Video: Direct3D") NL_ADD_RUNTIME_FLAGS(nel_drv_direct3d_win) diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/code/nel/src/sound/driver/dsound/CMakeLists.txt index 8eba07fb6..e3a81fb85 100644 --- a/code/nel/src/sound/driver/dsound/CMakeLists.txt +++ b/code/nel/src/sound/driver/dsound/CMakeLists.txt @@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h *.def *.rc) NL_TARGET_DRIVER(nel_drv_dsound_win ${SRC}) INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nel_drv_dsound_win nelmisc nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY}) +TARGET_LINK_LIBRARIES(nel_drv_dsound_win nelmisc nelsnd_lowlevel ${DXSDK_DSOUND_LIBRARY}) NL_DEFAULT_PROPS(nel_drv_dsound_win "NeL, Driver, Sound: DirectSound") NL_ADD_RUNTIME_FLAGS(nel_drv_dsound_win) diff --git a/code/nel/src/sound/driver/dsound/stddsound.h b/code/nel/src/sound/driver/dsound/stddsound.h index 008fa4ad3..f550e8150 100644 --- a/code/nel/src/sound/driver/dsound/stddsound.h +++ b/code/nel/src/sound/driver/dsound/stddsound.h @@ -22,6 +22,7 @@ # include #endif +#include #include #include diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt index 4e2567959..62bbdcb55 100644 --- a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt +++ b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt @@ -30,7 +30,7 @@ NL_TARGET_DRIVER(nel_drv_xaudio2_win ${SRC}) INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nel_drv_xaudio2_win nelmisc nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY} ${DXSDK_GUID_LIBRARY}) +TARGET_LINK_LIBRARIES(nel_drv_xaudio2_win nelmisc nelsnd_lowlevel ${DXSDK_XAUDIO_LIBRARY}) NL_DEFAULT_PROPS(nel_drv_xaudio2_win "NeL, Driver, Sound: XAudio2") NL_ADD_RUNTIME_FLAGS(nel_drv_xaudio2_win) diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt index 2726ea489..333d9454c 100644 --- a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt +++ b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt @@ -7,8 +7,8 @@ FILE(GLOB CLIENT_INSTALL_UIS ui/*.ui) FILE(GLOB CLIENT_INSTALL_TRANS translations/*.ts) FILE(GLOB CLIENT_INSTALL_RCS res/*.qrc) -#CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) -#SET(CLIENT_INSTALL_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) +CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) +LIST(APPEND CLIENT_INSTALL_RCS ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) IF(WITH_QT) INCLUDE_DIRECTORIES(${QT_INCLUDES}) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 204f86229..de485e870 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -184,7 +184,8 @@ bool CConfigFile::load(const QString &filename) if (useDefaultValues) { - // TODO: make a backup of custom installer.ini + // make a backup of custom ryzom_installer.ini + QFile::copy(filename, filename + ".bak"); } // custom choices, always keep them diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 82ab9939c..481c15bff 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -116,16 +116,16 @@ int main(int argc, char *argv[]) if (step == DisplayNoServerError) { - QMessageBox::critical(NULL, QApplication::tr("Error"), QApplication::tr("Unable to find installer.ini")); + QMessageBox::critical(NULL, QApplication::tr("Error"), QApplication::tr("Unable to find ryzom_installer.ini")); return 1; } - // use product name from installer.ini + // use product name from ryzom_installer.ini if (!config.getProductName().isEmpty()) QApplication::setApplicationName(config.getProductName()); // define commandline arguments QCommandLineParser parser; -// parser.setApplicationDescription(DESCRIPTION); + parser.setApplicationDescription(QApplication::tr("Instalation and launcher tool for Ryzom")); parser.addHelpOption(); parser.addVersionOption(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp index 7ffe515f5..53090b592 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp @@ -28,6 +28,10 @@ CSettingsDialog::CSettingsDialog(QWidget *parent):QDialog(parent) CConfigFile *config = CConfigFile::getInstance(); + m_installationDirectory = config->getInstallationDirectory(); + + updateInstallationDirectoryLabel(); + // only 64 bits OS can switch between 32 and 64 bits use64bitsClientsCheckBox->setEnabled(config->has64bitsOS()); @@ -47,6 +51,11 @@ CSettingsDialog::~CSettingsDialog() { } +QString CSettingsDialog::getInstallationDirectory() const +{ + return m_installationDirectory; +} + void CSettingsDialog::accept() { // TODO: add save code @@ -56,11 +65,16 @@ void CSettingsDialog::accept() void CSettingsDialog::onInstallationDirectoryButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom"), m_installationDirectory); if (directory.isEmpty()) return; -// m_dstDirectory = directory; + m_installationDirectory = directory; -// updateDestinationText(); + updateInstallationDirectoryLabel(); +} + +void CSettingsDialog::updateInstallationDirectoryLabel() +{ + installationDirectoryLabel->setText(m_installationDirectory); } diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h index 285a6417b..c2b3d69c8 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h @@ -33,11 +33,18 @@ public: CSettingsDialog(QWidget *parent = NULL); virtual ~CSettingsDialog(); + QString getInstallationDirectory() const; + public slots: void onInstallationDirectoryButtonClicked(); private slots: void accept(); + +private: + void updateInstallationDirectoryLabel(); + + QString m_installationDirectory; }; #endif diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts new file mode 100644 index 000000000..5fcaf6718 --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts @@ -0,0 +1,744 @@ + + + + + CDownloader + + File (%1B) is larger than expected (%2B) + + + + You only have %1 bytes left on device, but %2 bytes are required. + + + + Unable to write file + + + + Timeout + + + + Redirection URL is not defined + + + + Wrong status code: %1 + + + + Network error: %1 + + + + + CInstallDialog + + Old installation: %1 + + + + Internet (%1 to download) + + + + Files will be installed to (requires %1): + + + + Please choose directory where is installed Ryzom + + + + Unable to find Ryzom + + + + Unable to find Ryzom in selected directory. Please choose another one or cancel. + + + + Please choose directory where to install Ryzom + + + + Another location: %1 + + + + Undefined + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + CMainWindow + + About %1 + + + + Program to install, download and manage Ryzom profiles. + + + + Author: %1 + + + + Copyright: %1 + + + + Support: %1 + + + + + CMigrateDialog + + Files will be installed to (requires %1): + + + + Please choose directory where to install Ryzom + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + COperationDialog + + Confirmation + + + + Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. +Are you sure to abort download? + + + + %p% (%v/%m KiB) + + + + Error + + + + Download data required by server %1 + + + + Downloading %1... + + + + Extract data files required by server %1 + + + + Extracting %1... + + + + Download client required by server %1 + + + + Extract client files required by server %1 + + + + Copy data files required by server %1 + + + + Copying %1... + + + + Copy old profile to new location + + + + Extract client to new location + + + + Copy installer to new location + + + + Uninstall old client + + + + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + + + Clean obsolete files + + + + Deleting %1... + + + + Create default profile + + + + Create shortcuts for profile %1 + + + + Delete client files + + + + Unable to delete files for client %1 + + + + Add profiles + + + + Adding profile %1... + + + + Delete profiles + + + + Deleting profile %1... + + + + Unable to delete files for profile %1 + + + + Delete installer + + + + Delete downloaded files + + + + + CProfilesDialog + + Confirmation + + + + You're going to delete a profile, files won't be deleted and you'll have to do that manually. +Are you sure to delete this profile? + + + + Please choose Ryzom client executable to launch + + + + Executables (*.exe) + + + + + CProfilesModel + + #%1: %2 + + + + + CSettingsDialog + + Please choose directory where to install Ryzom + + + + + CUninstallDialog + + Component + + + + Size + + + + Client for %1 + + + + Profile #%1: %2 + + + + Installer + + + + Downloaded Files + + + + + InstallDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will allow you to download, install, configure or manage Ryzom on your computer. + +Just follow the different steps and make your choice between the different propositions. + + + + Show advanced parameters (expert) + + + + Files will be installed from: + + + + Old installation: %1 + + + + Another location: %1 + + + + Browse... + + + + Internet (%1 GiB to download) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + + MainWindow + + Ryzom Installer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + Atys + + + + Play + + + + Configure + + + + &Settings + + + + &Help + + + + About Qt + + + + About... + + + + &Profiles + + + + &Quit + + + + &Uninstall + + + + + MigrateDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. + +Just press Continue button and follow the different steps until everything is done. + + + + Show advanced parameters (expert) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Browse... + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + Continue + + + + Quit + + + + + OperationDialog + + Ryzom Installer + + + + Operation + + + + Operation progress + + + + + ProfilesDialog + + Dialog + + + + List of profiles: + + + + Add + + + + Delete + + + + Profile: + + + + 0 + + + + Name: + + + + Server: + + + + Atys + + + + Yubo + + + + Executable: + + + + ryzom_client_r.exe + + + + Default + + + + Browse... + + + + Arguments: + + + + Comments: + + + + Directory: + + + + ~/.ryzom/0 + + + + Open + + + + Create shortcuts: + + + + Desktop + + + + Start Menu + + + + + QApplication + + Error + + + + Unable to find ryzom_installer.ini + + + + Instalation and launcher tool for Ryzom + + + + Uninstall + + + + Silent mode + + + + Unable to open %1 + + + + Unable to open output file + + + + Unable to write output file + + + + 7zip decoder doesn't support this archive + + + + Unable to allocate memory + + + + Error %1 + + + + Unable to create directory %1 + + + + Unable to set permissions of %1 + + + + disk full + + + + unable to write %1 + + + + unable to read %1 + + + + failed (%1) + + + + Unable to unpack %1 to %2: %3 + + + + Unable to copy file %1 + + + + + QObject + + B + + + + KiB + + + + MiB + + + + GiB + + + + TiB + + + + PiB + + + + + SettingsDialog + + Dialog + + + + Use 64 bits client + + + + Base location of Ryzom files: + + + + Language + + + + Browse... + + + + Location of source Ryzom files: + + + + D:\Ryzom + + + + E:\Ryzom + + + + + UninstallDialog + + Ryzom Installer + + + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + + + + Components to remove + + + + Uninstall + + + + Cancel + + + + diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_en.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_en.ts new file mode 100644 index 000000000..5fcaf6718 --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_en.ts @@ -0,0 +1,744 @@ + + + + + CDownloader + + File (%1B) is larger than expected (%2B) + + + + You only have %1 bytes left on device, but %2 bytes are required. + + + + Unable to write file + + + + Timeout + + + + Redirection URL is not defined + + + + Wrong status code: %1 + + + + Network error: %1 + + + + + CInstallDialog + + Old installation: %1 + + + + Internet (%1 to download) + + + + Files will be installed to (requires %1): + + + + Please choose directory where is installed Ryzom + + + + Unable to find Ryzom + + + + Unable to find Ryzom in selected directory. Please choose another one or cancel. + + + + Please choose directory where to install Ryzom + + + + Another location: %1 + + + + Undefined + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + CMainWindow + + About %1 + + + + Program to install, download and manage Ryzom profiles. + + + + Author: %1 + + + + Copyright: %1 + + + + Support: %1 + + + + + CMigrateDialog + + Files will be installed to (requires %1): + + + + Please choose directory where to install Ryzom + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + COperationDialog + + Confirmation + + + + Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. +Are you sure to abort download? + + + + %p% (%v/%m KiB) + + + + Error + + + + Download data required by server %1 + + + + Downloading %1... + + + + Extract data files required by server %1 + + + + Extracting %1... + + + + Download client required by server %1 + + + + Extract client files required by server %1 + + + + Copy data files required by server %1 + + + + Copying %1... + + + + Copy old profile to new location + + + + Extract client to new location + + + + Copy installer to new location + + + + Uninstall old client + + + + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + + + Clean obsolete files + + + + Deleting %1... + + + + Create default profile + + + + Create shortcuts for profile %1 + + + + Delete client files + + + + Unable to delete files for client %1 + + + + Add profiles + + + + Adding profile %1... + + + + Delete profiles + + + + Deleting profile %1... + + + + Unable to delete files for profile %1 + + + + Delete installer + + + + Delete downloaded files + + + + + CProfilesDialog + + Confirmation + + + + You're going to delete a profile, files won't be deleted and you'll have to do that manually. +Are you sure to delete this profile? + + + + Please choose Ryzom client executable to launch + + + + Executables (*.exe) + + + + + CProfilesModel + + #%1: %2 + + + + + CSettingsDialog + + Please choose directory where to install Ryzom + + + + + CUninstallDialog + + Component + + + + Size + + + + Client for %1 + + + + Profile #%1: %2 + + + + Installer + + + + Downloaded Files + + + + + InstallDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will allow you to download, install, configure or manage Ryzom on your computer. + +Just follow the different steps and make your choice between the different propositions. + + + + Show advanced parameters (expert) + + + + Files will be installed from: + + + + Old installation: %1 + + + + Another location: %1 + + + + Browse... + + + + Internet (%1 GiB to download) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + + MainWindow + + Ryzom Installer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + Atys + + + + Play + + + + Configure + + + + &Settings + + + + &Help + + + + About Qt + + + + About... + + + + &Profiles + + + + &Quit + + + + &Uninstall + + + + + MigrateDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. + +Just press Continue button and follow the different steps until everything is done. + + + + Show advanced parameters (expert) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Browse... + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + Continue + + + + Quit + + + + + OperationDialog + + Ryzom Installer + + + + Operation + + + + Operation progress + + + + + ProfilesDialog + + Dialog + + + + List of profiles: + + + + Add + + + + Delete + + + + Profile: + + + + 0 + + + + Name: + + + + Server: + + + + Atys + + + + Yubo + + + + Executable: + + + + ryzom_client_r.exe + + + + Default + + + + Browse... + + + + Arguments: + + + + Comments: + + + + Directory: + + + + ~/.ryzom/0 + + + + Open + + + + Create shortcuts: + + + + Desktop + + + + Start Menu + + + + + QApplication + + Error + + + + Unable to find ryzom_installer.ini + + + + Instalation and launcher tool for Ryzom + + + + Uninstall + + + + Silent mode + + + + Unable to open %1 + + + + Unable to open output file + + + + Unable to write output file + + + + 7zip decoder doesn't support this archive + + + + Unable to allocate memory + + + + Error %1 + + + + Unable to create directory %1 + + + + Unable to set permissions of %1 + + + + disk full + + + + unable to write %1 + + + + unable to read %1 + + + + failed (%1) + + + + Unable to unpack %1 to %2: %3 + + + + Unable to copy file %1 + + + + + QObject + + B + + + + KiB + + + + MiB + + + + GiB + + + + TiB + + + + PiB + + + + + SettingsDialog + + Dialog + + + + Use 64 bits client + + + + Base location of Ryzom files: + + + + Language + + + + Browse... + + + + Location of source Ryzom files: + + + + D:\Ryzom + + + + E:\Ryzom + + + + + UninstallDialog + + Ryzom Installer + + + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + + + + Components to remove + + + + Uninstall + + + + Cancel + + + + diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts new file mode 100644 index 000000000..5fcaf6718 --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts @@ -0,0 +1,744 @@ + + + + + CDownloader + + File (%1B) is larger than expected (%2B) + + + + You only have %1 bytes left on device, but %2 bytes are required. + + + + Unable to write file + + + + Timeout + + + + Redirection URL is not defined + + + + Wrong status code: %1 + + + + Network error: %1 + + + + + CInstallDialog + + Old installation: %1 + + + + Internet (%1 to download) + + + + Files will be installed to (requires %1): + + + + Please choose directory where is installed Ryzom + + + + Unable to find Ryzom + + + + Unable to find Ryzom in selected directory. Please choose another one or cancel. + + + + Please choose directory where to install Ryzom + + + + Another location: %1 + + + + Undefined + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + CMainWindow + + About %1 + + + + Program to install, download and manage Ryzom profiles. + + + + Author: %1 + + + + Copyright: %1 + + + + Support: %1 + + + + + CMigrateDialog + + Files will be installed to (requires %1): + + + + Please choose directory where to install Ryzom + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + COperationDialog + + Confirmation + + + + Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. +Are you sure to abort download? + + + + %p% (%v/%m KiB) + + + + Error + + + + Download data required by server %1 + + + + Downloading %1... + + + + Extract data files required by server %1 + + + + Extracting %1... + + + + Download client required by server %1 + + + + Extract client files required by server %1 + + + + Copy data files required by server %1 + + + + Copying %1... + + + + Copy old profile to new location + + + + Extract client to new location + + + + Copy installer to new location + + + + Uninstall old client + + + + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + + + Clean obsolete files + + + + Deleting %1... + + + + Create default profile + + + + Create shortcuts for profile %1 + + + + Delete client files + + + + Unable to delete files for client %1 + + + + Add profiles + + + + Adding profile %1... + + + + Delete profiles + + + + Deleting profile %1... + + + + Unable to delete files for profile %1 + + + + Delete installer + + + + Delete downloaded files + + + + + CProfilesDialog + + Confirmation + + + + You're going to delete a profile, files won't be deleted and you'll have to do that manually. +Are you sure to delete this profile? + + + + Please choose Ryzom client executable to launch + + + + Executables (*.exe) + + + + + CProfilesModel + + #%1: %2 + + + + + CSettingsDialog + + Please choose directory where to install Ryzom + + + + + CUninstallDialog + + Component + + + + Size + + + + Client for %1 + + + + Profile #%1: %2 + + + + Installer + + + + Downloaded Files + + + + + InstallDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will allow you to download, install, configure or manage Ryzom on your computer. + +Just follow the different steps and make your choice between the different propositions. + + + + Show advanced parameters (expert) + + + + Files will be installed from: + + + + Old installation: %1 + + + + Another location: %1 + + + + Browse... + + + + Internet (%1 GiB to download) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + + MainWindow + + Ryzom Installer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + Atys + + + + Play + + + + Configure + + + + &Settings + + + + &Help + + + + About Qt + + + + About... + + + + &Profiles + + + + &Quit + + + + &Uninstall + + + + + MigrateDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. + +Just press Continue button and follow the different steps until everything is done. + + + + Show advanced parameters (expert) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Browse... + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + Continue + + + + Quit + + + + + OperationDialog + + Ryzom Installer + + + + Operation + + + + Operation progress + + + + + ProfilesDialog + + Dialog + + + + List of profiles: + + + + Add + + + + Delete + + + + Profile: + + + + 0 + + + + Name: + + + + Server: + + + + Atys + + + + Yubo + + + + Executable: + + + + ryzom_client_r.exe + + + + Default + + + + Browse... + + + + Arguments: + + + + Comments: + + + + Directory: + + + + ~/.ryzom/0 + + + + Open + + + + Create shortcuts: + + + + Desktop + + + + Start Menu + + + + + QApplication + + Error + + + + Unable to find ryzom_installer.ini + + + + Instalation and launcher tool for Ryzom + + + + Uninstall + + + + Silent mode + + + + Unable to open %1 + + + + Unable to open output file + + + + Unable to write output file + + + + 7zip decoder doesn't support this archive + + + + Unable to allocate memory + + + + Error %1 + + + + Unable to create directory %1 + + + + Unable to set permissions of %1 + + + + disk full + + + + unable to write %1 + + + + unable to read %1 + + + + failed (%1) + + + + Unable to unpack %1 to %2: %3 + + + + Unable to copy file %1 + + + + + QObject + + B + + + + KiB + + + + MiB + + + + GiB + + + + TiB + + + + PiB + + + + + SettingsDialog + + Dialog + + + + Use 64 bits client + + + + Base location of Ryzom files: + + + + Language + + + + Browse... + + + + Location of source Ryzom files: + + + + D:\Ryzom + + + + E:\Ryzom + + + + + UninstallDialog + + Ryzom Installer + + + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + + + + Components to remove + + + + Uninstall + + + + Cancel + + + + diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts new file mode 100644 index 000000000..5fcaf6718 --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts @@ -0,0 +1,744 @@ + + + + + CDownloader + + File (%1B) is larger than expected (%2B) + + + + You only have %1 bytes left on device, but %2 bytes are required. + + + + Unable to write file + + + + Timeout + + + + Redirection URL is not defined + + + + Wrong status code: %1 + + + + Network error: %1 + + + + + CInstallDialog + + Old installation: %1 + + + + Internet (%1 to download) + + + + Files will be installed to (requires %1): + + + + Please choose directory where is installed Ryzom + + + + Unable to find Ryzom + + + + Unable to find Ryzom in selected directory. Please choose another one or cancel. + + + + Please choose directory where to install Ryzom + + + + Another location: %1 + + + + Undefined + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + CMainWindow + + About %1 + + + + Program to install, download and manage Ryzom profiles. + + + + Author: %1 + + + + Copyright: %1 + + + + Support: %1 + + + + + CMigrateDialog + + Files will be installed to (requires %1): + + + + Please choose directory where to install Ryzom + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + COperationDialog + + Confirmation + + + + Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. +Are you sure to abort download? + + + + %p% (%v/%m KiB) + + + + Error + + + + Download data required by server %1 + + + + Downloading %1... + + + + Extract data files required by server %1 + + + + Extracting %1... + + + + Download client required by server %1 + + + + Extract client files required by server %1 + + + + Copy data files required by server %1 + + + + Copying %1... + + + + Copy old profile to new location + + + + Extract client to new location + + + + Copy installer to new location + + + + Uninstall old client + + + + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + + + Clean obsolete files + + + + Deleting %1... + + + + Create default profile + + + + Create shortcuts for profile %1 + + + + Delete client files + + + + Unable to delete files for client %1 + + + + Add profiles + + + + Adding profile %1... + + + + Delete profiles + + + + Deleting profile %1... + + + + Unable to delete files for profile %1 + + + + Delete installer + + + + Delete downloaded files + + + + + CProfilesDialog + + Confirmation + + + + You're going to delete a profile, files won't be deleted and you'll have to do that manually. +Are you sure to delete this profile? + + + + Please choose Ryzom client executable to launch + + + + Executables (*.exe) + + + + + CProfilesModel + + #%1: %2 + + + + + CSettingsDialog + + Please choose directory where to install Ryzom + + + + + CUninstallDialog + + Component + + + + Size + + + + Client for %1 + + + + Profile #%1: %2 + + + + Installer + + + + Downloaded Files + + + + + InstallDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will allow you to download, install, configure or manage Ryzom on your computer. + +Just follow the different steps and make your choice between the different propositions. + + + + Show advanced parameters (expert) + + + + Files will be installed from: + + + + Old installation: %1 + + + + Another location: %1 + + + + Browse... + + + + Internet (%1 GiB to download) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + + MainWindow + + Ryzom Installer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + Atys + + + + Play + + + + Configure + + + + &Settings + + + + &Help + + + + About Qt + + + + About... + + + + &Profiles + + + + &Quit + + + + &Uninstall + + + + + MigrateDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. + +Just press Continue button and follow the different steps until everything is done. + + + + Show advanced parameters (expert) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Browse... + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + Continue + + + + Quit + + + + + OperationDialog + + Ryzom Installer + + + + Operation + + + + Operation progress + + + + + ProfilesDialog + + Dialog + + + + List of profiles: + + + + Add + + + + Delete + + + + Profile: + + + + 0 + + + + Name: + + + + Server: + + + + Atys + + + + Yubo + + + + Executable: + + + + ryzom_client_r.exe + + + + Default + + + + Browse... + + + + Arguments: + + + + Comments: + + + + Directory: + + + + ~/.ryzom/0 + + + + Open + + + + Create shortcuts: + + + + Desktop + + + + Start Menu + + + + + QApplication + + Error + + + + Unable to find ryzom_installer.ini + + + + Instalation and launcher tool for Ryzom + + + + Uninstall + + + + Silent mode + + + + Unable to open %1 + + + + Unable to open output file + + + + Unable to write output file + + + + 7zip decoder doesn't support this archive + + + + Unable to allocate memory + + + + Error %1 + + + + Unable to create directory %1 + + + + Unable to set permissions of %1 + + + + disk full + + + + unable to write %1 + + + + unable to read %1 + + + + failed (%1) + + + + Unable to unpack %1 to %2: %3 + + + + Unable to copy file %1 + + + + + QObject + + B + + + + KiB + + + + MiB + + + + GiB + + + + TiB + + + + PiB + + + + + SettingsDialog + + Dialog + + + + Use 64 bits client + + + + Base location of Ryzom files: + + + + Language + + + + Browse... + + + + Location of source Ryzom files: + + + + D:\Ryzom + + + + E:\Ryzom + + + + + UninstallDialog + + Ryzom Installer + + + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + + + + Components to remove + + + + Uninstall + + + + Cancel + + + + diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts new file mode 100644 index 000000000..5fcaf6718 --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts @@ -0,0 +1,744 @@ + + + + + CDownloader + + File (%1B) is larger than expected (%2B) + + + + You only have %1 bytes left on device, but %2 bytes are required. + + + + Unable to write file + + + + Timeout + + + + Redirection URL is not defined + + + + Wrong status code: %1 + + + + Network error: %1 + + + + + CInstallDialog + + Old installation: %1 + + + + Internet (%1 to download) + + + + Files will be installed to (requires %1): + + + + Please choose directory where is installed Ryzom + + + + Unable to find Ryzom + + + + Unable to find Ryzom in selected directory. Please choose another one or cancel. + + + + Please choose directory where to install Ryzom + + + + Another location: %1 + + + + Undefined + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + CMainWindow + + About %1 + + + + Program to install, download and manage Ryzom profiles. + + + + Author: %1 + + + + Copyright: %1 + + + + Support: %1 + + + + + CMigrateDialog + + Files will be installed to (requires %1): + + + + Please choose directory where to install Ryzom + + + + Not enough free disk space + + + + You don't have enough free space on this disk, please make more space or choose a directory on another disk. + + + + + COperationDialog + + Confirmation + + + + Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. +Are you sure to abort download? + + + + %p% (%v/%m KiB) + + + + Error + + + + Download data required by server %1 + + + + Downloading %1... + + + + Extract data files required by server %1 + + + + Extracting %1... + + + + Download client required by server %1 + + + + Extract client files required by server %1 + + + + Copy data files required by server %1 + + + + Copying %1... + + + + Copy old profile to new location + + + + Extract client to new location + + + + Copy installer to new location + + + + Uninstall old client + + + + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + + + Clean obsolete files + + + + Deleting %1... + + + + Create default profile + + + + Create shortcuts for profile %1 + + + + Delete client files + + + + Unable to delete files for client %1 + + + + Add profiles + + + + Adding profile %1... + + + + Delete profiles + + + + Deleting profile %1... + + + + Unable to delete files for profile %1 + + + + Delete installer + + + + Delete downloaded files + + + + + CProfilesDialog + + Confirmation + + + + You're going to delete a profile, files won't be deleted and you'll have to do that manually. +Are you sure to delete this profile? + + + + Please choose Ryzom client executable to launch + + + + Executables (*.exe) + + + + + CProfilesModel + + #%1: %2 + + + + + CSettingsDialog + + Please choose directory where to install Ryzom + + + + + CUninstallDialog + + Component + + + + Size + + + + Client for %1 + + + + Profile #%1: %2 + + + + Installer + + + + Downloaded Files + + + + + InstallDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will allow you to download, install, configure or manage Ryzom on your computer. + +Just follow the different steps and make your choice between the different propositions. + + + + Show advanced parameters (expert) + + + + Files will be installed from: + + + + Old installation: %1 + + + + Another location: %1 + + + + Browse... + + + + Internet (%1 GiB to download) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + + MainWindow + + Ryzom Installer + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + Atys + + + + Play + + + + Configure + + + + &Settings + + + + &Help + + + + About Qt + + + + About... + + + + &Profiles + + + + &Quit + + + + &Uninstall + + + + + MigrateDialog + + Ryzom Installer + + + + Welcome to Ryzom Installer! + +This program will migrate Ryzom version 2.1 to 3.0. Your files will be updated, cleaned and moved to a new location. + +Just press Continue button and follow the different steps until everything is done. + + + + Show advanced parameters (expert) + + + + Files will be installed to (requires 10 GiB): + + + + c:\ + + + + Browse... + + + + Do you prefer to use a 64 or 32 bits client? + + + + 64 bits (recommended) + + + + 32 bits + + + + Continue + + + + Quit + + + + + OperationDialog + + Ryzom Installer + + + + Operation + + + + Operation progress + + + + + ProfilesDialog + + Dialog + + + + List of profiles: + + + + Add + + + + Delete + + + + Profile: + + + + 0 + + + + Name: + + + + Server: + + + + Atys + + + + Yubo + + + + Executable: + + + + ryzom_client_r.exe + + + + Default + + + + Browse... + + + + Arguments: + + + + Comments: + + + + Directory: + + + + ~/.ryzom/0 + + + + Open + + + + Create shortcuts: + + + + Desktop + + + + Start Menu + + + + + QApplication + + Error + + + + Unable to find ryzom_installer.ini + + + + Instalation and launcher tool for Ryzom + + + + Uninstall + + + + Silent mode + + + + Unable to open %1 + + + + Unable to open output file + + + + Unable to write output file + + + + 7zip decoder doesn't support this archive + + + + Unable to allocate memory + + + + Error %1 + + + + Unable to create directory %1 + + + + Unable to set permissions of %1 + + + + disk full + + + + unable to write %1 + + + + unable to read %1 + + + + failed (%1) + + + + Unable to unpack %1 to %2: %3 + + + + Unable to copy file %1 + + + + + QObject + + B + + + + KiB + + + + MiB + + + + GiB + + + + TiB + + + + PiB + + + + + SettingsDialog + + Dialog + + + + Use 64 bits client + + + + Base location of Ryzom files: + + + + Language + + + + Browse... + + + + Location of source Ryzom files: + + + + D:\Ryzom + + + + E:\Ryzom + + + + + UninstallDialog + + Ryzom Installer + + + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + + + + Components to remove + + + + Uninstall + + + + Cancel + + + + diff --git a/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc b/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc new file mode 100644 index 000000000..534a463be --- /dev/null +++ b/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc @@ -0,0 +1,9 @@ + + + ryzom_installer_de.qm + ryzom_installer_en.qm + ryzom_installer_es.qm + ryzom_installer_fr.qm + ryzom_installer_ru.qm + + diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui index 4887ced56..11f91f7d4 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui @@ -6,7 +6,7 @@ 0 0 - 400 + 428 150 @@ -15,25 +15,36 @@ - + + + + + Use 64 bits client + + + + + + + Base location of Ryzom files: + + + - + Language - - - - - + + - Base location of Ryzom files: %1 + Browse... - + Browse... @@ -41,25 +52,28 @@ - + - Location of source Ryzom files: %1 + Location of source Ryzom files: + + + + + + + D:\Ryzom - + - Browse... + E:\Ryzom - - - - Use 64 bits client - - + + diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt index 0add6656c..026548d56 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/CMakeLists.txt @@ -5,7 +5,7 @@ ADD_LIBRARY(georges_plugin_sound SHARED ${SRC}) INCLUDE_DIRECTORIES(georges_plugin_sound ${NEL_INCLUDE_DIR} ${DXSDK_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(georges_plugin_sound nelmisc nelgeorges nelsound nelligo nelsnd_lowlevel georges_dll ${DXSDK_DSOUND_LIBRARY} ${DXSDK_GUID_LIBRARY}) +TARGET_LINK_LIBRARIES(georges_plugin_sound nelmisc nelgeorges nelsound nelligo nelsnd_lowlevel georges_dll ${DXSDK_DSOUND_LIBRARY}) NL_DEFAULT_PROPS(georges_plugin_sound "Ryzom, Tools, Georges: Georges Plugin Sound") NL_ADD_RUNTIME_FLAGS(georges_plugin_sound) NL_ADD_LIB_SUFFIX(georges_plugin_sound)