diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt index 333d9454c..55e2e18bc 100644 --- a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt +++ b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt @@ -27,7 +27,7 @@ ELSE() ENDIF() # uncomment this line if you want to update original translations -# QT5_CREATE_TRANSLATION(CLIENT_INSTALL_Q ${CLIENT_INSTALL_UIS} ${SRC} ${CLIENT_INSTALL_TRANS}) +# QT5_CREATE_TRANSLATION(CLIENT_INSTALL_Q ${CLIENT_INSTALL_UIS} ${SRC} ${CLIENT_INSTALL_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR}) QT5_ADD_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS}) QT5_ADD_RESOURCES(CLIENT_INSTALL_RC_SRCS ${CLIENT_INSTALL_RCS}) QT5_WRAP_CPP(CLIENT_INSTALL_MOC_SRC ${CLIENT_INSTALL_HDR}) diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp index ba49a8842..713dc9b80 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp @@ -153,7 +153,7 @@ void CDownloader::getFileHead() else { // or has wrong size - if (m_listener) m_listener->operationFail(tr("File (%1B) is larger than expected (%2B)").arg(m_offset).arg(m_size)); + if (m_listener) m_listener->operationFail(tr("File is larger (%1B) than expected (%2B)").arg(m_offset).arg(m_size)); } return; @@ -183,7 +183,7 @@ void CDownloader::downloadFile() if (freeSpace < m_size - m_offset) { // we have not enough free disk space to continue download - if (m_listener) m_listener->operationFail(tr("You only have %1 bytes left on device, but %2 bytes are required.").arg(freeSpace).arg(m_size - m_offset)); + if (m_listener) m_listener->operationFail(tr("You only have %1 bytes left on the device, but %2 bytes are needed.").arg(freeSpace).arg(m_size - m_offset)); return; } @@ -326,7 +326,7 @@ void CDownloader::onHeadFinished() // other status else { - if (m_listener) m_listener->operationFail(tr("Wrong status code: %1").arg(status)); + if (m_listener) m_listener->operationFail(tr("Incorrect status code: %1").arg(status)); return; } diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index baf9516f0..ca24277fd 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -98,7 +98,7 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked() for(;;) { - directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where is installed Ryzom")); + directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where Ryzom is currently installed.")); if (directory.isEmpty()) return; @@ -117,7 +117,7 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked() void CInstallDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); if (directory.isEmpty()) return; diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index b2941744c..5eb15eb4b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -91,7 +91,7 @@ void CMigrateDialog::onShowAdvancedParameters(int state) void CMigrateDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); if (directory.isEmpty()) return; diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp index 53090b592..ec2ceb06f 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp @@ -65,7 +65,7 @@ void CSettingsDialog::accept() void CSettingsDialog::onInstallationDirectoryButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom"), m_installationDirectory); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_installationDirectory); if (directory.isEmpty()) return; 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 index 5fcaf6718..d5116872a 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts @@ -1,33 +1,40 @@ - + CDownloader - File (%1B) is larger than expected (%2B) + + File is larger (%1B) than expected (%2B) - You only have %1 bytes left on device, but %2 bytes are required. + + You only have %1 bytes left on the device, but %2 bytes are needed. + Unable to write file + Timeout + Redirection URL is not defined - Wrong status code: %1 + + Incorrect status code: %1 + Network error: %1 @@ -35,46 +42,57 @@ CInstallDialog + Old installation: %1 + Internet (%1 to download) + Files will be installed to (requires %1): - Please choose directory where is installed Ryzom + + Please choose directory where Ryzom is currently installed. + Unable to find Ryzom + Unable to find Ryzom in selected directory. Please choose another one or cancel. - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -82,22 +100,27 @@ CMainWindow + About %1 + Program to install, download and manage Ryzom profiles. + Author: %1 + Copyright: %1 + Support: %1 @@ -105,18 +128,22 @@ CMigrateDialog + Files will be installed to (requires %1): - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -124,123 +151,166 @@ COperationDialog + + Update profiles + + + + 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 @@ -248,19 +318,23 @@ Are you sure to abort download? 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) @@ -268,6 +342,7 @@ Are you sure to delete this profile? CProfilesModel + #%1: %2 @@ -275,33 +350,40 @@ Are you sure to delete this profile? CSettingsDialog - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in CUninstallDialog + Component + Size + Client for %1 + Profile #%1: %2 + Installer + Downloaded Files @@ -309,69 +391,85 @@ Are you sure to delete this profile? InstallDialog + Ryzom Installer + Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. +Just follow the different steps and make your choice between the options presented. + Show advanced parameters (expert) + Files will be installed from: + Old installation: %1 + Another location: %1 + + Browse... - Internet (%1 GiB to download) + + Internet (%1 to download) + Files will be installed to (requires 10 GiB): + c:\ - Do you prefer to use a 64 or 32 bits client? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit 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; } @@ -380,42 +478,53 @@ p, li { white-space: pre-wrap; } + Atys + Play + Configure + + &Settings + &Help + About Qt + About... + &Profiles + &Quit + &Uninstall @@ -423,10 +532,12 @@ p, li { white-space: pre-wrap; } 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. @@ -435,38 +546,47 @@ Just press Continue button and follow the different steps until everything is do + 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? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit + Continue + Quit @@ -474,14 +594,17 @@ Just press Continue button and follow the different steps until everything is do OperationDialog + Ryzom Installer + Operation + Operation progress @@ -489,90 +612,112 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -580,78 +725,99 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -659,26 +825,32 @@ Just press Continue button and follow the different steps until everything is do QObject + B + KiB + MiB + GiB + TiB + PiB @@ -686,34 +858,43 @@ Just press Continue button and follow the different steps until everything is do SettingsDialog + Dialog - Use 64 bits client + + Use 64 bit client + Base location of Ryzom files: + Language + + Browse... + Location of source Ryzom files: + D:\Ryzom + E:\Ryzom @@ -721,22 +902,27 @@ Just press Continue button and follow the different steps until everything is do 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). + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). + 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 deleted file mode 100644 index 5fcaf6718..000000000 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_en.ts +++ /dev/null @@ -1,744 +0,0 @@ - - - - - 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 index 5fcaf6718..d536595d1 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_es.ts @@ -1,33 +1,40 @@ - + CDownloader - File (%1B) is larger than expected (%2B) + + File is larger (%1B) than expected (%2B) - You only have %1 bytes left on device, but %2 bytes are required. + + You only have %1 bytes left on the device, but %2 bytes are needed. + Unable to write file + Timeout + Redirection URL is not defined - Wrong status code: %1 + + Incorrect status code: %1 + Network error: %1 @@ -35,46 +42,57 @@ CInstallDialog + Old installation: %1 + Internet (%1 to download) + Files will be installed to (requires %1): - Please choose directory where is installed Ryzom + + Please choose directory where Ryzom is currently installed. + Unable to find Ryzom + Unable to find Ryzom in selected directory. Please choose another one or cancel. - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -82,22 +100,27 @@ CMainWindow + About %1 + Program to install, download and manage Ryzom profiles. + Author: %1 + Copyright: %1 + Support: %1 @@ -105,18 +128,22 @@ CMigrateDialog + Files will be installed to (requires %1): - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -124,123 +151,166 @@ COperationDialog + + Update profiles + + + + 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 @@ -248,19 +318,23 @@ Are you sure to abort download? 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) @@ -268,6 +342,7 @@ Are you sure to delete this profile? CProfilesModel + #%1: %2 @@ -275,33 +350,40 @@ Are you sure to delete this profile? CSettingsDialog - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in CUninstallDialog + Component + Size + Client for %1 + Profile #%1: %2 + Installer + Downloaded Files @@ -309,69 +391,85 @@ Are you sure to delete this profile? InstallDialog + Ryzom Installer + Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. +Just follow the different steps and make your choice between the options presented. + Show advanced parameters (expert) + Files will be installed from: + Old installation: %1 + Another location: %1 + + Browse... - Internet (%1 GiB to download) + + Internet (%1 to download) + Files will be installed to (requires 10 GiB): + c:\ - Do you prefer to use a 64 or 32 bits client? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit 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; } @@ -380,42 +478,53 @@ p, li { white-space: pre-wrap; } + Atys + Play + Configure + + &Settings + &Help + About Qt + About... + &Profiles + &Quit + &Uninstall @@ -423,10 +532,12 @@ p, li { white-space: pre-wrap; } 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. @@ -435,38 +546,47 @@ Just press Continue button and follow the different steps until everything is do + 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? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit + Continue + Quit @@ -474,14 +594,17 @@ Just press Continue button and follow the different steps until everything is do OperationDialog + Ryzom Installer + Operation + Operation progress @@ -489,90 +612,112 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -580,78 +725,99 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -659,26 +825,32 @@ Just press Continue button and follow the different steps until everything is do QObject + B + KiB + MiB + GiB + TiB + PiB @@ -686,34 +858,43 @@ Just press Continue button and follow the different steps until everything is do SettingsDialog + Dialog - Use 64 bits client + + Use 64 bit client + Base location of Ryzom files: + Language + + Browse... + Location of source Ryzom files: + D:\Ryzom + E:\Ryzom @@ -721,22 +902,27 @@ Just press Continue button and follow the different steps until everything is do 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). + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). + 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 index 5fcaf6718..b05f797da 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts @@ -1,744 +1,946 @@ - + CDownloader - File (%1B) is larger than expected (%2B) - + + File is larger (%1B) than expected (%2B) + Le fichier est plus volumineux (%1o) que prévu (%2o) - You only have %1 bytes left on device, but %2 bytes are required. - + + You only have %1 bytes left on the device, but %2 bytes are needed. + Il vous reste %1 octets de libre sur le disque, mais %2 octets sont nécessaires. + Unable to write file - + Impossible de créer le fichier + Timeout - + Délai expiré + Redirection URL is not defined - + L'URL de redirection n'est pas définie - Wrong status code: %1 - + + Incorrect status code: %1 + Code de statut incorrect : %1 + Network error: %1 - + Erreur réseau : %1 CInstallDialog + Old installation: %1 - + Ancienne installation : %1 + Internet (%1 to download) - + Internet (%1 à télécharger) + Files will be installed to (requires %1): - + Les fichiers seront installés dans (%1 nécessaires) : - Please choose directory where is installed Ryzom - + + Please choose directory where Ryzom is currently installed. + Veuillez choisir le répertoire où Ryzom est actuellement installé. + Unable to find Ryzom - + Impossible de trouver Ryzom + Unable to find Ryzom in selected directory. Please choose another one or cancel. - + Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler. - Please choose directory where to install Ryzom - + + Please choose directory to install Ryzom in + Veuillez choisir le répertoire où Ryzom sera installé + Another location: %1 - + Autre emplacement : %1 + Undefined - + Non défini + Not enough free disk space - + Espace disque insuffisant + You don't have enough free space on this disk, please make more space or choose a directory on another disk. - + Vous ne disposez pas assez d'espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque. CMainWindow + About %1 - + À propos de %1 + Program to install, download and manage Ryzom profiles. - + Programme pour installer, télécharger et gérer les profils de Ryzom. + Author: %1 - + Auteur : %1 + Copyright: %1 - + Copyright : %1 + Support: %1 - + Assistance : %1 CMigrateDialog + Files will be installed to (requires %1): - + Les fichiers seront installés dans (%1 nécessaires) : - Please choose directory where to install Ryzom - + + Please choose directory to install Ryzom in + Veuillez choisir le répertoire où installer Ryzom + Not enough free disk space - + Espace disque insuffisant + You don't have enough free space on this disk, please make more space or choose a directory on another disk. - + Vous ne disposez pas assez d'espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque. COperationDialog - Confirmation - + + Update profiles + Mettre à jour les profils + + Confirmation + 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? - + Attention, ce serveur ne supporte pas la reprise de téléchargement ! Si vous arrêtez le téléchargement maintenant, vous ne pourrez pas le poursuivre ultérieurement. +Êtes-vous sûr d'interrompre le téléchargement ? + %p% (%v/%m KiB) - + %p% (%v/%m KiO) + Error - + Erreur + Download data required by server %1 - + Télécharge les données nécessaires pour le serveur %1 + + Downloading %1... - + Téléchargement de %1 en cours... + Extract data files required by server %1 - + Extraire les fichiers de données nécessaires pour le serveur %1 + + + Extracting %1... - + Extration de %1 en cours... + Download client required by server %1 - + Télécharger le client nécessaire pour le serveur %1 + Extract client files required by server %1 - + Extraire les fichiers du client nécessaire pour le serveur %1 + Copy data files required by server %1 - + Copier les fichiers de données nécessaires pour le serveur %1 + + + Copying %1... - + Copie de %1 en cours... + Copy old profile to new location - + Copier l'ancien profil vers un nouvel emplacement + Extract client to new location - + Extraire le client vers un nouvel emplacement + Copy installer to new location - + Copier l'installateur vers un nouvel emplacement + Uninstall old client - + Désinstaller l'ancien client + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? - + Une ancienne version de Ryzom a été détectée sur ce système, souhaitez-vous la désinstaller afin de libérer de l'espace disque ? + Clean obsolete files - + Nettoyer les fichiers obsolètes + + + + Deleting %1... - + Suppression de %1 en cours... + Create default profile - + Créer le profil par défaut + Create shortcuts for profile %1 - + Créer les raccourcis pour le profil %1 + Delete client files - + Supprimer les fichiers du client + Unable to delete files for client %1 - + Impossible de supprimer les fichiers du client %1 + Add profiles - + Ajouter les profils + Adding profile %1... - + Ajout du profil %1 en cours... + Delete profiles - + Supprimer les profils + Deleting profile %1... - + Suppression du profil %1 en cours... + Unable to delete files for profile %1 - + Impossible de supprimer les fichiers du profil %1 + Delete installer - + Supprimer l'installateur + Delete downloaded files - + Supprimer les fichiers téléchargés CProfilesDialog + Confirmation - + 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? - + Vous êtes sur le point de supprimer un profil, les fichiers ne seront pas supprimés et vous devrez le faire manuellement. +Êtes-vous sûr de supprimer ce profil ? + Please choose Ryzom client executable to launch - + Veuillez choisir l'exécutable du client de Ryzom à lancer + Executables (*.exe) - + Exécutables (*.exe) CProfilesModel + #%1: %2 - + #%1 : %2 CSettingsDialog - Please choose directory where to install Ryzom - + + Please choose directory to install Ryzom in + Veuillez choisir le répertoire où installer Ryzom CUninstallDialog + Component - + Composant + Size - + Taille + Client for %1 - + Client pour %1 + Profile #%1: %2 - + Profil #%1 : %2 + Installer - + Installateur + Downloaded Files - + Fichiers téléchargés InstallDialog + Ryzom Installer - + Installateur de Ryzom + Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. - +Just follow the different steps and make your choice between the options presented. + Bienvenue dans l'Installateur de Ryzom ! +Ce programme vous permettra de télécharger, installer, configurer et gérer Ryzom sur votre ordinateur. +Vous n'avez qu'à suivre les différentes étapes et faire un choix entre les différentes options proposées. + Show advanced parameters (expert) - + Afficher les paramètres avancés (expert) + Files will be installed from: - + Les fichiers seront installés à partir de : + Old installation: %1 - + Ancienne installation : %1 + Another location: %1 - + Autre emplacement : %1 + + Browse... - + Parcourir... + + + + Internet (%1 to download) + Internet (%1 à télécharger) Internet (%1 GiB to download) - + Internet (%1 à télécharger) + Files will be installed to (requires 10 GiB): - + Les fichiers seront installés dans (10 Gio nécessaires) : + c:\ - + c:\ - Do you prefer to use a 64 or 32 bits client? - + + Do you prefer to use a 64 or 32 bit client? + Préférez-vous utiliser un client 64 ou 32 bits ? - 64 bits (recommended) - + + 64 bit (recommended) + 64 bits (recommandé) - 32 bits - + + 32 bit + 32 bits MainWindow + Ryzom Installer - + Installateur de Ryzom + <!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> - + <!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 - + Atys + Play - + Jouer + Configure - + Configurer + + &Settings - + &Préférences + &Help - + &Aide + About Qt - + À propos de Qt + About... - + À propos... + &Profiles - + &Profils + &Quit - + &Quitter + &Uninstall - + &Désinstaller MigrateDialog + Ryzom Installer - + Installateur de Ryzom + 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. - + Bienvenue dans l'Installateur de Ryzom ! + +Ce programme vous permettra de télécharger, installer, configurer et gérer Ryzom sur votre ordinateur. + +Vous n'avez qu'à suivre les différentes étapes et faire un choix entre les différentes options proposées. + Show advanced parameters (expert) - + Afficher les paramètres avancés (expert) + Files will be installed to (requires 10 GiB): - + Les fichiers seront installés dans (10 Gio nécessaires) : + c:\ - + c:\ + Browse... - + Parcourir... - Do you prefer to use a 64 or 32 bits client? - + + Do you prefer to use a 64 or 32 bit client? + Préférez-vous utiliser un client 64 ou 32 bits ? - 64 bits (recommended) - + + 64 bit (recommended) + 64 bits (recommandé) - 32 bits - + + 32 bit + 32 bits + Continue - + Suivant + Quit - + Quitter OperationDialog + Ryzom Installer - + Installateur de Ryzom + Operation - + Opération + Operation progress - + Progression de l'opération ProfilesDialog + Dialog - + Dialog + List of profiles: - + Liste des profils : + Add - + Ajouter + Delete - + Supprimer + Profile: - + Profil : + 0 - + 0 + Name: - + Nom : + Server: - + Serveur : + Atys - + Atys + Yubo - + Yubo + Executable: - + Exécutable : + ryzom_client_r.exe - + ryzom_client_r.exe + Default - + Défaut + Browse... - + Parcourir... + Arguments: - + Arguments : + Comments: - + Commentaires : + Directory: - + Répertoire : + ~/.ryzom/0 - + ~/.ryzom/0 + Open - + Ouvrir + Create shortcuts: - + Créer les raccourcis : + Desktop - + Bureau + Start Menu - + Menu Démarrer QApplication + Error - + Erreur + Unable to find ryzom_installer.ini - + Impossible de trouver ryzom_installer.ini + Instalation and launcher tool for Ryzom - + Outil d'installation et lanceur pour Ryzom + Uninstall - + Désinstaller + Silent mode - + Mode silencieux + + Unable to open %1 - + Impossible d'ouvrir %1 + Unable to open output file - + Impossible d'ouvrir le fichier de sortie + Unable to write output file - + Impossible d'écrire le fichier de sortie + + 7zip decoder doesn't support this archive - + Le décodeur 7zip ne supporte pas cette archive + Unable to allocate memory - + Impossible d'allouer la mémoire + Error %1 - + Erreur %1 + Unable to create directory %1 - + Impossible de créer le répertoire %1 + Unable to set permissions of %1 - + Impossible de définir les permissions de %1 + disk full - + disque plein + unable to write %1 - + impossible d'écrire %1 + unable to read %1 - + impossible de lire %1 + failed (%1) - + échec (%1) + Unable to unpack %1 to %2: %3 - + Impossible d'extraire %1 vers %2 : %3 + Unable to copy file %1 - + Impossible de copier le fichier %1 QObject + B - + o + KiB - + Kio + MiB - + Mio + GiB - + Gio + TiB - + Tio + PiB - + Pio SettingsDialog + Dialog - + Dialog - Use 64 bits client - + + Use 64 bit client + Utiliser le client 64 bits + Base location of Ryzom files: - + Emplacement racine des fichiers de Ryzom : + Language - + Langue + + Browse... - + Parcourir... + Location of source Ryzom files: - + Emplacement des fichiers sources de Ryzom : + D:\Ryzom - + D:\Ryzom + E:\Ryzom - + E:\Ryzom UninstallDialog + Ryzom Installer - + Installateur de Ryzom - 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). - + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). + Vous êtes sur le point de désinstaller certains ou tous les composants de Ryzom. Veuillez cocher tous les composants que vous voulez supprimer (attention, ça ne peut être annulé). + Components to remove - + Composants à supprimer + Uninstall - + Désinstaller + Cancel - + Annuler 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 index 5fcaf6718..8ba43fa46 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_ru.ts @@ -1,33 +1,40 @@ - + CDownloader - File (%1B) is larger than expected (%2B) + + File is larger (%1B) than expected (%2B) - You only have %1 bytes left on device, but %2 bytes are required. + + You only have %1 bytes left on the device, but %2 bytes are needed. + Unable to write file + Timeout + Redirection URL is not defined - Wrong status code: %1 + + Incorrect status code: %1 + Network error: %1 @@ -35,46 +42,57 @@ CInstallDialog + Old installation: %1 + Internet (%1 to download) + Files will be installed to (requires %1): - Please choose directory where is installed Ryzom + + Please choose directory where Ryzom is currently installed. + Unable to find Ryzom + Unable to find Ryzom in selected directory. Please choose another one or cancel. - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -82,22 +100,27 @@ CMainWindow + About %1 + Program to install, download and manage Ryzom profiles. + Author: %1 + Copyright: %1 + Support: %1 @@ -105,18 +128,22 @@ CMigrateDialog + Files will be installed to (requires %1): - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in + 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. @@ -124,123 +151,166 @@ COperationDialog + + Update profiles + + + + 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 @@ -248,19 +318,23 @@ Are you sure to abort download? 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) @@ -268,6 +342,7 @@ Are you sure to delete this profile? CProfilesModel + #%1: %2 @@ -275,33 +350,40 @@ Are you sure to delete this profile? CSettingsDialog - Please choose directory where to install Ryzom + + Please choose directory to install Ryzom in CUninstallDialog + Component + Size + Client for %1 + Profile #%1: %2 + Installer + Downloaded Files @@ -309,69 +391,85 @@ Are you sure to delete this profile? InstallDialog + Ryzom Installer + Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. +Just follow the different steps and make your choice between the options presented. + Show advanced parameters (expert) + Files will be installed from: + Old installation: %1 + Another location: %1 + + Browse... - Internet (%1 GiB to download) + + Internet (%1 to download) + Files will be installed to (requires 10 GiB): + c:\ - Do you prefer to use a 64 or 32 bits client? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit 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; } @@ -380,42 +478,53 @@ p, li { white-space: pre-wrap; } + Atys + Play + Configure + + &Settings + &Help + About Qt + About... + &Profiles + &Quit + &Uninstall @@ -423,10 +532,12 @@ p, li { white-space: pre-wrap; } 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. @@ -435,38 +546,47 @@ Just press Continue button and follow the different steps until everything is do + 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? + + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + + 64 bit (recommended) - 32 bits + + 32 bit + Continue + Quit @@ -474,14 +594,17 @@ Just press Continue button and follow the different steps until everything is do OperationDialog + Ryzom Installer + Operation + Operation progress @@ -489,90 +612,112 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -580,78 +725,99 @@ Just press Continue button and follow the different steps until everything is do 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 @@ -659,26 +825,32 @@ Just press Continue button and follow the different steps until everything is do QObject + B + KiB + MiB + GiB + TiB + PiB @@ -686,34 +858,43 @@ Just press Continue button and follow the different steps until everything is do SettingsDialog + Dialog - Use 64 bits client + + Use 64 bit client + Base location of Ryzom files: + Language + + Browse... + Location of source Ryzom files: + D:\Ryzom + E:\Ryzom @@ -721,22 +902,27 @@ Just press Continue button and follow the different steps until everything is do 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). + + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). + 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 index 534a463be..e8182a2d3 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc +++ b/code/ryzom/tools/client/ryzom_installer/translations/translations.qrc @@ -1,7 +1,6 @@ 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/installdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui index b8f03b356..c0736c23c 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui @@ -28,9 +28,9 @@ Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. +Just follow the different steps and make your choice between the options presented. Qt::PlainText @@ -134,7 +134,7 @@ Just follow the different steps and make your choice between the different propo - Internet (%1 GiB to download) + Internet (%1 to download) @@ -167,13 +167,13 @@ Just follow the different steps and make your choice between the different propo - Do you prefer to use a 64 or 32 bits client? + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + 64 bit (recommended) true @@ -183,7 +183,7 @@ Just follow the different steps and make your choice between the different propo - 32 bits + 32 bit diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui index e63c8eeb3..e8d37007f 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui @@ -114,13 +114,13 @@ Just press Continue button and follow the different steps until everything is do - Do you prefer to use a 64 or 32 bits client? + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + 64 bit (recommended) true @@ -130,7 +130,7 @@ Just press Continue button and follow the different steps until everything is do - 32 bits + 32 bit diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui index 11f91f7d4..daa03a8f4 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui @@ -19,7 +19,7 @@ - Use 64 bits client + Use 64 bit client diff --git a/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui index 3a9570262..0b85f7a29 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui @@ -34,7 +34,7 @@ - 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). + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). Qt::PlainText