diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 20accba68..839c85272 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -727,12 +727,13 @@ bool CConfigFile::shouldCreateMenuShortcut() const return !shortcutExists(profile.getClientMenuShortcutFullPath()); } -bool CConfigFile::shouldCopyInstaller() const +int CConfigFile::compareInstallersVersion() const { + // returns 0 if same version, 1 if current installer is more recent, -1 if installed installer is more recent QString installerDst = getInstallationDirectory() + "/" + m_installerFilename; - // if installer not found in installation directory, extract it from BNP - if (!QFile::exists(installerDst)) return true; + // if installer not found in installation directory + if (!QFile::exists(installerDst)) return 1; QString installedVersion = getVersionFromExecutable(installerDst); QString newVersion = QApplication::applicationVersion(); @@ -740,8 +741,11 @@ bool CConfigFile::shouldCopyInstaller() const QVersionNumber installedVer = QVersionNumber::fromString(installedVersion); QVersionNumber newVer = QVersionNumber::fromString(newVersion); - // if version is greater, copy it - return newVer > installedVer; + // same version + if (newVer == installedVer) return 0; + + // if version is greater or lower + return newVer > installedVer ? 1:-1; } QString CConfigFile::getInstallerCurrentFilePath() const @@ -756,12 +760,15 @@ QString CConfigFile::getInstallerCurrentDirPath() const return QApplication::applicationDirPath(); } -QString CConfigFile::getInstallerOriginalFilePath() const +QString CConfigFile::getInstallerInstalledFilePath() const { - return getInstallerOriginalDirPath() + "/" + QFileInfo(QApplication::applicationFilePath()).fileName(); + // return an empty string, if no Installer filename in config + if (m_installerFilename.isEmpty()) return ""; + + return getInstallerInstalledDirPath() + "/" + m_installerFilename; } -QString CConfigFile::getInstallerOriginalDirPath() const +QString CConfigFile::getInstallerInstalledDirPath() const { return m_installationDirectory; } @@ -956,7 +963,18 @@ OperationStep CConfigFile::getInstallNextStep() const } } - if (shouldCopyInstaller()) return CopyInstaller; + // current installer more recent than installed one + switch (compareInstallersVersion()) + { + // current installer more recent, copy it + case 1: return CopyInstaller; + + // current installer older, launch the more recent installer + case -1: return LaunchInstalledInstaller; + + // continue only if 0 + default: break; + } // no default profile if (profile.id.isEmpty()) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.h b/code/ryzom/tools/client/ryzom_installer/src/configfile.h index d83103726..a7b2a8919 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.h +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.h @@ -104,7 +104,7 @@ public: bool foundTemporaryFiles(const QString &directory) const; bool shouldCreateDesktopShortcut() const; bool shouldCreateMenuShortcut() const; - bool shouldCopyInstaller() const; + int compareInstallersVersion() const; // installation choices bool use64BitsClient() const; @@ -124,8 +124,8 @@ public: QString getInstallerCurrentFilePath() const; QString getInstallerCurrentDirPath() const; - QString getInstallerOriginalFilePath() const; - QString getInstallerOriginalDirPath() const; + QString getInstallerInstalledFilePath() const; + QString getInstallerInstalledDirPath() const; QString getInstallerMenuShortcutFullPath() const; QString getInstallerDesktopShortcutFullPath() const; diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp index 20a55d278..cdd471cf6 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp @@ -356,6 +356,8 @@ void CDownloader::onHeadFinished() void CDownloader::onDownloadFinished() { + int status = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + m_reply->deleteLater(); m_reply = NULL; @@ -367,11 +369,18 @@ void CDownloader::onDownloadFinished() } else { - bool ok = NLMISC::CFile::setFileModificationDate(m_fullPath.toUtf8().constData(), m_lastModified.toTime_t()); + if (QFileInfo(m_fullPath).size() == m_size) + { + bool ok = NLMISC::CFile::setFileModificationDate(m_fullPath.toUtf8().constData(), m_lastModified.toTime_t()); - if (m_listener) m_listener->operationSuccess(m_size); + if (m_listener) m_listener->operationSuccess(m_size); - emit downloadDone(); + emit downloadDone(); + } + else + { + m_listener->operationFail(tr("HTTP error: %1").arg(status)); + } } } @@ -383,10 +392,6 @@ void CDownloader::onError(QNetworkReply::NetworkError error) { m_listener->operationStop(); } - else - { - m_listener->operationFail(tr("Network error: %1").arg(error)); - } } void CDownloader::onDownloadProgress(qint64 current, qint64 total) diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index a4ec462d9..23b602284 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -252,7 +252,14 @@ int main(int argc, char *argv[]) step = config.getInstallNextStep(); - if (step == Done) + if (step == LaunchInstalledInstaller) + { +#ifndef _DEBUG + // restart more recent installed Installer version + if (QProcess::startDetached(config.getInstallerOriginalFilePath(), QApplication::arguments())) return 0; +#endif + } + else if (step == Done) { #if defined(Q_OS_WIN) && !defined(_DEBUG) // restart Installer, so it could be copied in TEMP and allowed to update itself diff --git a/code/ryzom/tools/client/ryzom_installer/src/operation.h b/code/ryzom/tools/client/ryzom_installer/src/operation.h index 2db0ce559..6d039252a 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operation.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operation.h @@ -64,6 +64,7 @@ enum OperationStep CleanFiles, ExtractBnpClient, CopyInstaller, + LaunchInstalledInstaller, UninstallOldClient, CreateProfile, CreateProfileShortcuts, diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 9fc47dde3..25bbd9b17 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -199,6 +199,7 @@ void COperationDialog::processInstallNextStep() break; case Done: + case LaunchInstalledInstaller: acceptDelayed(); break; @@ -727,13 +728,12 @@ void COperationDialog::copyInstaller() QString destinationDirectory = config->getInstallationDirectory(); // rename old client to installer - QString newInstallerFilename = config->getInstallerFilename(); - if (!newInstallerFilename.isEmpty()) + QString oldInstallerFullPath = QApplication::applicationFilePath(); + QString newInstallerFullPath = config->getInstallerInstalledFilePath(); + + if (!newInstallerFullPath.isEmpty()) { - QString oldInstallerFullPath = QApplication::applicationFilePath(); - QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename; - // always copy new installers CFilesCopier copier(this); copier.setIncludeFilter(config->getInstallerRequiredFiles()); @@ -931,36 +931,31 @@ bool COperationDialog::createAddRemoveEntry() { CConfigFile *config = CConfigFile::getInstance(); - QString newInstallerFilename = config->getInstallerFilename(); + QString newInstallerFullPath = config->getInstallerInstalledFilePath(); - if (!newInstallerFilename.isEmpty()) + if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath)) { - QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename; - - if (QFile::exists(newInstallerFullPath)) - { #ifdef Q_OS_WIN - QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); + QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); - QString nativeFullPath = QDir::toNativeSeparators(newInstallerFullPath); + QString nativeFullPath = QDir::toNativeSeparators(newInstallerFullPath); - settings.setValue("Comments", config->getProductComments()); - settings.setValue("DisplayIcon", nativeFullPath + ",0"); - settings.setValue("DisplayName", QApplication::applicationName()); - settings.setValue("InstallDate", QDateTime::currentDateTime().toString("Ymd")); - settings.setValue("InstallLocation", config->getInstallationDirectory()); - settings.setValue("NoModify", 0); - settings.setValue("NoRemove", 0); - settings.setValue("NoRepair", 0); - if (!config->getProductPublisher().isEmpty()) settings.setValue("Publisher", config->getProductPublisher()); - settings.setValue("QuietUninstallString", nativeFullPath + " -u -s"); - settings.setValue("UninstallString", nativeFullPath + " -u"); - if (!config->getProductUpdateUrl().isEmpty()) settings.setValue("URLUpdateInfo", config->getProductUpdateUrl()); - if (!config->getProductAboutUrl().isEmpty()) settings.setValue("URLInfoAbout", config->getProductAboutUrl()); - if (!config->getProductHelpUrl().isEmpty()) settings.setValue("HelpLink", config->getProductHelpUrl()); - // ModifyPath + settings.setValue("Comments", config->getProductComments()); + settings.setValue("DisplayIcon", nativeFullPath + ",0"); + settings.setValue("DisplayName", QApplication::applicationName()); + settings.setValue("InstallDate", QDateTime::currentDateTime().toString("Ymd")); + settings.setValue("InstallLocation", config->getInstallationDirectory()); + settings.setValue("NoModify", 0); + settings.setValue("NoRemove", 0); + settings.setValue("NoRepair", 0); + if (!config->getProductPublisher().isEmpty()) settings.setValue("Publisher", config->getProductPublisher()); + settings.setValue("QuietUninstallString", nativeFullPath + " -u -s"); + settings.setValue("UninstallString", nativeFullPath + " -u"); + if (!config->getProductUpdateUrl().isEmpty()) settings.setValue("URLUpdateInfo", config->getProductUpdateUrl()); + if (!config->getProductAboutUrl().isEmpty()) settings.setValue("URLInfoAbout", config->getProductAboutUrl()); + if (!config->getProductHelpUrl().isEmpty()) settings.setValue("HelpLink", config->getProductHelpUrl()); + // ModifyPath #endif - } } updateAddRemoveEntry(); @@ -974,27 +969,24 @@ bool COperationDialog::updateAddRemoveEntry() { CConfigFile *config = CConfigFile::getInstance(); - QString newInstallerFilename = config->getInstallerFilename(); + QString newInstallerFullPath = config->getInstallerInstalledFilePath(); - if (!newInstallerFilename.isEmpty()) + if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath)) { - QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename; + QString newInstallerFilename = config->getInstallerFilename(); - if (QFile::exists(newInstallerFullPath)) - { #ifdef Q_OS_WIN - QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); + QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat); - QString version = QApplication::applicationVersion(); + QString version = QApplication::applicationVersion(); - settings.setValue("DisplayVersion", version); - settings.setValue("EstimatedSize", (quint32)(getDirectorySize(config->getInstallationDirectory(), true) / 1024)); // size if in KiB + settings.setValue("DisplayVersion", version); + settings.setValue("EstimatedSize", (quint32)(getDirectorySize(config->getInstallationDirectory(), true) / 1024)); // size if in KiB - QStringList versionTokens = version.split('.'); - settings.setValue("MajorVersion", versionTokens[0].toInt()); - settings.setValue("MinorVersion", versionTokens[1].toInt()); + QStringList versionTokens = version.split('.'); + settings.setValue("MajorVersion", versionTokens[0].toInt()); + settings.setValue("MinorVersion", versionTokens[1].toInt()); #endif - } } return true; @@ -1161,7 +1153,7 @@ void COperationDialog::deleteComponentsInstaller() dir.removeRecursively(); } - path = config->getInstallerOriginalDirPath(); + path = config->getInstallerInstalledDirPath(); QStringList files = config->getInstallerRequiredFiles(); foreach(const QString &file, files) diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp index 4aa0b2f27..f15b44a45 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp @@ -269,7 +269,18 @@ void CProfilesDialog::onExecutableBrowseClicked() if (executable.isEmpty()) executable = defaultExecutable; - executable = QFileDialog::getOpenFileName(this, tr("Please choose Ryzom client executable to launch"), executable, tr("Executables (*.exe)")); + QString filter; + +#ifdef Q_OS_WIN32 + filter = tr("Executables (*.exe)"); +#else + filter = tr("Executables (*)"); +#endif + + QFileDialog open; + open.setFilter(QDir::Executable | QDir::NoDotAndDotDot | QDir::Files); + + executable = open.getOpenFileName(this, tr("Please choose Ryzom client executable to launch"), executable, filter); if (executable.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 9b7178086..f60cc497a 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 @@ -39,85 +39,82 @@ Falscher Status-Code: %1 - + + HTTP error: %1 + + + Network error: %1 - Netzwerk-Fehler: %1 + Netzwerk-Fehler: %1 CInstallDialog - Old installation: %1 - Alte Installation: %1 + Alte Installation: %1 - Internet (%1 to download) - Internet (%1 herunterzuladen) + Internet (%1 herunterzuladen) - + Files will be installed to (requires %1): Dateien werden installiert nach (benötigt %1): - Please choose directory where Ryzom is currently installed. - Bitte wähle das Verzeichnis, in dem Ryzom momentan installiert ist. + Bitte wähle das Verzeichnis, in dem Ryzom momentan installiert ist. - Unable to find Ryzom - Ryzom konnte nicht gefunden werden + Ryzom konnte nicht gefunden werden - Unable to find Ryzom in selected directory. Please choose another one or cancel. - Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab. + Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab. - + Please choose directory to install Ryzom in Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll. - Another location: %1 - Ein anderer Ort: %1 + Ein anderer Ort: %1 - Undefined - Undefiniert + Undefiniert - + Not enough free disk space Nicht genügend freier Festplattenspeicher - + You don't have enough free space on this disk, please make more space or choose a directory on another disk. Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk. - + Unable to write in directory In das Verzeichnis konnte nicht geschrieben werden - + You don't have the permission to write in this directory with your current user account, please choose another directory. Du hast nicht die Berechtigungen, um mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis. - + Directory not empty Verzeichnist ist nicht leer - + This directory is not empty, please choose another one. Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes. @@ -125,27 +122,27 @@ CMainWindow - + About %1 Über %1 - + Program to install, download and manage Ryzom profiles. Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten. - + Author: %1 Autor: %1 - + Copyright: %1 Copyright: %1 - + Support: %1 Support: %1 @@ -153,42 +150,42 @@ CMigrateDialog - + Files will be installed to (requires %1): Dateien werden installiert nach (benötigt %1): - + Please choose directory to install Ryzom in Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll. - + Not enough free disk space Nicht genügend freier Festplattenspeicher - + You don't have enough free space on this disk, please make more space or choose a directory on another disk. Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk. - + Unable to write in directory Kann nicht in dieses Verzeichnis schreiben - + You don't have the permission to write in this directory with your current user account, please choose another directory. Du hast nicht die Berechtigungen, mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis. - + Directory not empty Verzeichnis ist nicht leer - + This directory is not empty, please choose another one. Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes. @@ -200,109 +197,109 @@ Profile aktualisieren - + Updating profiles... Aktualisiere Profile... - + Confirmation Bestätigung - + 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? Warnung: dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst, wirst du nicht in der Lage sein, ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen? - + %p% (%v/%m KiB) %p% (%v/%m KiB) - + Error Fehler - + Downloading data required by server %1... Herunterzuladende Daten benötigt von Server %1... - + Extracting data required by server %1... Zu extrahierende Daten benötigt von Server %1... - + Downloading client required by server %1... Herunterzuladender Client benötigt von Server %1... - + Extracting client required by server %1... Zu extrahierender Client benötigt von Server %1... - + Copying data required by server %1... Zu kopierende Daten benötigt von Server %1... - + Copying old profile to new location... Kopiere alte Profile zum neuen Zielort... - + Extracting client to new location... Extrahiere Client an neuem Zielort... - + Copying installer to new location... Kopiere Installer zum neuen Zielort... - + Cleaning obsolete files... Bereinige überholte Dateien... - + Creating default profile... Erstelle Standard-Profile... - + Creating shortcuts for profile %1... Erstelle Verknüpfungen für Profile %1... - + Deleting client... Lösche Client... - + Adding profiles... Füge Profile hinzu... - + Deleting profiles... Lösche Profile... - + Deleting installer... Lösche Installer... - + Deleting downloaded files... Lösche heruntergeladene Dateien... @@ -352,12 +349,12 @@ Willst du den Download wirklich abbrechen? Kopiere Installer an neuen Ort - + Uninstall old client Deinstalliere alten Client - + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen? @@ -382,7 +379,7 @@ Willst du den Download wirklich abbrechen? Lösche Client-Dateien - + Unable to delete files for client %1 Dateien für Client %1 konnten nicht gelöscht werden @@ -403,7 +400,7 @@ Willst du den Download wirklich abbrechen? Lösche Profil %1... - + Unable to delete files for profile %1 Dateien für Profil %1 konnten nicht gelöscht werden @@ -419,24 +416,34 @@ Willst du den Download wirklich abbrechen? CProfilesDialog - + + Error + Fehler + + + Confirmation Bestätigung - + 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? Du bist dabei, ein Profil zu löschen. Es werden keine Dateien gelöscht, das musst du manuell tun. Bist du sicher, dass du dieses Profil löschen willst? - + + Executables (*) + + + + Please choose Ryzom client executable to launch Bitte wähle die ausführbare Datei, um den Ryzom-Client zu starten - + Executables (*.exe) Ausführbare Dateien (*.exe) @@ -516,9 +523,8 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten Zeige erweiterte Parameter (Experte) - Files will be installed from: - Dateien werden installiert von: + Dateien werden installiert von: Old installation: %1 @@ -529,8 +535,7 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten Ein anderer Ort: %1 - - + Browse... Durchsuchen... @@ -547,22 +552,22 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten c:\ - + Default Standard - + Do you prefer to use a 64 or 32 bit client? Möchtest du einen 64 bit oder 32 bit-Client verwenden? - + 64 bit (recommended) 64 bit (empfohlen) - + 32 bit 32 bit @@ -587,53 +592,53 @@ p, li { white-space: pre-wrap; } <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 Spielen - + Configure Konfigurieren - - + + &Settings &Einstellungen - + &Help &Hilfe - + About Qt Über Qt - + About... Über... - + &Profiles &Profile - + &Quit &Beenden - + &Uninstall &Deinstallieren @@ -672,37 +677,37 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. c:\ - + Default Standard - + Browse... Durchsuchen... - + Do you prefer to use a 64 or 32 bit client? Möchtest du einen 64 bit oder 32 bit-Client verwenden? - + 64 bit (recommended) 64 bit (empfohlen) - + 32 bit 32 bit - + Continue Weiter - + Quit Beenden @@ -873,69 +878,74 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Selbstinstallation - - + + Unable to open %1 %1 konnte nicht geöffnet werden - + Unable to open output file Ausgabe-Datei konnte nicht geöffnet werden - + Unable to write output file Ausgabe-Datei konnte nicht geschrieben werden - - + + 7zip decoder doesn't support this archive 7zip-Decoder unterstützt dieses Archiv nicht - + Unable to allocate memory Speicher konnte nicht zugewiesen werden - + + File %1 is corrupted, unable to uncompress it + + + + Error %1 Fehler %1 - + Unable to create directory %1 Verzeichnis %1 konnte nicht erstellt werden - + Unable to set permissions of %1 Berechtigungen für %1 konnten nicht gesetzt werden - + disk full Festplatte voll - + unable to write %1 Konnte %1 nicht schreiben - + unable to read %1 Konnte %1 nicht lesen - + failed (%1) Fehlgeschlagen (%1) - + Unable to unpack %1 to %2: %3 Konnte %1 nicht nach %2 entpacken: %3 @@ -944,36 +954,46 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Unable to copy file %1 Konnte Datei %1 nicht kopieren + + + Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed) + + + + + Profile name %1 is using invalid character %2 at position %3 + + QObject - + B B - + KiB KiB - + MiB MiB - + GiB GiB - + TiB TiB - + PiB PiB 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 39a7a4385..f8d6885d5 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 @@ -39,85 +39,50 @@ - - Network error: %1 + + HTTP error: %1 CInstallDialog - - Old installation: %1 - - - - - Internet (%1 to download) - - - - + Files will be installed to (requires %1): - - 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 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. - + Unable to write in directory - + You don't have the permission to write in this directory with your current user account, please choose another directory. - + Directory not empty - + This directory is not empty, please choose another one. @@ -125,27 +90,27 @@ CMainWindow - + About %1 - + Program to install, download and manage Ryzom profiles. - + Author: %1 - + Copyright: %1 - + Support: %1 @@ -153,42 +118,42 @@ CMigrateDialog - + Files will be installed to (requires %1): - + 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. - + Unable to write in directory - + You don't have the permission to write in this directory with your current user account, please choose another directory. - + Directory not empty - + This directory is not empty, please choose another one. @@ -196,128 +161,128 @@ COperationDialog - + Updating 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 - + Downloading data required by server %1... - + Extracting data required by server %1... - + Downloading client required by server %1... - + Extracting client required by server %1... - + Copying data required by server %1... - + Copying old profile to new location... - + Extracting client to new location... - + Copying installer to new location... - + Cleaning obsolete files... - + Creating default profile... - + Creating shortcuts for profile %1... - + Deleting client... - + Adding profiles... - + Deleting profiles... - + Deleting installer... - + Deleting downloaded files... - + Uninstall old client - + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? - + Unable to delete files for client %1 - + Unable to delete files for profile %1 @@ -325,23 +290,33 @@ Are you sure to abort download? CProfilesDialog - + + Error + + + + 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? - + + Executables (*) + + + + Please choose Ryzom client executable to launch - + Executables (*.exe) @@ -417,33 +392,27 @@ Just follow the different steps and make your choice between the options presen - - Files will be installed from: - - - - - + Browse... - + Default - + Do you prefer to use a 64 or 32 bit client? - + 64 bit (recommended) - + 32 bit @@ -456,53 +425,53 @@ Just follow the different steps and make your choice between the options presen - + Atys - + Play - + Configure - - + + &Settings - + &Help - + About Qt - + About... - + &Profiles - + &Quit - + &Uninstall @@ -529,37 +498,37 @@ Just press Continue button and follow the different steps until everything is do - + Default - + Browse... - + Do you prefer to use a 64 or 32 bit client? - + 64 bit (recommended) - + 32 bit - + Continue - + Quit @@ -718,69 +687,74 @@ Just press Continue button and follow the different steps until everything is do - - + + 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 - + + File %1 is corrupted, unable to uncompress it + + + + 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 @@ -789,36 +763,46 @@ Just press Continue button and follow the different steps until everything is do Unable to copy file %1 + + + Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed) + + + + + Profile name %1 is using invalid character %2 at position %3 + + QObject - + B - + KiB - + MiB - + GiB - + TiB - + PiB 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 e490aeb2a..1a0432db5 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 @@ -39,85 +39,82 @@ Code de statut incorrect : %1 - + + HTTP error: %1 + Errreur HTTP : %1 + + Network error: %1 - Erreur réseau : %1 + Erreur réseau : %1 CInstallDialog - Old installation: %1 - Ancienne installation : %1 + Ancienne installation : %1 - Internet (%1 to download) - Internet (%1 à télécharger) + 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 Ryzom is currently installed. - Veuillez choisir le répertoire où Ryzom est actuellement installé. + Veuillez choisir le répertoire où Ryzom est actuellement installé. - Unable to find Ryzom - Impossible de trouver 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. + Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler. - + Please choose directory to install Ryzom in Veuillez choisir le répertoire où Ryzom sera installé - Another location: %1 - Autre emplacement : %1 + Autre emplacement : %1 - Undefined - Non défini + 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. - + Unable to write in directory Impossible d'écrire dans le répertoire - + You don't have the permission to write in this directory with your current user account, please choose another directory. Vous n'avez pas la permission d'écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre. - + Directory not empty Répertoire non vide - + This directory is not empty, please choose another one. Ce répertoire n'est pas vide, veuillez en choisir un autre. @@ -129,27 +126,27 @@ 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 @@ -157,42 +154,42 @@ CMigrateDialog - + Files will be installed to (requires %1): Les fichiers seront installés dans (%1 nécessaires) : - + 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. - + Unable to write in directory Impossible d'écrire dans le répertoire - + You don't have the permission to write in this directory with your current user account, please choose another directory. Vous n'avez pas la permission d'écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre. - + Directory not empty Répertoire non vide - + This directory is not empty, please choose another one. Ce répertoire n'est pas vide, veuillez en choisir un autre. @@ -208,109 +205,109 @@ Mettre à jour les profils - + Updating profiles... Mise à jour des 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 - + Downloading data required by server %1... Téléchargement des données nécessaires pour le serveur %1... - + Extracting data required by server %1... Extraction des données nécessaires pour le serveur %1... - + Downloading client required by server %1... Téléchargement du client nécessaire pour le serveur %1... - + Extracting client required by server %1... Extraction du client nécessaire pour le serveur %1... - + Copying data required by server %1... Copie des données nécessaires pour le serveur %1... - + Copying old profile to new location... Copie de l'ancien profil vers un nouvel emplacement... - + Extracting client to new location... Extraction du client vers un nouvel emplacement... - + Copying installer to new location... Copie de l'installateur vers un nouvel emplacement... - + Cleaning obsolete files... Nettoyage des fichiers obsolètes... - + Creating default profile... Création du profil par défaut... - + Creating shortcuts for profile %1... Création des raccourcis pour le profil %1... - + Deleting client... Suppression du client... - + Adding profiles... Ajout des profils... - + Deleting profiles... Suppression des profils... - + Deleting installer... Suppression de l'installateur... - + Deleting downloaded files... Suppression des fichiers téléchargés... @@ -359,12 +356,12 @@ Are you sure to abort download? 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 ? @@ -389,7 +386,7 @@ Are you sure to abort download? Supprimer les fichiers du client - + Unable to delete files for client %1 Impossible de supprimer les fichiers du client %1 @@ -410,7 +407,7 @@ Are you sure to abort download? Suppression du profil %1 en cours... - + Unable to delete files for profile %1 Impossible de supprimer les fichiers du profil %1 @@ -426,24 +423,34 @@ Are you sure to abort download? CProfilesDialog - + + Error + Erreur + + + 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 ? - + + Executables (*) + Exécutables (*) + + + Please choose Ryzom client executable to launch Veuillez choisir l'exécutable du client de Ryzom à lancer - + Executables (*.exe) Exécutables (*.exe) @@ -523,9 +530,8 @@ Vous n'avez qu'à suivre les différentes étapes et faire un choix en Afficher les paramètres avancés (expert) - Files will be installed from: - Les fichiers seront installés à partir de : + Les fichiers seront installés à partir de : Old installation: %1 @@ -536,8 +542,7 @@ Vous n'avez qu'à suivre les différentes étapes et faire un choix en Autre emplacement : %1 - - + Browse... Parcourir... @@ -558,22 +563,22 @@ Vous n'avez qu'à suivre les différentes étapes et faire un choix en c:\ - + Default Défaut - + Do you prefer to use a 64 or 32 bit client? Préférez-vous utiliser un client 64 ou 32 bits ? - + 64 bit (recommended) 64 bits (recommandé) - + 32 bit 32 bits @@ -598,53 +603,53 @@ p, li { white-space: pre-wrap; } <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 de... - + &Profiles &Profils - + &Quit &Quitter - + &Uninstall &Désinstaller @@ -683,37 +688,37 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap c:\ - + Default Défaut - + Browse... Parcourir... - + Do you prefer to use a 64 or 32 bit client? Préférez-vous utiliser un client 64 ou 32 bits ? - + 64 bit (recommended) 64 bits (recommandé) - + 32 bit 32 bits - + Continue Suivant - + Quit Quitter @@ -884,69 +889,74 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap S'auto-installer - - + + 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 n'est pas compatible avec cette archive - + Unable to allocate memory Impossible d'allouer la mémoire - + + File %1 is corrupted, unable to uncompress it + Le fichier %1 est corrompu, impossible de le décompresser + + + 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 @@ -955,36 +965,46 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap Unable to copy file %1 Impossible de copier le fichier %1 + + + Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed) + L'identifiant du profil %1 utilise des caractères invalides (seuls les lettres, chiffres et underscore sont autorisés)l + + + + Profile name %1 is using invalid character %2 at position %3 + Le nom du profil %1 utilise un caractère invalide %2 à la position %3 + QObject - + B o - + KiB Kio - + MiB Mio - + GiB Gio - + TiB Tio - + PiB Pio 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 110dd2b54..1ff77b91a 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 @@ -39,85 +39,82 @@ Некорректный код состояния: %1 - + + HTTP error: %1 + + + Network error: %1 - Ошибка сети: %1 + Ошибка сети: %1 CInstallDialog - Old installation: %1 - Предыдущая установка: %1 + Предыдущая установка: %1 - Internet (%1 to download) - Интернет (%1 для загрузки) + Интернет (%1 для загрузки) - + Files will be installed to (requires %1): Файлы будут установлены в (требуется %1): - Please choose directory where Ryzom is currently installed. - Пожалуйста, выберите директорию, в которой установен Ryzom. + Пожалуйста, выберите директорию, в которой установен Ryzom. - Unable to find Ryzom - Невозможно найти Ryzom + Невозможно найти Ryzom - Unable to find Ryzom in selected directory. Please choose another one or cancel. - Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену. + Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену. - + Please choose directory to install Ryzom in Пожалуйста, выберите директорию для установки Ryzom - Another location: %1 - Другое местоположение: %1 + Другое местоположение: %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. Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске. - + Unable to write in directory Невозможно осуществить запись в директорию - + You don't have the permission to write in this directory with your current user account, please choose another directory. У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию. - + Directory not empty Директория не является пустой - + This directory is not empty, please choose another one. Эта директория не является пустой, пожалуйста, выберите другую. @@ -125,27 +122,27 @@ CMainWindow - + About %1 О %1 - + Program to install, download and manage Ryzom profiles. Программа для установки, загрузки и управления профилями Ryzom. - + Author: %1 Автор: %1 - + Copyright: %1 Копирайт: %1 - + Support: %1 Поддержка: %1 @@ -153,42 +150,42 @@ CMigrateDialog - + Files will be installed to (requires %1): Файлы будут установлены в (требуется %1): - + Please choose directory to install Ryzom in Пожалуйста, выберете директорию для установки 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. Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске. - + Unable to write in directory Невозможно осуществить запись в директорию - + You don't have the permission to write in this directory with your current user account, please choose another directory. У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию. - + Directory not empty Директория не является пустой - + This directory is not empty, please choose another one. Эта директория не является пустой, пожалуйста, выберите другую. @@ -196,108 +193,108 @@ COperationDialog - + Updating 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) %p% (%v/%m Кб) - + Error Ошибка - + Downloading data required by server %1... Загрузка данных, необходимых серверу %1... - + Extracting data required by server %1... Извлечение данных, необходимых серверу %1... - + Downloading client required by server %1... Загрузка клиента, необходимого серверу %1... - + Extracting client required by server %1... Извлечение файлов клиента, необходимых серверу %1... - + Copying data required by server %1... Копирование данных, необходимых серверу %1... - + Copying old profile to new location... Копирование предыдущего профиля в новое местоположение... - + Extracting client to new location... Извлечение файлов клиента в новое местоположение... - + Copying installer to new location... Копирование инсталлятора в новое местоположение... - + Cleaning obsolete files... Удаление устаревших файлов... - + Creating default profile... Создание профиля по умолчанию... - + Creating shortcuts for profile %1... Создание ярлыков для профиля %1... - + Deleting client... Удаление клиента... - + Adding profiles... Добавление профилей... - + Deleting profiles... Удаление профилей... - + Deleting installer... Удаление инсталлятора... - + Deleting downloaded files... Удаление загруженных файлов... @@ -334,12 +331,12 @@ Are you sure to abort download? Копирование %1... - + Uninstall old client Удалить предыдущую версию клиента - + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? В системе обнаружена предыдущая версия Ryzom, вы хотите удалить ее чтобы освободить место на диске? @@ -360,7 +357,7 @@ Are you sure to abort download? Удалить файлы клиента - + Unable to delete files for client %1 Невозможно удалить файлы клиента %1 @@ -381,7 +378,7 @@ Are you sure to abort download? Удаление профиля %1... - + Unable to delete files for profile %1 Невозможно удалить файлы профиля %1 @@ -397,23 +394,33 @@ Are you sure to abort download? CProfilesDialog - + + Error + Ошибка + + + 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? Вы собираетесь удалить профиль, файлы профиля не будут удалены автоматически и их необходимо удалить вручную. Вы уверены, что хотите удалить этот профиль? - + + Executables (*) + + + + Please choose Ryzom client executable to launch Пожалуйста, выберете исполняемый файл для запуска клиента Ryzom - + Executables (*.exe) Исполняемые файлы (*.exe) @@ -493,9 +500,8 @@ Just follow the different steps and make your choice between the options presen Показать расширенные параметры - Files will be installed from: - Файлы будут установлены из: + Файлы будут установлены из: Old installation: %1 @@ -506,8 +512,7 @@ Just follow the different steps and make your choice between the options presen Другое местоположение: %1 - - + Browse... Открыть... @@ -524,22 +529,22 @@ Just follow the different steps and make your choice between the options presen C:\ - + Default По умолчанию - + Do you prefer to use a 64 or 32 bit client? Вы предпочитаете использовать 64-битный или 32-битный клиент? - + 64 bit (recommended) 64-битный (рекомендуемый) - + 32 bit 32-битный @@ -564,53 +569,53 @@ p, li { white-space: pre-wrap; } <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 Играть - + Configure Настроить - - + + &Settings &Настройки - + &Help &Помощь - + About Qt О Qt - + About... О... - + &Profiles &Профили - + &Quit &Выход - + &Uninstall &Удалить @@ -649,37 +654,37 @@ Just press Continue button and follow the different steps until everything is do C:\ - + Default По умолчанию - + Browse... Открыть... - + Do you prefer to use a 64 or 32 bit client? Вы предпочитаете использовать 64-битный или 32-битный клиент? - + 64 bit (recommended) 64-битный (рекомендуемый) - + 32 bit 32-битный - + Continue Продолжить - + Quit Выход @@ -850,69 +855,74 @@ Just press Continue button and follow the different steps until everything is do Установится - - + + Unable to open %1 Невозможно открыть %1 - + Unable to open output file Невозможно открыть выходной файл - + Unable to write output file Невозможно записать выходной файл - - + + 7zip decoder doesn't support this archive Архиватор 7zip не поддерживает данный тип архива - + Unable to allocate memory Невозможно выделить память - + + File %1 is corrupted, unable to uncompress it + + + + Error %1 Ошибка %1 - + Unable to create directory %1 Невозможно создать директорию %1 - + Unable to set permissions of %1 Невозможно назначить права объекта %1 - + disk full диск переполнен - + unable to write %1 невозможно записать %1 - + unable to read %1 невозможно прочитать %1 - + failed (%1) неуспешно (%1) - + Unable to unpack %1 to %2: %3 Невозможно разархивировать %1 в %2: %3 @@ -921,36 +931,46 @@ Just press Continue button and follow the different steps until everything is do Unable to copy file %1 Невозможно скопировать файл %1 + + + Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed) + + + + + Profile name %1 is using invalid character %2 at position %3 + + QObject - + B Б - + KiB КиБ - + MiB МиБ - + GiB ГиБ - + TiB ТиБ - + PiB ПиБ diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui index 98ac0a0a5..6f6cc7de8 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui @@ -66,6 +66,9 @@ + + QFormLayout::AllNonFixedFieldsGrow +