From f5035aa63dfa3ecd02954a2da767440b72ca8e14 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 16:54:50 +0200 Subject: [PATCH 1/6] Changed: New button for default location --HG-- branch : develop --- .../client/ryzom_installer/src/installdialog.cpp | 13 ++++++++++--- .../client/ryzom_installer/src/installdialog.h | 1 + .../client/ryzom_installer/src/migratedialog.cpp | 13 ++++++++++--- .../client/ryzom_installer/src/migratedialog.h | 1 + .../client/ryzom_installer/ui/installdialog.ui | 11 ++++++++++- .../client/ryzom_installer/ui/migratedialog.ui | 13 ++++++++++++- 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index fad255622..4f9de6c48 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -49,9 +49,8 @@ CInstallDialog::CInstallDialog():QDialog() updateAnotherLocationText(); - m_dstDirectory = CConfigFile::getNewInstallationDirectory(); - - updateDestinationText(); + // update default destination + onDestinationDefaultButtonClicked(); // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) @@ -71,6 +70,7 @@ CInstallDialog::CInstallDialog():QDialog() destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize))); connect(anotherLocationBrowseButton, SIGNAL(clicked()), SLOT(onAnotherLocationBrowseButtonClicked())); + connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked())); connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked())); // TODO: if found a folder with initial data, get its total size and check if at least that size is free on the disk @@ -117,6 +117,13 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked() updateAnotherLocationText(); } +void CInstallDialog::onDestinationDefaultButtonClicked() +{ + m_dstDirectory = CConfigFile::getNewInstallationDirectory(); + + updateDestinationText(); +} + void CInstallDialog::onDestinationBrowseButtonClicked() { QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.h b/code/ryzom/tools/client/ryzom_installer/src/installdialog.h index 3497364d2..009483303 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.h @@ -36,6 +36,7 @@ public: private slots: void onShowAdvancedParameters(int state); void onAnotherLocationBrowseButtonClicked(); + void onDestinationDefaultButtonClicked(); void onDestinationBrowseButtonClicked(); void accept(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index 5f455c938..dcf1ca0fd 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -46,9 +46,8 @@ CMigrateDialog::CMigrateDialog():QDialog() } } - m_dstDirectory = CConfigFile::getNewInstallationDirectory(); - - updateDestinationText(); + // update default destination + onDestinationDefaultButtonClicked(); // check whether OS architecture is 32 or 64 bits if (CConfigFile::has64bitsOS()) @@ -66,6 +65,7 @@ CMigrateDialog::CMigrateDialog():QDialog() destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize))); + connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked())); connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked())); connect(continueButton, SIGNAL(clicked()), SLOT(accept())); connect(quitButton, SIGNAL(clicked()), SLOT(reject())); @@ -91,6 +91,13 @@ void CMigrateDialog::onShowAdvancedParameters(int state) adjustSize(); } +void CMigrateDialog::onDestinationDefaultButtonClicked() +{ + m_dstDirectory = CConfigFile::getNewInstallationDirectory(); + + updateDestinationText(); +} + void CMigrateDialog::onDestinationBrowseButtonClicked() { QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h index 4e058ba99..9cd584372 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h @@ -35,6 +35,7 @@ public: private slots: void onShowAdvancedParameters(int state); + void onDestinationDefaultButtonClicked(); void onDestinationBrowseButtonClicked(); void accept(); diff --git a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui index c0736c23c..d05811513 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui @@ -146,7 +146,7 @@ Just follow the different steps and make your choice between the options presen Files will be installed to (requires 10 GiB): - + @@ -154,6 +154,13 @@ Just follow the different steps and make your choice between the options presen + + + + Default + + + @@ -206,10 +213,12 @@ Just follow the different steps and make your choice between the options presen + advancedCheckBox oldDirectoryRadioButton anotherLocationRadioButton anotherLocationBrowseButton internetRadioButton + destinationDefaultButton destinationBrowseButton clientArch64RadioButton clientArch32RadioButton diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui index e8d37007f..eca75bba3 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui @@ -93,7 +93,7 @@ Just press Continue button and follow the different steps until everything is do Files will be installed to (requires 10 GiB): - + @@ -101,6 +101,13 @@ Just press Continue button and follow the different steps until everything is do + + + + Default + + + @@ -174,9 +181,13 @@ Just press Continue button and follow the different steps until everything is do + advancedCheckBox + destinationDefaultButton destinationBrowseButton clientArch64RadioButton clientArch32RadioButton + continueButton + quitButton From a9891214bd793db2b1a1d434d3eb26d90d57e508 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 17:03:17 +0200 Subject: [PATCH 2/6] Changed: Disable texts that don't need to be translated --HG-- branch : develop --- .../tools/client/ryzom_installer/ui/installdialog.ui | 10 +++++----- .../tools/client/ryzom_installer/ui/mainwindow.ui | 5 ++++- .../tools/client/ryzom_installer/ui/migratedialog.ui | 4 ++-- .../tools/client/ryzom_installer/ui/operationdialog.ui | 3 +++ .../tools/client/ryzom_installer/ui/profilesdialog.ui | 9 ++++++--- .../tools/client/ryzom_installer/ui/settingsdialog.ui | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui index d05811513..26fa11b93 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui @@ -100,7 +100,7 @@ Just follow the different steps and make your choice between the options presen - Old installation: %1 + Old installation: %1 true @@ -115,7 +115,7 @@ Just follow the different steps and make your choice between the options presen - Another location: %1 + Another location: %1 true @@ -134,7 +134,7 @@ Just follow the different steps and make your choice between the options presen - Internet (%1 to download) + Internet (%1 to download) @@ -144,13 +144,13 @@ Just follow the different steps and make your choice between the options presen - Files will be installed to (requires 10 GiB): + Files will be installed to (requires %1): - c:\ + c:\ diff --git a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui index cfb2b7a79..49a2b6729 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui @@ -45,7 +45,7 @@ true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!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;"> @@ -78,6 +78,9 @@ p, li { white-space: pre-wrap; } + + Atys + Atys diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui index eca75bba3..27d9f9dff 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui @@ -91,13 +91,13 @@ Just press Continue button and follow the different steps until everything is do - Files will be installed to (requires 10 GiB): + Files will be installed to (requires %1): - c:\ + c:\ diff --git a/code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui index aef79175a..ce337bc0e 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/operationdialog.ui @@ -51,6 +51,9 @@ Qt::AlignCenter + + %p% + diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui index 670845482..98ac0a0a5 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui @@ -76,7 +76,7 @@ - 0 + 0 @@ -99,6 +99,9 @@ + + Atys + Atys @@ -123,7 +126,7 @@ - ryzom_client_r.exe + ryzom_client_r.exe @@ -182,7 +185,7 @@ - ~/.ryzom/0 + ~/.ryzom/0 diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui index daa03a8f4..15af899d2 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui @@ -61,14 +61,14 @@ - D:\Ryzom + D:\Ryzom - E:\Ryzom + E:\Ryzom From 13aac03c04252400a2dd383c58ae2ad4bc2d2cd5 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 17:03:59 +0200 Subject: [PATCH 3/6] Changed: Use default directory when choosing destination --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp | 2 +- code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index 4f9de6c48..03f23557b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -126,7 +126,7 @@ void CInstallDialog::onDestinationDefaultButtonClicked() void CInstallDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_dstDirectory); 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 dcf1ca0fd..baf89ad29 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -100,7 +100,7 @@ void CMigrateDialog::onDestinationDefaultButtonClicked() void CMigrateDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_dstDirectory); if (directory.isEmpty()) return; From 7e32d9b92849bba50c2ff4205d0f7a3462312dce Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 17:05:20 +0200 Subject: [PATCH 4/6] Changed: New checks after selecting a directory (must be empty and write permissions) --HG-- branch : develop --- .../ryzom_installer/src/installdialog.cpp | 34 +++++++++++++++++++ .../ryzom_installer/src/migratedialog.cpp | 34 +++++++++++++++++++ .../client/ryzom_installer/src/utils.cpp | 31 +++++++++++++++++ .../tools/client/ryzom_installer/src/utils.h | 2 ++ 4 files changed, 101 insertions(+) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index 03f23557b..23379bea5 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -158,6 +158,40 @@ void CInstallDialog::accept() return; } + // create directory if doesn't exist + bool succeedsToWrite = QDir().mkpath(m_dstDirectory); + + // if unable to create directory, don't expect to write a file in it + if (succeedsToWrite) + { + // check if directory is writable by current user + QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt"); + + if (file.open(QFile::WriteOnly)) + { + file.close(); + + // remove it + file.remove(); + } + else + { + succeedsToWrite = false; + } + } + + if (!succeedsToWrite) + { + QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to write in directory"), tr("You don't have the permission to write in this directory with your current user account, please choose another directory.")); + return; + } + + if (!isDirectoryEmpty(m_dstDirectory, true)) + { + QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one.")); + return; + } + if (oldDirectoryRadioButton->isChecked()) { CConfigFile::getInstance()->setSrcServerDirectory(m_oldDirectory); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index baf89ad29..b930d39cc 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -127,6 +127,40 @@ void CMigrateDialog::accept() return; } + // create directory if doesn't exist + bool succeedsToWrite = QDir().mkpath(m_dstDirectory); + + // if unable to create directory, don't expect to write a file in it + if (succeedsToWrite) + { + // check if directory is writable by current user + QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt"); + + if (file.open(QFile::WriteOnly)) + { + file.close(); + + // remove it + file.remove(); + } + else + { + succeedsToWrite = false; + } + } + + if (!succeedsToWrite) + { + QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to write in directory"), tr("You don't have the permission to write in this directory with your current user account, please choose another directory.")); + return; + } + + if (!isDirectoryEmpty(m_dstDirectory, true)) + { + QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one.")); + return; + } + CConfigFile::getInstance()->setSrcServerDirectory(m_currentDirectory); CConfigFile::getInstance()->setInstallationDirectory(m_dstDirectory); CConfigFile::getInstance()->setUse64BitsClient(clientArch64RadioButton->isChecked()); diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp index 3408e28bc..e150805e0 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp @@ -38,6 +38,37 @@ QString qBytesToHumanReadable(qint64 bytes) return QString::fromUtf8(NLMISC::bytesToHumanReadableUnits(bytes, units).c_str()); } +bool isDirectoryEmpty(const QString &directory, bool recursize) +{ + bool res = true; + + if (!directory.isEmpty()) + { + QDir dir(directory); + + if (dir.exists()) + { + QFileInfoList list = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot); + + for (int i = 0; i < list.size(); ++i) + { + QFileInfo fileInfo = list.at(i); + + if (fileInfo.isDir()) + { + if (recursize) if (!isDirectoryEmpty(fileInfo.absoluteFilePath(), true)) return false; + } + else + { + return false; + } + } + } + } + + return res; +} + qint64 getDirectorySize(const QString &directory, bool recursize) { qint64 size = 0; diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.h b/code/ryzom/tools/client/ryzom_installer/src/utils.h index 1d6519a85..1ad94b24b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/utils.h +++ b/code/ryzom/tools/client/ryzom_installer/src/utils.h @@ -30,6 +30,8 @@ QString qBytesToHumanReadable(qint64 bytes); +bool isDirectoryEmpty(const QString &directory, bool recursize); + qint64 getDirectorySize(const QString &directory, bool recursize); // Convert a UTF-8 string to QString From a5e964351deb5cf5c4cd2baf3c317a0b27c4a0ca Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 17:06:38 +0200 Subject: [PATCH 5/6] Changed: Updated translations --HG-- branch : develop --- .../translations/ryzom_installer_de.ts | 231 +++++++++------- .../translations/ryzom_installer_es.ts | 251 ++++++++---------- .../translations/ryzom_installer_fr.ts | 239 ++++++++++------- .../translations/ryzom_installer_ru.ts | 231 +++++++++------- 4 files changed, 526 insertions(+), 426 deletions(-) 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 56e329a5f..986d27d4b 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 @@ -52,12 +52,12 @@ Alte Installation: %1 - + Internet (%1 to download) Internet (%1 herunterzuladen) - + Files will be installed to (requires %1): Dateien werden installiert nach (benötigt %1): @@ -77,30 +77,50 @@ 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 - + Undefined 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 + + + + + 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. + + CMainWindow @@ -133,25 +153,45 @@ 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 + + + + + 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. + + COperationDialog @@ -160,109 +200,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... @@ -312,12 +352,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? @@ -342,7 +382,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 @@ -363,7 +403,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 @@ -481,48 +521,48 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten Dateien werden installiert von: - Old installation: %1 - Alte Installation: %1 + Alte Installation: %1 - Another location: %1 - Ein anderer Ort: %1 + Ein anderer Ort: %1 - + Browse... Durchsuchen... - Internet (%1 to download) - Internet (%1 herunterzuladen) + Internet (%1 herunterzuladen) - Files will be installed to (requires 10 GiB): - Dateien werden installiert nach (benötigt 10 GiB): + Dateien werden installiert nach (benötigt 10 GiB): - c:\ - c:\ + 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 @@ -535,66 +575,65 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten Ryzom-Installationsprogramm - <!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"> + <!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 Spielen - + Configure Konfigurieren - - + + &Settings &Einstellungen - + &Help &Hilfe - + About Qt Über Qt - + About... Über... - + &Profiles &Profile - + &Quit &Beenden - + &Uninstall &Deinstallieren @@ -625,42 +664,45 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Zeige erweiterte Parameter (Experte) - Files will be installed to (requires 10 GiB): - Dateien werden installiert nach (benötigt 10GiB): + Dateien werden installiert nach (benötigt 10GiB): - c:\ - c:\ + 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 @@ -668,17 +710,17 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. OperationDialog - + Ryzom Installer Ryzom-Installationsprogramm - + Operation Verarbeitung - + Operation progress Verarbeitungsfortschritt @@ -711,9 +753,8 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Profil: - 0 - 0 + 0 @@ -726,72 +767,70 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Server: - + Atys Atys - + Yubo Yubo - + Executable: Ausführbare Datei: - ryzom_client_r.exe - ryzom_client_r.exe + ryzom_client_r.exe - + Default Standard - + Browse... Durchsuchen... - + Arguments: Argumente: - + Comments: Kommentare: - + Directory: Verzeichnis: - ~/.ryzom/0 - ~/.ryzom/0 + ~/.ryzom/0 - + Open Öffnen - + Create shortcuts: Erstelle Verknüpfungen: - + Desktop Desktop - + Start Menu Start-Menü @@ -973,14 +1012,12 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. Ort der Ryzom-Quelldateien: - D:\Ryzom - D:\Ryzom + D:\Ryzom - E:\Ryzom - E:\Ryzom + E:\Ryzom 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 c4bbf4cf2..39a7a4385 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 @@ -52,12 +52,12 @@ - + Internet (%1 to download) - + Files will be installed to (requires %1): @@ -77,30 +77,50 @@ - + 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. + + CMainWindow @@ -133,151 +153,171 @@ 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. + + 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 @@ -381,49 +421,29 @@ Just follow the different steps and make your choice between the options presen Files will be installed from: - - - Old installation: %1 - - - - - Another location: %1 - - - + Browse... - - Internet (%1 to download) - - - - - Files will be installed to (requires 10 GiB): - - - - - c:\ + + Default - + Do you prefer to use a 64 or 32 bit client? - + 64 bit (recommended) - + 32 bit @@ -436,62 +456,53 @@ Just follow the different steps and make your choice between the options presen - - <!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 @@ -518,42 +529,37 @@ Just press Continue button and follow the different steps until everything is do - - Files will be installed to (requires 10 GiB): - - - - - c:\ + + Default - + Browse... - + Do you prefer to use a 64 or 32 bit client? - + 64 bit (recommended) - + 32 bit - + Continue - + Quit @@ -561,17 +567,17 @@ Just press Continue button and follow the different steps until everything is do OperationDialog - + Ryzom Installer - + Operation - + Operation progress @@ -603,11 +609,6 @@ Just press Continue button and follow the different steps until everything is do Profile: - - - 0 - - Name: @@ -619,72 +620,62 @@ Just press Continue button and follow the different steps until everything is do - + Atys - + Yubo - + Executable: - - ryzom_client_r.exe - - - - + Default - + Browse... - + Arguments: - + Comments: - + Directory: - - ~/.ryzom/0 - - - - + Open - + Create shortcuts: - + Desktop - + Start Menu @@ -865,16 +856,6 @@ Just press Continue button and follow the different steps until everything is do Location of source Ryzom files: - - - D:\Ryzom - - - - - E:\Ryzom - - UninstallDialog 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 e002e2aa4..e490aeb2a 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 @@ -52,12 +52,12 @@ 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) : @@ -77,30 +77,54 @@ 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 - + 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. + + + 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. + + + This directory is not empty, please choose or create another directory. + Ce répertoire n'est pas vide, veuillez en choisir un autre. + CMainWindow @@ -133,25 +157,49 @@ 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. + + + This directory is not empty, please choose or create another directory. + Ce répertoire n'est pas vide, veuillez en choisir un autre. + COperationDialog @@ -160,109 +208,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... @@ -311,12 +359,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 ? @@ -341,7 +389,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 @@ -362,7 +410,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 @@ -480,52 +528,52 @@ Vous n'avez qu'à suivre les différentes étapes et faire un choix en Les fichiers seront installés à partir de : - Old installation: %1 - Ancienne installation : %1 + Ancienne installation : %1 - Another location: %1 - Autre emplacement : %1 + Autre emplacement : %1 - + Browse... Parcourir... - Internet (%1 to download) - Internet (%1 à télécharger) + 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) : + Les fichiers seront installés dans (10 Gio nécessaires) : - c:\ - c:\ + 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 @@ -538,66 +586,65 @@ Vous n'avez qu'à suivre les différentes étapes et faire un choix en 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"> + <!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 de... - + &Profiles &Profils - + &Quit &Quitter - + &Uninstall &Désinstaller @@ -628,42 +675,45 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap 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) : + Les fichiers seront installés dans (10 Gio nécessaires) : - c:\ - c:\ + 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 @@ -671,17 +721,17 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap OperationDialog - + Ryzom Installer Installateur de Ryzom - + Operation Opération - + Operation progress Progression de l'opération @@ -714,9 +764,8 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap Profil : - 0 - 0 + 0 @@ -729,72 +778,70 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap Serveur : - + Atys Atys - + Yubo Yubo - + Executable: Exécutable : - ryzom_client_r.exe - ryzom_client_r.exe + ryzom_client_r.exe - + Default Défaut - + Browse... Parcourir... - + Arguments: Arguments : - + Comments: Commentaires : - + Directory: Répertoire : - ~/.ryzom/0 - ~/.ryzom/0 + ~/.ryzom/0 - + Open Ouvrir - + Create shortcuts: Créer les raccourcis : - + Desktop Bureau - + Start Menu Menu Démarrer @@ -976,14 +1023,12 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap Emplacement des fichiers sources de Ryzom : - D:\Ryzom - D:\Ryzom + D:\Ryzom - E:\Ryzom - E:\Ryzom + E:\Ryzom 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 2bcc891cf..0ec0dea32 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 @@ -52,12 +52,12 @@ Предыдущая установка: %1 - + Internet (%1 to download) Интернет (%1 для загрузки) - + Files will be installed to (requires %1): Файлы будут установлены в (требуется %1): @@ -77,30 +77,50 @@ Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену. - + Please choose directory to install Ryzom in Пожалуйста, выберите директорию для установки Ryzom - + Another location: %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. + + CMainWindow @@ -133,131 +153,151 @@ 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. + + 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... Удаление загруженных файлов... @@ -294,12 +334,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, вы хотите удалить ее чтобы освободить место на диске? @@ -320,7 +360,7 @@ Are you sure to abort download? Удалить файлы клиента - + Unable to delete files for client %1 Невозможно удалить файлы клиента %1 @@ -341,7 +381,7 @@ Are you sure to abort download? Удаление профиля %1... - + Unable to delete files for profile %1 Невозможно удалить файлы профиля %1 @@ -458,48 +498,48 @@ Just follow the different steps and make your choice between the options presen Файлы будут установлены из: - Old installation: %1 - Предыдущая установка: %1 + Предыдущая установка: %1 - Another location: %1 - Другое местоположение: %1 + Другое местоположение: %1 - + Browse... Открыть... - Internet (%1 to download) - Интернет (%1 для загрузки) + Интернет (%1 для загрузки) - Files will be installed to (requires 10 GiB): - Файлы будут установлены в (требуется 10 Гб): + Файлы будут установлены в (требуется 10 Гб): - c:\ - C:\ + C:\ + + + + Default + По умолчанию - + Do you prefer to use a 64 or 32 bit client? Вы предпочитаете использовать 64-битный или 32-битный клиент? - + 64 bit (recommended) 64-битный (рекомендуемый) - + 32 bit 32-битный @@ -512,66 +552,65 @@ Just follow the different steps and make your choice between the options presen Инсталлятор 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"> + <!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 Играть - + Configure Настроить - - + + &Settings &Настройки - + &Help &Помощь - + About Qt О Qt - + About... О... - + &Profiles &Профили - + &Quit &Выход - + &Uninstall &Удалить @@ -602,42 +641,45 @@ Just press Continue button and follow the different steps until everything is do Показать расширенные параметры - Files will be installed to (requires 10 GiB): - Файлы будут установлены в (требуется 10 ГиБ): + Файлы будут установлены в (требуется 10 ГиБ): - c:\ - C:\ + 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 Выход @@ -645,17 +687,17 @@ Just press Continue button and follow the different steps until everything is do OperationDialog - + Ryzom Installer Инсталлятор Ryzom - + Operation Действие - + Operation progress Ход выполнения действия @@ -688,9 +730,8 @@ Just press Continue button and follow the different steps until everything is do Профиль: - 0 - 0 + 0 @@ -703,72 +744,70 @@ Just press Continue button and follow the different steps until everything is do Сервер: - + Atys Atys - + Yubo - + Executable: Исполняемый файл: - ryzom_client_r.exe - ryzom_client_r.exe + ryzom_client_r.exe - + Default По умолчанию - + Browse... Открыть... - + Arguments: Аргументы: - + Comments: Комментарии: - + Directory: Директория: - ~/.ryzom/0 - ~/.ryzom/0 + ~/.ryzom/0 - + Open Открыть - + Create shortcuts: Создать ярлыки: - + Desktop Рабочий стол - + Start Menu меню Пуск @@ -950,14 +989,12 @@ Just press Continue button and follow the different steps until everything is do Местоположение исходных файлов Ryzom: - D:\Ryzom - D:\Ryzom + D:\Ryzom - E:\Ryzom - E:\Ryzom + E:\Ryzom From 76d05750f4d5ee1a153fd8d1deb37c8c0365838f Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 29 Sep 2016 17:07:28 +0200 Subject: [PATCH 6/6] Changed: Don't update Qt translations --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt index 333e3e7d2..0072a7f20 100644 --- a/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt +++ b/code/ryzom/tools/client/ryzom_installer/CMakeLists.txt @@ -4,7 +4,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/client/src/seven_zip ${ZLIB_INCLUD FILE(GLOB SRC src/*.cpp src/*.h res/*.rc) FILE(GLOB CLIENT_INSTALL_HDR src/*.h) FILE(GLOB CLIENT_INSTALL_UIS ui/*.ui) -FILE(GLOB CLIENT_INSTALL_TRANS translations/*.ts) +FILE(GLOB CLIENT_INSTALL_BASE_TRANS translations/qtbase*.ts) +FILE(GLOB CLIENT_INSTALL_TRANS translations/ryzom_installer_*.ts) FILE(GLOB CLIENT_INSTALL_RCS res/*.qrc) CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) @@ -28,7 +29,7 @@ ELSE() # uncomment this line if you want to update original translations # 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_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS}) QT5_ADD_RESOURCES(CLIENT_INSTALL_RC_SRCS ${CLIENT_INSTALL_RCS}) QT5_WRAP_CPP(CLIENT_INSTALL_MOC_SRC ${CLIENT_INSTALL_HDR}) QT5_WRAP_UI(CLIENT_INSTALL_UI_HDRS ${CLIENT_INSTALL_UIS}) @@ -38,9 +39,9 @@ SOURCE_GROUP("Source" FILES ${SRC}) SOURCE_GROUP("Resources" FILES ${CLIENT_INSTALL_RCS}) SOURCE_GROUP("Forms" FILES ${CLIENT_INSTALL_UIS}) SOURCE_GROUP("Generated Files" FILES ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_RC_SRCS}) -SOURCE_GROUP("Translation Files" FILES ${CLIENT_INSTALL_TRANS}) +SOURCE_GROUP("Translation Files" FILES ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS}) -ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_RC_SRCS} ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_QM}) +ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_RC_SRCS} ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS} ${CLIENT_INSTALL_QM}) NL_DEFAULT_PROPS(ryzom_installer_qt "Ryzom, Tools: Ryzom Installer" ) NL_ADD_RUNTIME_FLAGS(ryzom_installer_qt) NL_ADD_LIB_SUFFIX(ryzom_installer_qt)