From ad11871e7a5fb623f6553251841f2b657e2b4414 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 28 Sep 2016 12:22:27 +0200 Subject: [PATCH 1/2] Changed: Simplify progress texts --HG-- branch : develop --- .../ryzom_installer/src/operationdialog.cpp | 50 +++++++------------ .../ryzom_installer/src/operationdialog.h | 1 - 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 8d7aa5672..7ccaaa428 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -255,7 +255,7 @@ void COperationDialog::updateAddRemoveComponents() void COperationDialog::processUpdateProfilesNextStep() { - m_currentOperation = tr("Update profiles"); + m_currentOperation = tr("Updating profiles..."); // for "update profiles" operations, we set installer to false when components are updated, // since we're not using this variable @@ -471,7 +471,7 @@ void COperationDialog::onProgressStop() void COperationDialog::onProgressProgress(qint64 current, const QString &filename) { - operationProgressLabel->setText(m_currentOperationProgressFormat.arg(filename)); + operationProgressLabel->setText(filename); operationProgressBar->setValue(current / 1024); @@ -512,8 +512,7 @@ void COperationDialog::downloadData() const CServer &server = config->getServer(m_currentServerId); - m_currentOperation = tr("Download data required by server %1").arg(server.name); - m_currentOperationProgressFormat = tr("Downloading %1..."); + m_currentOperation = tr("Downloading data required by server %1...").arg(server.name); m_downloader->prepareFile(config->expandVariables(server.dataDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.dataDownloadFilename) + ".part"); } @@ -524,8 +523,7 @@ void COperationDialog::extractDownloadedData() const CServer &server = config->getServer(m_currentServerId); - m_currentOperation = tr("Extract data files required by server %1").arg(server.name); - m_currentOperationProgressFormat = tr("Extracting %1..."); + m_currentOperation = tr("Extracting data required by server %1...").arg(server.name); CFilesExtractor extractor(this); extractor.setSourceFile(config->getInstallationDirectory() + "/" + server.dataDownloadFilename); @@ -547,8 +545,7 @@ void COperationDialog::downloadClient() const CServer &server = config->getServer(m_currentServerId); - m_currentOperation = tr("Download client required by server %1").arg(server.name); - m_currentOperationProgressFormat = tr("Downloading %1..."); + m_currentOperation = tr("Downloading client required by server %1...").arg(server.name); m_downloader->prepareFile(config->expandVariables(server.clientDownloadUrl), config->getInstallationDirectory() + "/" + config->expandVariables(server.clientDownloadFilename) + ".part"); } @@ -559,8 +556,7 @@ void COperationDialog::extractDownloadedClient() const CServer &server = config->getServer(m_currentServerId); - m_currentOperation = tr("Extract client files required by server %1").arg(server.name); - m_currentOperationProgressFormat = tr("Extracting %1..."); + m_currentOperation = tr("Extracting client required by server %1...").arg(server.name); QString destinationDirectory = server.getDirectory(); @@ -587,8 +583,7 @@ void COperationDialog::copyDataFiles() // default server const CServer &server = config->getServer(m_currentServerId); - m_currentOperation = tr("Copy data files required by server %1").arg(server.name); - m_currentOperationProgressFormat = tr("Copying %1..."); + m_currentOperation = tr("Copying data required by server %1...").arg(server.name); QStringList serverFiles; serverFiles << "cfg"; @@ -622,8 +617,7 @@ void COperationDialog::copyProfileFiles() // default profile const CProfile &profile = config->getProfile(); - m_currentOperation = tr("Copy old profile to new location"); - m_currentOperationProgressFormat = tr("Copying %1..."); + m_currentOperation = tr("Copying old profile to new location..."); QStringList profileFiles; profileFiles << "cache"; @@ -658,8 +652,7 @@ void COperationDialog::extractBnpClient() // default server const CServer &server = config->getServer(); - m_currentOperation = tr("Extract client to new location"); - m_currentOperationProgressFormat = tr("Extracting %1..."); + m_currentOperation = tr("Extracting client to new location..."); QString destinationDirectory = server.getDirectory(); @@ -726,8 +719,7 @@ void COperationDialog::copyInstaller() // default server const CServer &server = config->getServer(); - m_currentOperation = tr("Copy installer to new location"); - m_currentOperationProgressFormat = tr("Copying %1..."); + m_currentOperation = tr("Copying installer to new location..."); QString destinationDirectory = config->getInstallationDirectory(); @@ -846,8 +838,7 @@ void COperationDialog::cleanFiles() // default server const CServer &server = config->getServer(); - m_currentOperation = tr("Clean obsolete files"); - m_currentOperationProgressFormat = tr("Deleting %1..."); + m_currentOperation = tr("Cleaning obsolete files..."); CFilesCleaner cleaner(this); cleaner.setDirectory(server.getDirectory()); @@ -862,7 +853,7 @@ bool COperationDialog::createDefaultProfile() CServer server = config->getServer(); - m_currentOperation = tr("Create default profile"); + m_currentOperation = tr("Creating default profile..."); CProfile profile; @@ -921,7 +912,7 @@ bool COperationDialog::createProfileShortcuts(const QString &profileId) const CProfile &profile = config->getProfile(profileId); - m_currentOperation = tr("Create shortcuts for profile %1").arg(profile.id); + m_currentOperation = tr("Creating shortcuts for profile %1...").arg(profile.id); profile.createShortcuts(); @@ -1025,8 +1016,7 @@ bool COperationDialog::deleteAddRemoveEntry() void COperationDialog::deleteComponentsServers() { - m_currentOperation = tr("Delete client files"); - m_currentOperationProgressFormat = tr("Deleting %1..."); + m_currentOperation = tr("Deleting client..."); emit prepare(); emit init(0, m_removeComponents.servers.size()); @@ -1083,8 +1073,7 @@ void COperationDialog::deleteComponentsServers() void COperationDialog::addComponentsProfiles() { - m_currentOperation = tr("Add profiles"); - m_currentOperationProgressFormat = tr("Adding profile %1..."); + m_currentOperation = tr("Adding profiles..."); CConfigFile *config = CConfigFile::getInstance(); @@ -1104,8 +1093,7 @@ void COperationDialog::addComponentsProfiles() void COperationDialog::deleteComponentsProfiles() { - m_currentOperation = tr("Delete profiles"); - m_currentOperationProgressFormat = tr("Deleting profile %1..."); + m_currentOperation = tr("Deleting profiles..."); emit prepare(); emit init(0, m_removeComponents.servers.size()); @@ -1155,8 +1143,7 @@ void COperationDialog::deleteComponentsProfiles() void COperationDialog::deleteComponentsInstaller() { - m_currentOperation = tr("Delete installer"); - m_currentOperationProgressFormat = tr("Deleting %1..."); + m_currentOperation = tr("Deleting installer..."); CConfigFile *config = CConfigFile::getInstance(); @@ -1198,8 +1185,7 @@ void COperationDialog::deleteComponentsInstaller() void COperationDialog::deleteComponentsDownloadedFiles() { - m_currentOperation = tr("Delete downloaded files"); - m_currentOperationProgressFormat = tr("Deleting %1..."); + m_currentOperation = tr("Deleting downloaded files..."); CConfigFile *config = CConfigFile::getInstance(); diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h index 52acee110..19235bdd9 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h @@ -142,7 +142,6 @@ protected: CDownloader *m_downloader; QString m_currentOperation; - QString m_currentOperationProgressFormat; QMutex m_abortingMutex; bool m_aborting; From 9534b01d879b8bd59c9e039209530c69c9490280 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 28 Sep 2016 12:23:25 +0200 Subject: [PATCH 2/2] Changed: Updated translations --HG-- branch : develop --- .../translations/ryzom_installer_de.ts | 262 ++++++---- .../translations/ryzom_installer_es.ts | 205 ++++---- .../translations/ryzom_installer_fr.ts | 257 ++++++---- .../translations/ryzom_installer_ru.ts | 473 ++++++++++-------- 4 files changed, 683 insertions(+), 514 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 443fb7432..56e329a5f 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 @@ -30,11 +30,16 @@ + File is not available, please retry later (status code: %1) + Datei ist nicht abrufbar, bitte versuch es später noch einmal (Status-Code: %1) + + + Incorrect status code: %1 Falscher Status-Code: %1 - + Network error: %1 Netzwerk-Fehler: %1 @@ -57,42 +62,42 @@ 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. - + Unable to find Ryzom 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. - + 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. @@ -100,27 +105,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 @@ -133,17 +138,17 @@ 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. @@ -151,192 +156,247 @@ COperationDialog - Update profiles - Profile aktualisieren + 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? + 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... + + Download data required by server %1 %1 ist der Servername, also z.B. Atys oder Yubo - Lade Daten herunter, die vom Server %1 benötigt werden + Lade Daten herunter, die vom Server %1 benötigt werden - - Downloading %1... - Lade herunter %1... + Lade herunter %1... - Extract data files required by server %1 - Entpacke Dateien, die vom Server %1 benötigt werden + Entpacke Dateien, die vom Server %1 benötigt werden - - - Extracting %1... - Entpacke %1... + Entpacke %1... - Download client required by server %1 - Lade Client herunter, der vom Server %1 benötigt wird + Lade Client herunter, der vom Server %1 benötigt wird - Extract client files required by server %1 - Entpacke Client-Dateien, die vom Server %1 benötigt werden + Entpacke Client-Dateien, die vom Server %1 benötigt werden - Copy data files required by server %1 - Kopiere Dateien, die vom Server %1 benötigt werden + Kopiere Dateien, die vom Server %1 benötigt werden - - - Copying %1... - Kopiere %1... + Kopiere %1... - Copy old profile to new location - Kopiere altes Profil an den neuen Ort + Kopiere altes Profil an den neuen Ort - Extract client to new location - Entpacke Client am neuen Ort + Entpacke Client am neuen Ort - Copy installer to new location - Kopiere Installer an neuen Ort + 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? - Clean obsolete files - Lösche alte Dateien + Lösche alte Dateien - - - - Deleting %1... - Lösche %1... + Lösche %1... - Create default profile - Erstelle Standard-Profil + Erstelle Standard-Profil - Create shortcuts for profile %1 - Erstelle Verknüpfungen für Profil %1 + Erstelle Verknüpfungen für Profil %1 - Delete client files - Lösche Client-Dateien + Lösche Client-Dateien - + Unable to delete files for client %1 Dateien für Client %1 konnten nicht gelöscht werden - Add profiles - Füge Profile hinzu + Füge Profile hinzu - Adding profile %1... - Füge Profil %1 hinzu... + Füge Profil %1 hinzu... - Delete profiles - Lösche Profile + Lösche Profile - Deleting profile %1... - Lösche Profil %1... + Lösche Profil %1... - + Unable to delete files for profile %1 Dateien für Profil %1 konnten nicht gelöscht werden - Delete installer - Lösche Installer + Lösche Installer - Delete downloaded files - Lösche heruntergeladene Dateien + Lösche heruntergeladene Dateien CProfilesDialog - + 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? - + 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) @@ -633,7 +693,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. List of profiles: - Liste der Profile + Liste der Profile: @@ -739,30 +799,40 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. QApplication - + Error Fehler - + Unable to find ryzom_installer.ini ryzom_installer.ini konnte nicht gefunden werden - + Instalation and launcher tool for Ryzom Installations- und Startprogramm für Ryzom - + Uninstall Deinstallieren - + Silent mode Stiller Modus + + + Version + Version + + + + Install itself + Selbstinstallation + @@ -839,32 +909,32 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. 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 d536595d1..c4bbf4cf2 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 @@ -30,11 +30,16 @@ + File is not available, please retry later (status code: %1) + + + + Incorrect status code: %1 - + Network error: %1 @@ -57,42 +62,42 @@ - + 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. @@ -100,27 +105,27 @@ CMainWindow - + About %1 - + Program to install, download and manage Ryzom profiles. - + Author: %1 - + Copyright: %1 - + Support: %1 @@ -133,17 +138,17 @@ - + 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. @@ -151,190 +156,152 @@ COperationDialog - - Update profiles + + 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 - - Download data required by server %1 + + Downloading data required by server %1... - - - Downloading %1... + + Extracting data required by server %1... - - Extract data files required by server %1 + + Downloading client required by server %1... - - - - Extracting %1... + + Extracting client required by server %1... - - Download client required by server %1 + + Copying data required by server %1... - - Extract client files required by server %1 + + Copying old profile to new location... - - Copy data files required by server %1 + + Extracting client to new location... - - - - Copying %1... + + Copying installer to new location... - - Copy old profile to new location + + Cleaning obsolete files... - - Extract client to new location + + Creating default profile... - - Copy installer to new location + + Creating shortcuts for profile %1... - - Uninstall old client + + Deleting client... - - An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + Adding profiles... - - Clean obsolete files + + Deleting profiles... - - - - - Deleting %1... + + Deleting installer... - - Create default profile + + Deleting downloaded files... - - Create shortcuts for profile %1 + + Uninstall old client - - Delete client files + + 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 - - Add profiles - - - - - Adding profile %1... - - - - - Delete profiles - - - - - Deleting profile %1... - - - - + Unable to delete files for profile %1 - - - Delete installer - - - - - Delete downloaded files - - CProfilesDialog - + Confirmation - + You're going to delete a profile, files won't be deleted and you'll have to do that manually. Are you sure to delete this profile? - + Please choose Ryzom client executable to launch - + Executables (*.exe) @@ -725,30 +692,40 @@ Just press Continue button and follow the different steps until everything is do QApplication - + Error - + Unable to find ryzom_installer.ini - + Instalation and launcher tool for Ryzom - + Uninstall - + Silent mode + + + Version + + + + + Install itself + + @@ -825,32 +802,32 @@ Just press Continue button and follow the different steps until everything is do 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 6f822aed1..e002e2aa4 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 @@ -30,11 +30,16 @@ + File is not available, please retry later (status code: %1) + Le fichier est indisponible, veuillez réessayer ultérieurement (code de statut : %1) + + + Incorrect status code: %1 Code de statut incorrect : %1 - + Network error: %1 Erreur réseau : %1 @@ -57,42 +62,42 @@ 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é. - + Unable to find Ryzom Impossible de trouver Ryzom - + Unable to find Ryzom in selected directory. Please choose another one or cancel. Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler. - + Please choose directory 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. @@ -100,27 +105,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 @@ -133,17 +138,17 @@ 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. @@ -151,192 +156,246 @@ COperationDialog - Update profiles - Mettre à jour les profils + 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... + + Download data required by server %1 - Télécharge les données nécessaires pour le serveur %1 + Télécharge les données nécessaires pour le serveur %1 - - Downloading %1... - Téléchargement de %1 en cours... + Téléchargement de %1 en cours... - Extract data files required by server %1 - Extraire les fichiers de données nécessaires pour le serveur %1 + Extraire les fichiers de données nécessaires pour le serveur %1 - - - Extracting %1... - Extration de %1 en cours... + Exctration de %1 en cours... - Download client required by server %1 - Télécharger le client nécessaire pour le serveur %1 + Télécharger le client nécessaire pour le serveur %1 - Extract client files required by server %1 - Extraire les fichiers du client nécessaire pour le serveur %1 + Extraire les fichiers du client nécessaire pour le serveur %1 - Copy data files required by server %1 - Copier les fichiers de données nécessaires pour le serveur %1 + Copier les fichiers de données nécessaires pour le serveur %1 - - - Copying %1... - Copie de %1 en cours... + Copie de %1 en cours... - Copy old profile to new location - Copier l'ancien profil vers un nouvel emplacement + Copier l'ancien profil vers un nouvel emplacement - Extract client to new location - Extraire le client vers un nouvel emplacement + Extraire le client vers un nouvel emplacement - Copy installer to new location - Copier l'installateur vers un nouvel emplacement + Copier l'installateur vers un nouvel emplacement - + Uninstall old client Désinstaller l'ancien client - + An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? Une ancienne version de Ryzom a été détectée sur ce système, souhaitez-vous la désinstaller afin de libérer de l'espace disque ? - Clean obsolete files - Nettoyer les fichiers obsolètes + Nettoyer les fichiers obsolètes - - - - Deleting %1... - Suppression de %1 en cours... + Suppression de %1 en cours... - Create default profile - Créer le profil par défaut + Créer le profil par défaut - Create shortcuts for profile %1 - Créer les raccourcis pour le profil %1 + Créer les raccourcis pour le profil %1 - Delete client files - Supprimer les fichiers du client + Supprimer les fichiers du client - + Unable to delete files for client %1 Impossible de supprimer les fichiers du client %1 - Add profiles - Ajouter des profils + Ajouter des profils - Adding profile %1... - Ajout du profil %1 en cours... + Ajout du profil %1 en cours... - Delete profiles - Supprimer les profils + Supprimer les profils - Deleting profile %1... - Suppression du profil %1 en cours... + Suppression du profil %1 en cours... - + Unable to delete files for profile %1 Impossible de supprimer les fichiers du profil %1 - Delete installer - Supprimer l'installateur + Supprimer l'installateur - Delete downloaded files - Supprimer les fichiers téléchargés + Supprimer les fichiers téléchargés CProfilesDialog - + Confirmation Confirmation - + You're going to delete a profile, files won't be deleted and you'll have to do that manually. Are you sure to delete this profile? Vous êtes sur le point de supprimer un profil, les fichiers ne seront pas supprimés et vous devrez le faire manuellement. Êtes-vous sûr de supprimer ce profil ? - + Please choose Ryzom client executable to launch Veuillez choisir l'exécutable du client de Ryzom à lancer - + Executables (*.exe) Exécutables (*.exe) @@ -743,30 +802,40 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap QApplication - + Error Erreur - + Unable to find ryzom_installer.ini Impossible de trouver ryzom_installer.ini - + Instalation and launcher tool for Ryzom Outil d'installation et lanceur pour Ryzom - + Uninstall Désinstaller - + Silent mode Mode silencieux + + + Version + Version + + + + Install itself + S'auto-installer + @@ -843,32 +912,32 @@ Vous n'avez qu'à cliquer sur Suivant et suivre les différentes étap 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 8ba43fa46..45d155ac8 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 @@ -16,27 +16,32 @@ Unable to write file - + Невозможно записать файл Timeout - + Тайм-аут Redirection URL is not defined - + URL перенаправления не определен + File is not available, please retry later (status code: %1) + + + + Incorrect status code: %1 - + Network error: %1 - + Ошибка сети: %1 @@ -54,45 +59,45 @@ Files will be installed to (requires %1): - + Файлы будут установлены в (требуется %1): - + Please choose directory where Ryzom is currently installed. - + Пожалуйста, выберите директорию, в которой установен Ryzom. - + Unable to find Ryzom - + Невозможно найти Ryzom - + Unable to find Ryzom in selected directory. Please choose another one or cancel. - + Невозможно найти 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. @@ -100,29 +105,29 @@ CMainWindow - + About %1 - + О %1 - + Program to install, download and manage Ryzom profiles. - + Программа для установки, загрузки и управления профилями Ryzom. - + Author: %1 - + Автор: %1 - + Copyright: %1 - + Копирайт: %1 - + Support: %1 - + Поддержка: %1 @@ -130,20 +135,20 @@ 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. @@ -151,192 +156,226 @@ COperationDialog - - Update profiles + + 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... - - Download data required by server %1 + + Extracting data required by server %1... - - - Downloading %1... + + Downloading client required by server %1... - - Extract data files required by server %1 + + Extracting client required by server %1... - - - - Extracting %1... + + Copying data required by server %1... - - Download client required by server %1 + + Copying old profile to new location... - - Extract client files required by server %1 + + Extracting client to new location... - - Copy data files required by server %1 + + Copying installer to new location... - - - - Copying %1... + + Cleaning obsolete files... - - Copy old profile to new location + + Creating default profile... - - Extract client to new location + + Creating shortcuts for profile %1... - - Copy installer to new location + + Deleting client... - - Uninstall old client + + Adding profiles... - - An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? + + Deleting profiles... - - Clean obsolete files + + Deleting installer... - - - - - Deleting %1... + + Deleting downloaded files... - - Create default profile + Download data required by server %1 + Загрузить данные, необходимые серверу %1 + + + Downloading %1... + Загрузка %1... + + + Extract data files required by server %1 + Извлечь данные, необходимые серверу %1 + + + Extracting %1... + Извлечение %1... + + + Download client required by server %1 + Загрузить клиент, необходимый серверу %1 + + + Extract client files required by server %1 + Извлечь файлы клиента, необходимые серверу %1 + + + Copy data files required by server %1 + Копировать данные, необходимые серверу %1 + + + Copying %1... + Копирование %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? - + Deleting %1... + Удаление %1... + + + Create default profile + Создать профиль по умолчанию + + Create shortcuts for profile %1 - + Создать ярлыки для профиля %1 - Delete client files - + Удалить файлы клиента - + Unable to delete files for client %1 - + Невозможно удалить файлы клиента %1 - Add profiles - + Добавить профили - Adding profile %1... - + Добавление профиля %1... - Delete profiles - + Удалить профили - Deleting profile %1... - + Удаление профиля %1... - + Unable to delete files for profile %1 - + Невозможно удалить файлы профиля %1 - Delete installer - + Удалить инсталлятор - Delete downloaded files - + Удалить загруженные файлы CProfilesDialog - + Confirmation - + Подтверждение - + You're going to delete a profile, files won't be deleted and you'll have to do that manually. Are you sure to delete this profile? - + Please choose Ryzom client executable to launch - + Пожалуйста, выберете исполняемый файл для запуска клиента Ryzom - + Executables (*.exe) - + Исполняемые файлы (*.exe) @@ -344,7 +383,7 @@ Are you sure to delete this profile? #%1: %2 - + #%1: %2 @@ -352,7 +391,7 @@ Are you sure to delete this profile? Please choose directory to install Ryzom in - + Пожалуйста, выберете директорию для установки Ryzom @@ -360,32 +399,32 @@ Are you sure to delete this profile? Component - + Компонент Size - + Hfpvth Client for %1 - + Клиент для %1 Profile #%1: %2 - + Профиль #%1: %2 Installer - + Инсталлятор Downloaded Files - + Загруженные файлы @@ -393,7 +432,7 @@ Are you sure to delete this profile? Ryzom Installer - + Инсталлятор Ryzom @@ -407,12 +446,12 @@ Just follow the different steps and make your choice between the options presen Show advanced parameters (expert) - + Показать расширенные параметры Files will be installed from: - + Файлы будут установлены из: @@ -422,7 +461,7 @@ Just follow the different steps and make your choice between the options presen Another location: %1 - + Другое местоположение: %1 @@ -438,27 +477,27 @@ Just follow the different steps and make your choice between the options presen Files will be installed to (requires 10 GiB): - + Файлы будут установлены в (требуется 10 Гб): c:\ - + C:\ Do you prefer to use a 64 or 32 bit client? - + Вы предпочитаете использовать 64-битный или 32-битный клиент? 64 bit (recommended) - + 64-битный (рекомендуемый) 32 bit - + 32-битный @@ -466,7 +505,7 @@ Just follow the different steps and make your choice between the options presen Ryzom Installer - + Инсталлятор Ryzom @@ -475,7 +514,11 @@ Just follow the different steps and make your choice between the options presen p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> @@ -485,48 +528,48 @@ p, li { white-space: pre-wrap; } Play - + Играть Configure - + Настроить &Settings - + &Настройки &Help - + &Помощь About Qt - + О Qt About... - + О... &Profiles - + &Профили &Quit - + &Выход &Uninstall - + &Удалить @@ -534,7 +577,7 @@ p, li { white-space: pre-wrap; } Ryzom Installer - + Инсталлятор Ryzom @@ -548,17 +591,17 @@ Just press Continue button and follow the different steps until everything is do Show advanced parameters (expert) - + Показать расширенные параметры Files will be installed to (requires 10 GiB): - + Файлы будут установлены в (требуется 10 Гб): c:\ - + C:\ @@ -568,27 +611,27 @@ Just press Continue button and follow the different steps until everything is do Do you prefer to use a 64 or 32 bit client? - + Вы предпочитаете использовать 64-битный или 32-битный клиент? 64 bit (recommended) - + 64-битный (рекомендуемый) 32 bit - + 32-битный Continue - + Продолжить Quit - + Выход @@ -596,7 +639,7 @@ Just press Continue button and follow the different steps until everything is do Ryzom Installer - + Инсталлятор Ryzom @@ -619,37 +662,37 @@ Just press Continue button and follow the different steps until everything is do List of profiles: - + Список профилей: Add - + Добавить Delete - + Удалить Profile: - + Профиль: 0 - + 0 Name: - + Имя: Server: - + Сервер: @@ -659,17 +702,17 @@ Just press Continue button and follow the different steps until everything is do Yubo - + Executable: - + Исполняемый файл: ryzom_client_r.exe - + ryzom_client_r.exe @@ -689,170 +732,180 @@ Just press Continue button and follow the different steps until everything is do Comments: - + Комментарии: Directory: - + Директория: ~/.ryzom/0 - + ~/.ryzom/0 Open - + Открыть Create shortcuts: - + Создать ярлыки: Desktop - + Рабочий стол Start Menu - + меню Пуск QApplication - + Error - + Ошибка - + Unable to find ryzom_installer.ini - + Невозможно найти ryzom_installer.ini - + Instalation and launcher tool for Ryzom - + Uninstall - + Удалить - + Silent mode + Фоновый режим (silent mode) + + + + Version + + + + + Install itself 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 - + Невозможно выделить память 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 Unable to copy file %1 - + Невозможно скопировать файл %1 QObject - + B - + Б - + KiB - + Кб - + MiB - + Мб - + GiB - + Гб - + TiB - + Тб - + PiB - + Пб @@ -865,7 +918,7 @@ Just press Continue button and follow the different steps until everything is do Use 64 bit client - + Использовать 64-битный клиент @@ -875,7 +928,7 @@ Just press Continue button and follow the different steps until everything is do Language - + Язык @@ -891,12 +944,12 @@ Just press Continue button and follow the different steps until everything is do D:\Ryzom - + D:\Ryzom E:\Ryzom - + E:\Ryzom @@ -904,7 +957,7 @@ Just press Continue button and follow the different steps until everything is do Ryzom Installer - + Инсталлятор Ryzom @@ -914,17 +967,17 @@ Just press Continue button and follow the different steps until everything is do Components to remove - + Компоненты для удаления Uninstall - + Удалить Cancel - + Отменить