Merge with develop

This commit is contained in:
kervala 2016-10-16 17:31:37 +02:00
parent b8114b2cd6
commit f358ae1c9a
12 changed files with 621 additions and 540 deletions

View file

@ -727,12 +727,13 @@ bool CConfigFile::shouldCreateMenuShortcut() const
return !shortcutExists(profile.getClientMenuShortcutFullPath());
}
bool CConfigFile::shouldCopyInstaller() const
int CConfigFile::compareInstallersVersion() const
{
// returns 0 if same version, 1 if current installer is more recent, -1 if installed installer is more recent
QString installerDst = getInstallationDirectory() + "/" + m_installerFilename;
// if installer not found in installation directory, extract it from BNP
if (!QFile::exists(installerDst)) return true;
// if installer not found in installation directory
if (!QFile::exists(installerDst)) return 1;
QString installedVersion = getVersionFromExecutable(installerDst);
QString newVersion = QApplication::applicationVersion();
@ -740,8 +741,11 @@ bool CConfigFile::shouldCopyInstaller() const
QVersionNumber installedVer = QVersionNumber::fromString(installedVersion);
QVersionNumber newVer = QVersionNumber::fromString(newVersion);
// if version is greater, copy it
return newVer > installedVer;
// same version
if (newVer == installedVer) return 0;
// if version is greater or lower
return newVer > installedVer ? 1:-1;
}
QString CConfigFile::getInstallerCurrentFilePath() const
@ -756,12 +760,15 @@ QString CConfigFile::getInstallerCurrentDirPath() const
return QApplication::applicationDirPath();
}
QString CConfigFile::getInstallerOriginalFilePath() const
QString CConfigFile::getInstallerInstalledFilePath() const
{
return getInstallerOriginalDirPath() + "/" + QFileInfo(QApplication::applicationFilePath()).fileName();
// return an empty string, if no Installer filename in config
if (m_installerFilename.isEmpty()) return "";
return getInstallerInstalledDirPath() + "/" + m_installerFilename;
}
QString CConfigFile::getInstallerOriginalDirPath() const
QString CConfigFile::getInstallerInstalledDirPath() const
{
return m_installationDirectory;
}
@ -956,7 +963,18 @@ OperationStep CConfigFile::getInstallNextStep() const
}
}
if (shouldCopyInstaller()) return CopyInstaller;
// current installer more recent than installed one
switch (compareInstallersVersion())
{
// current installer more recent, copy it
case 1: return CopyInstaller;
// current installer older, launch the more recent installer
case -1: return LaunchInstalledInstaller;
// continue only if 0
default: break;
}
// no default profile
if (profile.id.isEmpty())

View file

@ -104,7 +104,7 @@ public:
bool foundTemporaryFiles(const QString &directory) const;
bool shouldCreateDesktopShortcut() const;
bool shouldCreateMenuShortcut() const;
bool shouldCopyInstaller() const;
int compareInstallersVersion() const;
// installation choices
bool use64BitsClient() const;
@ -124,8 +124,8 @@ public:
QString getInstallerCurrentFilePath() const;
QString getInstallerCurrentDirPath() const;
QString getInstallerOriginalFilePath() const;
QString getInstallerOriginalDirPath() const;
QString getInstallerInstalledFilePath() const;
QString getInstallerInstalledDirPath() const;
QString getInstallerMenuShortcutFullPath() const;
QString getInstallerDesktopShortcutFullPath() const;

View file

@ -356,6 +356,8 @@ void CDownloader::onHeadFinished()
void CDownloader::onDownloadFinished()
{
int status = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
m_reply->deleteLater();
m_reply = NULL;
@ -366,6 +368,8 @@ void CDownloader::onDownloadFinished()
m_listener->operationStop();
}
else
{
if (QFileInfo(m_fullPath).size() == m_size)
{
bool ok = NLMISC::CFile::setFileModificationDate(m_fullPath.toUtf8().constData(), m_lastModified.toTime_t());
@ -373,6 +377,11 @@ void CDownloader::onDownloadFinished()
emit downloadDone();
}
else
{
m_listener->operationFail(tr("HTTP error: %1").arg(status));
}
}
}
void CDownloader::onError(QNetworkReply::NetworkError error)
@ -383,10 +392,6 @@ void CDownloader::onError(QNetworkReply::NetworkError error)
{
m_listener->operationStop();
}
else
{
m_listener->operationFail(tr("Network error: %1").arg(error));
}
}
void CDownloader::onDownloadProgress(qint64 current, qint64 total)

View file

@ -252,7 +252,14 @@ int main(int argc, char *argv[])
step = config.getInstallNextStep();
if (step == Done)
if (step == LaunchInstalledInstaller)
{
#ifndef _DEBUG
// restart more recent installed Installer version
if (QProcess::startDetached(config.getInstallerOriginalFilePath(), QApplication::arguments())) return 0;
#endif
}
else if (step == Done)
{
#if defined(Q_OS_WIN) && !defined(_DEBUG)
// restart Installer, so it could be copied in TEMP and allowed to update itself

View file

@ -64,6 +64,7 @@ enum OperationStep
CleanFiles,
ExtractBnpClient,
CopyInstaller,
LaunchInstalledInstaller,
UninstallOldClient,
CreateProfile,
CreateProfileShortcuts,

View file

@ -199,6 +199,7 @@ void COperationDialog::processInstallNextStep()
break;
case Done:
case LaunchInstalledInstaller:
acceptDelayed();
break;
@ -727,13 +728,12 @@ void COperationDialog::copyInstaller()
QString destinationDirectory = config->getInstallationDirectory();
// rename old client to installer
QString newInstallerFilename = config->getInstallerFilename();
if (!newInstallerFilename.isEmpty())
{
QString oldInstallerFullPath = QApplication::applicationFilePath();
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFullPath.isEmpty())
{
// always copy new installers
CFilesCopier copier(this);
copier.setIncludeFilter(config->getInstallerRequiredFiles());
@ -931,13 +931,9 @@ bool COperationDialog::createAddRemoveEntry()
{
CConfigFile *config = CConfigFile::getInstance();
QString newInstallerFilename = config->getInstallerFilename();
QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFilename.isEmpty())
{
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
if (QFile::exists(newInstallerFullPath))
if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
{
#ifdef Q_OS_WIN
QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
@ -961,7 +957,6 @@ bool COperationDialog::createAddRemoveEntry()
// ModifyPath
#endif
}
}
updateAddRemoveEntry();
@ -974,14 +969,12 @@ bool COperationDialog::updateAddRemoveEntry()
{
CConfigFile *config = CConfigFile::getInstance();
QString newInstallerFullPath = config->getInstallerInstalledFilePath();
if (!newInstallerFullPath.isEmpty() && QFile::exists(newInstallerFullPath))
{
QString newInstallerFilename = config->getInstallerFilename();
if (!newInstallerFilename.isEmpty())
{
QString newInstallerFullPath = config->getInstallationDirectory() + "/" + newInstallerFilename;
if (QFile::exists(newInstallerFullPath))
{
#ifdef Q_OS_WIN
QSettings settings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Ryzom", QSettings::NativeFormat);
@ -995,7 +988,6 @@ bool COperationDialog::updateAddRemoveEntry()
settings.setValue("MinorVersion", versionTokens[1].toInt());
#endif
}
}
return true;
}
@ -1161,7 +1153,7 @@ void COperationDialog::deleteComponentsInstaller()
dir.removeRecursively();
}
path = config->getInstallerOriginalDirPath();
path = config->getInstallerInstalledDirPath();
QStringList files = config->getInstallerRequiredFiles();
foreach(const QString &file, files)

View file

@ -269,7 +269,18 @@ void CProfilesDialog::onExecutableBrowseClicked()
if (executable.isEmpty()) executable = defaultExecutable;
executable = QFileDialog::getOpenFileName(this, tr("Please choose Ryzom client executable to launch"), executable, tr("Executables (*.exe)"));
QString filter;
#ifdef Q_OS_WIN32
filter = tr("Executables (*.exe)");
#else
filter = tr("Executables (*)");
#endif
QFileDialog open;
open.setFilter(QDir::Executable | QDir::NoDotAndDotDot | QDir::Files);
executable = open.getOpenFileName(this, tr("Please choose Ryzom client executable to launch"), executable, filter);
if (executable.isEmpty()) return;

View file

@ -39,85 +39,82 @@
<translation>Falscher Status-Code: %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="388"/>
<location filename="../src/downloader.cpp" line="382"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Network error: %1</source>
<translation>Netzwerk-Fehler: %1</translation>
<translation type="vanished">Netzwerk-Fehler: %1</translation>
</message>
</context>
<context>
<name>CInstallDialog</name>
<message>
<location filename="../src/installdialog.cpp" line="45"/>
<source>Old installation: %1</source>
<translation>Alte Installation: %1</translation>
<translation type="vanished">Alte Installation: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 herunterzuladen)</translation>
<translation type="vanished">Internet (%1 herunterzuladen)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="80"/>
<source>Files will be installed to (requires %1):</source>
<translation>Dateien werden installiert nach (benötigt %1):</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="103"/>
<source>Please choose directory where Ryzom is currently installed.</source>
<translation>Bitte wähle das Verzeichnis, in dem Ryzom momentan installiert ist.</translation>
<translation type="vanished">Bitte wähle das Verzeichnis, in dem Ryzom momentan installiert ist.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom</source>
<translation>Ryzom konnte nicht gefunden werden</translation>
<translation type="vanished">Ryzom konnte nicht gefunden werden</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom in selected directory. Please choose another one or cancel.</source>
<translation>Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab.</translation>
<translation type="vanished">Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="129"/>
<location filename="../src/installdialog.cpp" line="115"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Ein anderer Ort: %1</translation>
<translation type="vanished">Ein anderer Ort: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Undefiniert</translation>
<translation type="vanished">Undefiniert</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Unable to write in directory</source>
<translation>In das Verzeichnis konnte nicht geschrieben werden</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Du hast nicht die Berechtigungen, um mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>Directory not empty</source>
<translation>Verzeichnist ist nicht leer</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes.</translation>
</message>
@ -125,27 +122,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="268"/>
<location filename="../src/mainwindow.cpp" line="270"/>
<source>About %1</source>
<translation>Über %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="272"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="274"/>
<source>Author: %1</source>
<translation>Autor: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="273"/>
<location filename="../src/mainwindow.cpp" line="275"/>
<source>Copyright: %1</source>
<translation>Copyright: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="276"/>
<source>Support: %1</source>
<translation>Support: %1</translation>
</message>
@ -153,42 +150,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="66"/>
<location filename="../src/migratedialog.cpp" line="94"/>
<source>Files will be installed to (requires %1):</source>
<translation>Dateien werden installiert nach (benötigt %1):</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="103"/>
<location filename="../src/migratedialog.cpp" line="131"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>Unable to write in directory</source>
<translation>Kann nicht in dieses Verzeichnis schreiben</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Du hast nicht die Berechtigungen, mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>Directory not empty</source>
<translation>Verzeichnis ist nicht leer</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes.</translation>
</message>
@ -200,109 +197,109 @@
<translation type="vanished">Profile aktualisieren</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="261"/>
<location filename="../src/operationdialog.cpp" line="275"/>
<source>Updating profiles...</source>
<translation>Aktualisiere Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Confirmation</source>
<translation>Bestätigung</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>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?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="437"/>
<location filename="../src/operationdialog.cpp" line="453"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m KiB)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="497"/>
<location filename="../src/operationdialog.cpp" line="513"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="518"/>
<location filename="../src/operationdialog.cpp" line="534"/>
<source>Downloading data required by server %1...</source>
<translation>Herunterzuladende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="529"/>
<location filename="../src/operationdialog.cpp" line="545"/>
<source>Extracting data required by server %1...</source>
<translation>Zu extrahierende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="551"/>
<location filename="../src/operationdialog.cpp" line="569"/>
<source>Downloading client required by server %1...</source>
<translation>Herunterzuladender Client benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="562"/>
<location filename="../src/operationdialog.cpp" line="580"/>
<source>Extracting client required by server %1...</source>
<translation>Zu extrahierender Client benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="589"/>
<location filename="../src/operationdialog.cpp" line="602"/>
<source>Copying data required by server %1...</source>
<translation>Zu kopierende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="623"/>
<location filename="../src/operationdialog.cpp" line="631"/>
<source>Copying old profile to new location...</source>
<translation>Kopiere alte Profile zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="658"/>
<location filename="../src/operationdialog.cpp" line="661"/>
<source>Extracting client to new location...</source>
<translation>Extrahiere Client an neuem Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="725"/>
<location filename="../src/operationdialog.cpp" line="726"/>
<source>Copying installer to new location...</source>
<translation>Kopiere Installer zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="844"/>
<location filename="../src/operationdialog.cpp" line="847"/>
<source>Cleaning obsolete files...</source>
<translation>Bereinige überholte Dateien...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="859"/>
<location filename="../src/operationdialog.cpp" line="862"/>
<source>Creating default profile...</source>
<translation>Erstelle Standard-Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="918"/>
<location filename="../src/operationdialog.cpp" line="921"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Erstelle Verknüpfungen für Profile %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1022"/>
<location filename="../src/operationdialog.cpp" line="1007"/>
<source>Deleting client...</source>
<translation>Lösche Client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1079"/>
<location filename="../src/operationdialog.cpp" line="1067"/>
<source>Adding profiles...</source>
<translation>Füge Profile hinzu...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1099"/>
<location filename="../src/operationdialog.cpp" line="1087"/>
<source>Deleting profiles...</source>
<translation>Lösche Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1149"/>
<location filename="../src/operationdialog.cpp" line="1140"/>
<source>Deleting installer...</source>
<translation>Lösche Installer...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1191"/>
<location filename="../src/operationdialog.cpp" line="1192"/>
<source>Deleting downloaded files...</source>
<translation>Lösche heruntergeladene Dateien...</translation>
</message>
@ -352,12 +349,12 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Kopiere Installer an neuen Ort</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>Uninstall old client</source>
<translation>Deinstalliere alten Client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen?</translation>
</message>
@ -382,7 +379,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Client-Dateien</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1052"/>
<location filename="../src/operationdialog.cpp" line="1037"/>
<source>Unable to delete files for client %1</source>
<translation>Dateien für Client %1 konnten nicht gelöscht werden</translation>
</message>
@ -403,7 +400,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Profil %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1128"/>
<location filename="../src/operationdialog.cpp" line="1116"/>
<source>Unable to delete files for profile %1</source>
<translation>Dateien für Profil %1 konnten nicht gelöscht werden</translation>
</message>
@ -419,24 +416,34 @@ Willst du den Download wirklich abbrechen?</translation>
<context>
<name>CProfilesDialog</name>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="69"/>
<source>Error</source>
<translation type="unfinished">Fehler</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>Confirmation</source>
<translation>Bestätigung</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>You&apos;re going to delete a profile, files won&apos;t be deleted and you&apos;ll have to do that manually.
Are you sure to delete this profile?</source>
<translation>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?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="277"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Bitte wähle die ausführbare Datei, um den Ryzom-Client zu starten</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="275"/>
<source>Executables (*.exe)</source>
<translation>Ausführbare Dateien (*.exe)</translation>
</message>
@ -516,9 +523,8 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten
<translation>Zeige erweiterte Parameter (Experte)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="97"/>
<source>Files will be installed from:</source>
<translation>Dateien werden installiert von:</translation>
<translation type="vanished">Dateien werden installiert von:</translation>
</message>
<message>
<source>Old installation: %1</source>
@ -529,8 +535,7 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten
<translation type="vanished">Ein anderer Ort: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="167"/>
<location filename="../ui/installdialog.ui" line="111"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
@ -547,22 +552,22 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="104"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<location filename="../ui/installdialog.ui" line="121"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Möchtest du einen 64 bit oder 32 bit-Client verwenden?</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="183"/>
<location filename="../ui/installdialog.ui" line="127"/>
<source>64 bit (recommended)</source>
<translation>64 bit (empfohlen)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="193"/>
<location filename="../ui/installdialog.ui" line="137"/>
<source>32 bit</source>
<translation>32 bit</translation>
</message>
@ -587,53 +592,53 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="86"/>
<location filename="../ui/mainwindow.ui" line="80"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="94"/>
<location filename="../ui/mainwindow.ui" line="88"/>
<source>Play</source>
<translation>Spielen</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="101"/>
<location filename="../ui/mainwindow.ui" line="95"/>
<source>Configure</source>
<translation>Konfigurieren</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<location filename="../ui/mainwindow.ui" line="115"/>
<location filename="../ui/mainwindow.ui" line="150"/>
<source>&amp;Settings</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="131"/>
<location filename="../ui/mainwindow.ui" line="125"/>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="141"/>
<location filename="../ui/mainwindow.ui" line="135"/>
<source>About Qt</source>
<translation>Über Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="146"/>
<location filename="../ui/mainwindow.ui" line="140"/>
<source>About...</source>
<translation>Über...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="151"/>
<location filename="../ui/mainwindow.ui" line="145"/>
<source>&amp;Profiles</source>
<translation>&amp;Profile</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="161"/>
<location filename="../ui/mainwindow.ui" line="155"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="166"/>
<location filename="../ui/mainwindow.ui" line="160"/>
<source>&amp;Uninstall</source>
<translation>&amp;Deinstallieren</translation>
</message>
@ -672,37 +677,37 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<location filename="../ui/migratedialog.ui" line="101"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<location filename="../ui/migratedialog.ui" line="108"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="124"/>
<location filename="../ui/migratedialog.ui" line="118"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Möchtest du einen 64 bit oder 32 bit-Client verwenden?</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="130"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<source>64 bit (recommended)</source>
<translation>64 bit (empfohlen)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="140"/>
<location filename="../ui/migratedialog.ui" line="134"/>
<source>32 bit</source>
<translation>32 bit</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="162"/>
<source>Continue</source>
<translation>Weiter</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="175"/>
<location filename="../ui/migratedialog.ui" line="169"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
@ -873,69 +878,74 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Selbstinstallation</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="300"/>
<location filename="../src/filesextractor.cpp" line="540"/>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<source>Unable to open %1</source>
<translation>%1 konnte nicht geöffnet werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="415"/>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Ausgabe-Datei konnte nicht geöffnet werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="424"/>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Ausgabe-Datei konnte nicht geschrieben werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="459"/>
<location filename="../src/filesextractor.cpp" line="467"/>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>7zip-Decoder unterstützt dieses Archiv nicht</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="463"/>
<location filename="../src/filesextractor.cpp" line="499"/>
<source>Unable to allocate memory</source>
<translation>Speicher konnte nicht zugewiesen werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="475"/>
<location filename="../src/filesextractor.cpp" line="507"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<source>Error %1</source>
<translation>Fehler %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="502"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="508"/>
<location filename="../src/filesextractor.cpp" line="548"/>
<source>Unable to set permissions of %1</source>
<translation>Berechtigungen für %1 konnten nicht gesetzt werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="617"/>
<location filename="../src/filesextractor.cpp" line="663"/>
<source>disk full</source>
<translation>Festplatte voll</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="621"/>
<location filename="../src/filesextractor.cpp" line="667"/>
<source>unable to write %1</source>
<translation>Konnte %1 nicht schreiben</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="625"/>
<location filename="../src/filesextractor.cpp" line="671"/>
<source>unable to read %1</source>
<translation>Konnte %1 nicht lesen</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="629"/>
<location filename="../src/filesextractor.cpp" line="675"/>
<source>failed (%1)</source>
<translation>Fehlgeschlagen (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="632"/>
<location filename="../src/filesextractor.cpp" line="678"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Konnte %1 nicht nach %2 entpacken: %3</translation>
</message>
@ -944,36 +954,46 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<source>Unable to copy file %1</source>
<translation>Konnte Datei %1 nicht kopieren</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
<source>Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profile.cpp" line="68"/>
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../src/utils.cpp" line="30"/>
<location filename="../src/utils.cpp" line="33"/>
<source>B</source>
<translation>B</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="31"/>
<location filename="../src/utils.cpp" line="34"/>
<source>KiB</source>
<translation>KiB</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="32"/>
<location filename="../src/utils.cpp" line="35"/>
<source>MiB</source>
<translation>MiB</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="33"/>
<location filename="../src/utils.cpp" line="36"/>
<source>GiB</source>
<translation>GiB</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="34"/>
<location filename="../src/utils.cpp" line="37"/>
<source>TiB</source>
<translation>TiB</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="35"/>
<location filename="../src/utils.cpp" line="38"/>
<source>PiB</source>
<translation>PiB</translation>
</message>

View file

@ -39,85 +39,50 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="388"/>
<source>Network error: %1</source>
<location filename="../src/downloader.cpp" line="382"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CInstallDialog</name>
<message>
<location filename="../src/installdialog.cpp" line="45"/>
<source>Old installation: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="80"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="103"/>
<source>Please choose directory where Ryzom is currently installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom in selected directory. Please choose another one or cancel.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="129"/>
<location filename="../src/installdialog.cpp" line="115"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
@ -125,27 +90,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="268"/>
<location filename="../src/mainwindow.cpp" line="270"/>
<source>About %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="272"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="274"/>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="273"/>
<location filename="../src/mainwindow.cpp" line="275"/>
<source>Copyright: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="276"/>
<source>Support: %1</source>
<translation type="unfinished"></translation>
</message>
@ -153,42 +118,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="66"/>
<location filename="../src/migratedialog.cpp" line="94"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="103"/>
<location filename="../src/migratedialog.cpp" line="131"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
@ -196,128 +161,128 @@
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="261"/>
<location filename="../src/operationdialog.cpp" line="275"/>
<source>Updating profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="437"/>
<location filename="../src/operationdialog.cpp" line="453"/>
<source>%p% (%v/%m KiB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="497"/>
<location filename="../src/operationdialog.cpp" line="513"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="518"/>
<location filename="../src/operationdialog.cpp" line="534"/>
<source>Downloading data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="529"/>
<location filename="../src/operationdialog.cpp" line="545"/>
<source>Extracting data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="551"/>
<location filename="../src/operationdialog.cpp" line="569"/>
<source>Downloading client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="562"/>
<location filename="../src/operationdialog.cpp" line="580"/>
<source>Extracting client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="589"/>
<location filename="../src/operationdialog.cpp" line="602"/>
<source>Copying data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="623"/>
<location filename="../src/operationdialog.cpp" line="631"/>
<source>Copying old profile to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="658"/>
<location filename="../src/operationdialog.cpp" line="661"/>
<source>Extracting client to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="725"/>
<location filename="../src/operationdialog.cpp" line="726"/>
<source>Copying installer to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="844"/>
<location filename="../src/operationdialog.cpp" line="847"/>
<source>Cleaning obsolete files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="859"/>
<location filename="../src/operationdialog.cpp" line="862"/>
<source>Creating default profile...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="918"/>
<location filename="../src/operationdialog.cpp" line="921"/>
<source>Creating shortcuts for profile %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1022"/>
<location filename="../src/operationdialog.cpp" line="1007"/>
<source>Deleting client...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1079"/>
<location filename="../src/operationdialog.cpp" line="1067"/>
<source>Adding profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1099"/>
<location filename="../src/operationdialog.cpp" line="1087"/>
<source>Deleting profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1149"/>
<location filename="../src/operationdialog.cpp" line="1140"/>
<source>Deleting installer...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1191"/>
<location filename="../src/operationdialog.cpp" line="1192"/>
<source>Deleting downloaded files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>Uninstall old client</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1052"/>
<location filename="../src/operationdialog.cpp" line="1037"/>
<source>Unable to delete files for client %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1128"/>
<location filename="../src/operationdialog.cpp" line="1116"/>
<source>Unable to delete files for profile %1</source>
<translation type="unfinished"></translation>
</message>
@ -325,23 +290,33 @@ Are you sure to abort download?</source>
<context>
<name>CProfilesDialog</name>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="69"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>You&apos;re going to delete a profile, files won&apos;t be deleted and you&apos;ll have to do that manually.
Are you sure to delete this profile?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="277"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<source>Please choose Ryzom client executable to launch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="275"/>
<source>Executables (*.exe)</source>
<translation type="unfinished"></translation>
</message>
@ -417,33 +392,27 @@ Just follow the different steps and make your choice between the options presen
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="97"/>
<source>Files will be installed from:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="167"/>
<location filename="../ui/installdialog.ui" line="111"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="104"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<location filename="../ui/installdialog.ui" line="121"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="183"/>
<location filename="../ui/installdialog.ui" line="127"/>
<source>64 bit (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="193"/>
<location filename="../ui/installdialog.ui" line="137"/>
<source>32 bit</source>
<translation type="unfinished"></translation>
</message>
@ -456,53 +425,53 @@ Just follow the different steps and make your choice between the options presen
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="86"/>
<location filename="../ui/mainwindow.ui" line="80"/>
<source>Atys</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="94"/>
<location filename="../ui/mainwindow.ui" line="88"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="101"/>
<location filename="../ui/mainwindow.ui" line="95"/>
<source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<location filename="../ui/mainwindow.ui" line="115"/>
<location filename="../ui/mainwindow.ui" line="150"/>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="131"/>
<location filename="../ui/mainwindow.ui" line="125"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="141"/>
<location filename="../ui/mainwindow.ui" line="135"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="146"/>
<location filename="../ui/mainwindow.ui" line="140"/>
<source>About...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="151"/>
<location filename="../ui/mainwindow.ui" line="145"/>
<source>&amp;Profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="161"/>
<location filename="../ui/mainwindow.ui" line="155"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="166"/>
<location filename="../ui/mainwindow.ui" line="160"/>
<source>&amp;Uninstall</source>
<translation type="unfinished"></translation>
</message>
@ -529,37 +498,37 @@ Just press Continue button and follow the different steps until everything is do
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<location filename="../ui/migratedialog.ui" line="101"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<location filename="../ui/migratedialog.ui" line="108"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="124"/>
<location filename="../ui/migratedialog.ui" line="118"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="130"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<source>64 bit (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="140"/>
<location filename="../ui/migratedialog.ui" line="134"/>
<source>32 bit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="162"/>
<source>Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="175"/>
<location filename="../ui/migratedialog.ui" line="169"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
@ -718,69 +687,74 @@ Just press Continue button and follow the different steps until everything is do
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="300"/>
<location filename="../src/filesextractor.cpp" line="540"/>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<source>Unable to open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="415"/>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="424"/>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="459"/>
<location filename="../src/filesextractor.cpp" line="467"/>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="463"/>
<location filename="../src/filesextractor.cpp" line="499"/>
<source>Unable to allocate memory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="475"/>
<location filename="../src/filesextractor.cpp" line="507"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<source>Error %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="502"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to create directory %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="508"/>
<location filename="../src/filesextractor.cpp" line="548"/>
<source>Unable to set permissions of %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="617"/>
<location filename="../src/filesextractor.cpp" line="663"/>
<source>disk full</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="621"/>
<location filename="../src/filesextractor.cpp" line="667"/>
<source>unable to write %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="625"/>
<location filename="../src/filesextractor.cpp" line="671"/>
<source>unable to read %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="629"/>
<location filename="../src/filesextractor.cpp" line="675"/>
<source>failed (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="632"/>
<location filename="../src/filesextractor.cpp" line="678"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@ -789,36 +763,46 @@ Just press Continue button and follow the different steps until everything is do
<source>Unable to copy file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
<source>Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profile.cpp" line="68"/>
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../src/utils.cpp" line="30"/>
<location filename="../src/utils.cpp" line="33"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/utils.cpp" line="31"/>
<location filename="../src/utils.cpp" line="34"/>
<source>KiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/utils.cpp" line="32"/>
<location filename="../src/utils.cpp" line="35"/>
<source>MiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/utils.cpp" line="33"/>
<location filename="../src/utils.cpp" line="36"/>
<source>GiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/utils.cpp" line="34"/>
<location filename="../src/utils.cpp" line="37"/>
<source>TiB</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/utils.cpp" line="35"/>
<location filename="../src/utils.cpp" line="38"/>
<source>PiB</source>
<translation type="unfinished"></translation>
</message>

View file

@ -39,85 +39,82 @@
<translation>Code de statut incorrect : %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="388"/>
<location filename="../src/downloader.cpp" line="382"/>
<source>HTTP error: %1</source>
<translation>Errreur HTTP : %1</translation>
</message>
<message>
<source>Network error: %1</source>
<translation>Erreur réseau : %1</translation>
<translation type="vanished">Erreur réseau : %1</translation>
</message>
</context>
<context>
<name>CInstallDialog</name>
<message>
<location filename="../src/installdialog.cpp" line="45"/>
<source>Old installation: %1</source>
<translation>Ancienne installation : %1</translation>
<translation type="vanished">Ancienne installation : %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 à télécharger)</translation>
<translation type="vanished">Internet (%1 à télécharger)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="80"/>
<source>Files will be installed to (requires %1):</source>
<translation>Les fichiers seront installés dans (%1 nécessaires) :</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="103"/>
<source>Please choose directory where Ryzom is currently installed.</source>
<translation>Veuillez choisir le répertoire Ryzom est actuellement installé.</translation>
<translation type="vanished">Veuillez choisir le répertoire Ryzom est actuellement installé.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom</source>
<translation>Impossible de trouver Ryzom</translation>
<translation type="vanished">Impossible de trouver Ryzom</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom in selected directory. Please choose another one or cancel.</source>
<translation>Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler.</translation>
<translation type="vanished">Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="129"/>
<location filename="../src/installdialog.cpp" line="115"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Veuillez choisir le répertoire Ryzom sera installé</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Autre emplacement : %1</translation>
<translation type="vanished">Autre emplacement : %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Non défini</translation>
<translation type="vanished">Non défini</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Vous ne disposez pas assez d&apos;espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Unable to write in directory</source>
<translation>Impossible d&apos;écrire dans le répertoire</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
@ -129,27 +126,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="268"/>
<location filename="../src/mainwindow.cpp" line="270"/>
<source>About %1</source>
<translation>À propos de %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="272"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Programme pour installer, télécharger et gérer les profils de Ryzom.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="274"/>
<source>Author: %1</source>
<translation>Auteur : %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="273"/>
<location filename="../src/mainwindow.cpp" line="275"/>
<source>Copyright: %1</source>
<translation>Copyright : %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="276"/>
<source>Support: %1</source>
<translation>Assistance : %1</translation>
</message>
@ -157,42 +154,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="66"/>
<location filename="../src/migratedialog.cpp" line="94"/>
<source>Files will be installed to (requires %1):</source>
<translation>Les fichiers seront installés dans (%1 nécessaires) :</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="103"/>
<location filename="../src/migratedialog.cpp" line="131"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Veuillez choisir le répertoire installer Ryzom</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Vous ne disposez pas assez d&apos;espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>Unable to write in directory</source>
<translation>Impossible d&apos;écrire dans le répertoire</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
@ -208,109 +205,109 @@
<translation type="vanished">Mettre à jour les profils</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="261"/>
<location filename="../src/operationdialog.cpp" line="275"/>
<source>Updating profiles...</source>
<translation>Mise à jour des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Confirmation</source>
<translation>Confirmation</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>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&apos;interrompre le téléchargement ?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="437"/>
<location filename="../src/operationdialog.cpp" line="453"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Kio)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="497"/>
<location filename="../src/operationdialog.cpp" line="513"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="518"/>
<location filename="../src/operationdialog.cpp" line="534"/>
<source>Downloading data required by server %1...</source>
<translation>Téléchargement des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="529"/>
<location filename="../src/operationdialog.cpp" line="545"/>
<source>Extracting data required by server %1...</source>
<translation>Extraction des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="551"/>
<location filename="../src/operationdialog.cpp" line="569"/>
<source>Downloading client required by server %1...</source>
<translation>Téléchargement du client nécessaire pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="562"/>
<location filename="../src/operationdialog.cpp" line="580"/>
<source>Extracting client required by server %1...</source>
<translation>Extraction du client nécessaire pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="589"/>
<location filename="../src/operationdialog.cpp" line="602"/>
<source>Copying data required by server %1...</source>
<translation>Copie des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="623"/>
<location filename="../src/operationdialog.cpp" line="631"/>
<source>Copying old profile to new location...</source>
<translation>Copie de l&apos;ancien profil vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="658"/>
<location filename="../src/operationdialog.cpp" line="661"/>
<source>Extracting client to new location...</source>
<translation>Extraction du client vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="725"/>
<location filename="../src/operationdialog.cpp" line="726"/>
<source>Copying installer to new location...</source>
<translation>Copie de l&apos;installateur vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="844"/>
<location filename="../src/operationdialog.cpp" line="847"/>
<source>Cleaning obsolete files...</source>
<translation>Nettoyage des fichiers obsolètes...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="859"/>
<location filename="../src/operationdialog.cpp" line="862"/>
<source>Creating default profile...</source>
<translation>Création du profil par défaut...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="918"/>
<location filename="../src/operationdialog.cpp" line="921"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Création des raccourcis pour le profil %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1022"/>
<location filename="../src/operationdialog.cpp" line="1007"/>
<source>Deleting client...</source>
<translation>Suppression du client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1079"/>
<location filename="../src/operationdialog.cpp" line="1067"/>
<source>Adding profiles...</source>
<translation>Ajout des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1099"/>
<location filename="../src/operationdialog.cpp" line="1087"/>
<source>Deleting profiles...</source>
<translation>Suppression des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1149"/>
<location filename="../src/operationdialog.cpp" line="1140"/>
<source>Deleting installer...</source>
<translation>Suppression de l&apos;installateur...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1191"/>
<location filename="../src/operationdialog.cpp" line="1192"/>
<source>Deleting downloaded files...</source>
<translation>Suppression des fichiers téléchargés...</translation>
</message>
@ -359,12 +356,12 @@ Are you sure to abort download?</source>
<translation type="vanished">Copier l&apos;installateur vers un nouvel emplacement</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>Uninstall old client</source>
<translation>Désinstaller l&apos;ancien client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>Une ancienne version de Ryzom a é détectée sur ce système, souhaitez-vous la désinstaller afin de libérer de l&apos;espace disque ?</translation>
</message>
@ -389,7 +386,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Supprimer les fichiers du client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1052"/>
<location filename="../src/operationdialog.cpp" line="1037"/>
<source>Unable to delete files for client %1</source>
<translation>Impossible de supprimer les fichiers du client %1</translation>
</message>
@ -410,7 +407,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Suppression du profil %1 en cours...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1128"/>
<location filename="../src/operationdialog.cpp" line="1116"/>
<source>Unable to delete files for profile %1</source>
<translation>Impossible de supprimer les fichiers du profil %1</translation>
</message>
@ -426,24 +423,34 @@ Are you sure to abort download?</source>
<context>
<name>CProfilesDialog</name>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="69"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>Confirmation</source>
<translation>Confirmation</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>You&apos;re going to delete a profile, files won&apos;t be deleted and you&apos;ll have to do that manually.
Are you sure to delete this profile?</source>
<translation>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 ?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="277"/>
<source>Executables (*)</source>
<translation>Exécutables (*)</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Veuillez choisir l&apos;exécutable du client de Ryzom à lancer</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="275"/>
<source>Executables (*.exe)</source>
<translation>Exécutables (*.exe)</translation>
</message>
@ -523,9 +530,8 @@ Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix en
<translation>Afficher les paramètres avancés (expert)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="97"/>
<source>Files will be installed from:</source>
<translation>Les fichiers seront installés à partir de :</translation>
<translation type="vanished">Les fichiers seront installés à partir de :</translation>
</message>
<message>
<source>Old installation: %1</source>
@ -536,8 +542,7 @@ Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix en
<translation type="vanished">Autre emplacement : %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="167"/>
<location filename="../ui/installdialog.ui" line="111"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
@ -558,22 +563,22 @@ Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix en
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="104"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<location filename="../ui/installdialog.ui" line="121"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Préférez-vous utiliser un client 64 ou 32 bits ?</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="183"/>
<location filename="../ui/installdialog.ui" line="127"/>
<source>64 bit (recommended)</source>
<translation>64 bits (recommandé)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="193"/>
<location filename="../ui/installdialog.ui" line="137"/>
<source>32 bit</source>
<translation>32 bits</translation>
</message>
@ -598,53 +603,53 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="86"/>
<location filename="../ui/mainwindow.ui" line="80"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="94"/>
<location filename="../ui/mainwindow.ui" line="88"/>
<source>Play</source>
<translation>Jouer</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="101"/>
<location filename="../ui/mainwindow.ui" line="95"/>
<source>Configure</source>
<translation>Configurer</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<location filename="../ui/mainwindow.ui" line="115"/>
<location filename="../ui/mainwindow.ui" line="150"/>
<source>&amp;Settings</source>
<translation>&amp;Préférences</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="131"/>
<location filename="../ui/mainwindow.ui" line="125"/>
<source>&amp;Help</source>
<translation>&amp;Aide</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="141"/>
<location filename="../ui/mainwindow.ui" line="135"/>
<source>About Qt</source>
<translation>À propos de Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="146"/>
<location filename="../ui/mainwindow.ui" line="140"/>
<source>About...</source>
<translation>À propos de...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="151"/>
<location filename="../ui/mainwindow.ui" line="145"/>
<source>&amp;Profiles</source>
<translation>&amp;Profils</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="161"/>
<location filename="../ui/mainwindow.ui" line="155"/>
<source>&amp;Quit</source>
<translation>&amp;Quitter</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="166"/>
<location filename="../ui/mainwindow.ui" line="160"/>
<source>&amp;Uninstall</source>
<translation>&amp;Désinstaller</translation>
</message>
@ -683,37 +688,37 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<location filename="../ui/migratedialog.ui" line="101"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<location filename="../ui/migratedialog.ui" line="108"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="124"/>
<location filename="../ui/migratedialog.ui" line="118"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Préférez-vous utiliser un client 64 ou 32 bits ?</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="130"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<source>64 bit (recommended)</source>
<translation>64 bits (recommandé)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="140"/>
<location filename="../ui/migratedialog.ui" line="134"/>
<source>32 bit</source>
<translation>32 bits</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="162"/>
<source>Continue</source>
<translation>Suivant</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="175"/>
<location filename="../ui/migratedialog.ui" line="169"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
@ -884,69 +889,74 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>S&apos;auto-installer</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="300"/>
<location filename="../src/filesextractor.cpp" line="540"/>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<source>Unable to open %1</source>
<translation>Impossible d&apos;ouvrir %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="415"/>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Impossible d&apos;ouvrir le fichier de sortie</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="424"/>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Impossible d&apos;écrire le fichier de sortie</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="459"/>
<location filename="../src/filesextractor.cpp" line="467"/>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>Le décodeur 7zip n&apos;est pas compatible avec cette archive</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="463"/>
<location filename="../src/filesextractor.cpp" line="499"/>
<source>Unable to allocate memory</source>
<translation>Impossible d&apos;allouer la mémoire</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="475"/>
<location filename="../src/filesextractor.cpp" line="507"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation>Le fichier %1 est corrompu, impossible de le décompresser</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<source>Error %1</source>
<translation>Erreur %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="502"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to create directory %1</source>
<translation>Impossible de créer le répertoire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="508"/>
<location filename="../src/filesextractor.cpp" line="548"/>
<source>Unable to set permissions of %1</source>
<translation>Impossible de définir les permissions de %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="617"/>
<location filename="../src/filesextractor.cpp" line="663"/>
<source>disk full</source>
<translation>disque plein</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="621"/>
<location filename="../src/filesextractor.cpp" line="667"/>
<source>unable to write %1</source>
<translation>impossible d&apos;écrire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="625"/>
<location filename="../src/filesextractor.cpp" line="671"/>
<source>unable to read %1</source>
<translation>impossible de lire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="629"/>
<location filename="../src/filesextractor.cpp" line="675"/>
<source>failed (%1)</source>
<translation>échec (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="632"/>
<location filename="../src/filesextractor.cpp" line="678"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Impossible d&apos;extraire %1 vers %2 : %3 </translation>
</message>
@ -955,36 +965,46 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<source>Unable to copy file %1</source>
<translation>Impossible de copier le fichier %1</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
<source>Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed)</source>
<translation>L&apos;identifiant du profil %1 utilise des caractères invalides (seuls les lettres, chiffres et underscore sont autorisés)l</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="68"/>
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation>Le nom du profil %1 utilise un caractère invalide %2 à la position %3</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../src/utils.cpp" line="30"/>
<location filename="../src/utils.cpp" line="33"/>
<source>B</source>
<translation>o</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="31"/>
<location filename="../src/utils.cpp" line="34"/>
<source>KiB</source>
<translation>Kio</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="32"/>
<location filename="../src/utils.cpp" line="35"/>
<source>MiB</source>
<translation>Mio</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="33"/>
<location filename="../src/utils.cpp" line="36"/>
<source>GiB</source>
<translation>Gio</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="34"/>
<location filename="../src/utils.cpp" line="37"/>
<source>TiB</source>
<translation>Tio</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="35"/>
<location filename="../src/utils.cpp" line="38"/>
<source>PiB</source>
<translation>Pio</translation>
</message>

View file

@ -39,85 +39,82 @@
<translation>Некорректный код состояния: %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="388"/>
<location filename="../src/downloader.cpp" line="382"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Network error: %1</source>
<translation>Ошибка сети: %1</translation>
<translation type="vanished">Ошибка сети: %1</translation>
</message>
</context>
<context>
<name>CInstallDialog</name>
<message>
<location filename="../src/installdialog.cpp" line="45"/>
<source>Old installation: %1</source>
<translation>Предыдущая установка: %1</translation>
<translation type="vanished">Предыдущая установка: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Интернет (%1 для загрузки)</translation>
<translation type="vanished">Интернет (%1 для загрузки)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="80"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="103"/>
<source>Please choose directory where Ryzom is currently installed.</source>
<translation>Пожалуйста, выберите директорию, в которой установен Ryzom.</translation>
<translation type="vanished">Пожалуйста, выберите директорию, в которой установен Ryzom.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom</source>
<translation>Невозможно найти Ryzom</translation>
<translation type="vanished">Невозможно найти Ryzom</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="109"/>
<source>Unable to find Ryzom in selected directory. Please choose another one or cancel.</source>
<translation>Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену.</translation>
<translation type="vanished">Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="129"/>
<location filename="../src/installdialog.cpp" line="115"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберите директорию для установки Ryzom</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Другое местоположение: %1</translation>
<translation type="vanished">Другое местоположение: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Не определено</translation>
<translation type="vanished">Не определено</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="138"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Unable to write in directory</source>
<translation>Невозможно осуществить запись в директорию</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>Directory not empty</source>
<translation>Директория не является пустой</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<location filename="../src/installdialog.cpp" line="166"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Эта директория не является пустой, пожалуйста, выберите другую.</translation>
</message>
@ -125,27 +122,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="268"/>
<location filename="../src/mainwindow.cpp" line="270"/>
<source>About %1</source>
<translation>О %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="272"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Программа для установки, загрузки и управления профилями Ryzom.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="274"/>
<source>Author: %1</source>
<translation>Автор: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="273"/>
<location filename="../src/mainwindow.cpp" line="275"/>
<source>Copyright: %1</source>
<translation>Копирайт: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="276"/>
<source>Support: %1</source>
<translation>Поддержка: %1</translation>
</message>
@ -153,42 +150,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="66"/>
<location filename="../src/migratedialog.cpp" line="94"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="103"/>
<location filename="../src/migratedialog.cpp" line="131"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберете директорию для установки Ryzom</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="126"/>
<location filename="../src/migratedialog.cpp" line="153"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>Unable to write in directory</source>
<translation>Невозможно осуществить запись в директорию</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<location filename="../src/migratedialog.cpp" line="172"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>Directory not empty</source>
<translation>Директория не является пустой</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<location filename="../src/migratedialog.cpp" line="181"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Эта директория не является пустой, пожалуйста, выберите другую.</translation>
</message>
@ -196,108 +193,108 @@
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="261"/>
<location filename="../src/operationdialog.cpp" line="275"/>
<source>Updating profiles...</source>
<translation>Обновление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Confirmation</source>
<translation>Подтверждение</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="412"/>
<location filename="../src/operationdialog.cpp" line="428"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>Внимание, данный сервер не поддерживает возобновление загрузки! Если вы сейчас прервете загрузку, вы не сможете возобновить ее позднее. Вы уверены, что хотите прервать загрузку?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="437"/>
<location filename="../src/operationdialog.cpp" line="453"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Кб)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="497"/>
<location filename="../src/operationdialog.cpp" line="513"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="518"/>
<location filename="../src/operationdialog.cpp" line="534"/>
<source>Downloading data required by server %1...</source>
<translation>Загрузка данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="529"/>
<location filename="../src/operationdialog.cpp" line="545"/>
<source>Extracting data required by server %1...</source>
<translation>Извлечение данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="551"/>
<location filename="../src/operationdialog.cpp" line="569"/>
<source>Downloading client required by server %1...</source>
<translation>Загрузка клиента, необходимого серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="562"/>
<location filename="../src/operationdialog.cpp" line="580"/>
<source>Extracting client required by server %1...</source>
<translation>Извлечение файлов клиента, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="589"/>
<location filename="../src/operationdialog.cpp" line="602"/>
<source>Copying data required by server %1...</source>
<translation>Копирование данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="623"/>
<location filename="../src/operationdialog.cpp" line="631"/>
<source>Copying old profile to new location...</source>
<translation>Копирование предыдущего профиля в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="658"/>
<location filename="../src/operationdialog.cpp" line="661"/>
<source>Extracting client to new location...</source>
<translation>Извлечение файлов клиента в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="725"/>
<location filename="../src/operationdialog.cpp" line="726"/>
<source>Copying installer to new location...</source>
<translation>Копирование инсталлятора в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="844"/>
<location filename="../src/operationdialog.cpp" line="847"/>
<source>Cleaning obsolete files...</source>
<translation>Удаление устаревших файлов...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="859"/>
<location filename="../src/operationdialog.cpp" line="862"/>
<source>Creating default profile...</source>
<translation>Создание профиля по умолчанию...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="918"/>
<location filename="../src/operationdialog.cpp" line="921"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Создание ярлыков для профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1022"/>
<location filename="../src/operationdialog.cpp" line="1007"/>
<source>Deleting client...</source>
<translation>Удаление клиента...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1079"/>
<location filename="../src/operationdialog.cpp" line="1067"/>
<source>Adding profiles...</source>
<translation>Добавление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1099"/>
<location filename="../src/operationdialog.cpp" line="1087"/>
<source>Deleting profiles...</source>
<translation>Удаление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1149"/>
<location filename="../src/operationdialog.cpp" line="1140"/>
<source>Deleting installer...</source>
<translation>Удаление инсталлятора...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1191"/>
<location filename="../src/operationdialog.cpp" line="1192"/>
<source>Deleting downloaded files...</source>
<translation>Удаление загруженных файлов...</translation>
</message>
@ -334,12 +331,12 @@ Are you sure to abort download?</source>
<translation type="vanished">Копирование %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>Uninstall old client</source>
<translation>Удалить предыдущую версию клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="809"/>
<location filename="../src/operationdialog.cpp" line="812"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>В системе обнаружена предыдущая версия Ryzom, вы хотите удалить ее чтобы освободить место на диске?</translation>
</message>
@ -360,7 +357,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удалить файлы клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1052"/>
<location filename="../src/operationdialog.cpp" line="1037"/>
<source>Unable to delete files for client %1</source>
<translation>Невозможно удалить файлы клиента %1</translation>
</message>
@ -381,7 +378,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удаление профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1128"/>
<location filename="../src/operationdialog.cpp" line="1116"/>
<source>Unable to delete files for profile %1</source>
<translation>Невозможно удалить файлы профиля %1</translation>
</message>
@ -397,23 +394,33 @@ Are you sure to abort download?</source>
<context>
<name>CProfilesDialog</name>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="69"/>
<source>Error</source>
<translation type="unfinished">Ошибка</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>Confirmation</source>
<translation>Подтверждение</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="71"/>
<location filename="../src/profilesdialog.cpp" line="86"/>
<source>You&apos;re going to delete a profile, files won&apos;t be deleted and you&apos;ll have to do that manually.
Are you sure to delete this profile?</source>
<translation>Вы собираетесь удалить профиль, файлы профиля не будут удалены автоматически и их необходимо удалить вручную. Вы уверены, что хотите удалить этот профиль?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="277"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Пожалуйста, выберете исполняемый файл для запуска клиента Ryzom</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="257"/>
<location filename="../src/profilesdialog.cpp" line="275"/>
<source>Executables (*.exe)</source>
<translation>Исполняемые файлы (*.exe)</translation>
</message>
@ -493,9 +500,8 @@ Just follow the different steps and make your choice between the options presen
<translation>Показать расширенные параметры</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="97"/>
<source>Files will be installed from:</source>
<translation>Файлы будут установлены из:</translation>
<translation type="vanished">Файлы будут установлены из:</translation>
</message>
<message>
<source>Old installation: %1</source>
@ -506,8 +512,7 @@ Just follow the different steps and make your choice between the options presen
<translation type="vanished">Другое местоположение: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="167"/>
<location filename="../ui/installdialog.ui" line="111"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
@ -524,22 +529,22 @@ Just follow the different steps and make your choice between the options presen
<translation type="vanished">C:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="104"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<location filename="../ui/installdialog.ui" line="121"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Вы предпочитаете использовать 64-битный или 32-битный клиент?</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="183"/>
<location filename="../ui/installdialog.ui" line="127"/>
<source>64 bit (recommended)</source>
<translation>64-битный (рекомендуемый)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="193"/>
<location filename="../ui/installdialog.ui" line="137"/>
<source>32 bit</source>
<translation>32-битный</translation>
</message>
@ -564,53 +569,53 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="86"/>
<location filename="../ui/mainwindow.ui" line="80"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="94"/>
<location filename="../ui/mainwindow.ui" line="88"/>
<source>Play</source>
<translation>Играть</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="101"/>
<location filename="../ui/mainwindow.ui" line="95"/>
<source>Configure</source>
<translation>Настроить</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<location filename="../ui/mainwindow.ui" line="115"/>
<location filename="../ui/mainwindow.ui" line="150"/>
<source>&amp;Settings</source>
<translation>&amp;Настройки</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="131"/>
<location filename="../ui/mainwindow.ui" line="125"/>
<source>&amp;Help</source>
<translation>&amp;Помощь</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="141"/>
<location filename="../ui/mainwindow.ui" line="135"/>
<source>About Qt</source>
<translation>О Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="146"/>
<location filename="../ui/mainwindow.ui" line="140"/>
<source>About...</source>
<translation>О...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="151"/>
<location filename="../ui/mainwindow.ui" line="145"/>
<source>&amp;Profiles</source>
<translation>&amp;Профили</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="161"/>
<location filename="../ui/mainwindow.ui" line="155"/>
<source>&amp;Quit</source>
<translation>&amp;Выход</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="166"/>
<location filename="../ui/mainwindow.ui" line="160"/>
<source>&amp;Uninstall</source>
<translation>&amp;Удалить</translation>
</message>
@ -649,37 +654,37 @@ Just press Continue button and follow the different steps until everything is do
<translation type="vanished">C:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<location filename="../ui/migratedialog.ui" line="101"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<location filename="../ui/migratedialog.ui" line="108"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="124"/>
<location filename="../ui/migratedialog.ui" line="118"/>
<source>Do you prefer to use a 64 or 32 bit client?</source>
<translation>Вы предпочитаете использовать 64-битный или 32-битный клиент?</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="130"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<source>64 bit (recommended)</source>
<translation>64-битный (рекомендуемый)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="140"/>
<location filename="../ui/migratedialog.ui" line="134"/>
<source>32 bit</source>
<translation>32-битный</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="162"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="175"/>
<location filename="../ui/migratedialog.ui" line="169"/>
<source>Quit</source>
<translation>Выход</translation>
</message>
@ -850,69 +855,74 @@ Just press Continue button and follow the different steps until everything is do
<translation>Установится</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="300"/>
<location filename="../src/filesextractor.cpp" line="540"/>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<source>Unable to open %1</source>
<translation>Невозможно открыть %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="415"/>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Невозможно открыть выходной файл</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="424"/>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Невозможно записать выходной файл</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="459"/>
<location filename="../src/filesextractor.cpp" line="467"/>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>Архиватор 7zip не поддерживает данный тип архива</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="463"/>
<location filename="../src/filesextractor.cpp" line="499"/>
<source>Unable to allocate memory</source>
<translation>Невозможно выделить память</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="475"/>
<location filename="../src/filesextractor.cpp" line="507"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<source>Error %1</source>
<translation>Ошибка %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="502"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to create directory %1</source>
<translation>Невозможно создать директорию %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="508"/>
<location filename="../src/filesextractor.cpp" line="548"/>
<source>Unable to set permissions of %1</source>
<translation>Невозможно назначить права объекта %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="617"/>
<location filename="../src/filesextractor.cpp" line="663"/>
<source>disk full</source>
<translation>диск переполнен</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="621"/>
<location filename="../src/filesextractor.cpp" line="667"/>
<source>unable to write %1</source>
<translation>невозможно записать %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="625"/>
<location filename="../src/filesextractor.cpp" line="671"/>
<source>unable to read %1</source>
<translation>невозможно прочитать %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="629"/>
<location filename="../src/filesextractor.cpp" line="675"/>
<source>failed (%1)</source>
<translation>неуспешно (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="632"/>
<location filename="../src/filesextractor.cpp" line="678"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Невозможно разархивировать %1 в %2: %3</translation>
</message>
@ -921,36 +931,46 @@ Just press Continue button and follow the different steps until everything is do
<source>Unable to copy file %1</source>
<translation>Невозможно скопировать файл %1</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
<source>Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profile.cpp" line="68"/>
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../src/utils.cpp" line="30"/>
<location filename="../src/utils.cpp" line="33"/>
<source>B</source>
<translation>Б</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="31"/>
<location filename="../src/utils.cpp" line="34"/>
<source>KiB</source>
<translation>КиБ</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="32"/>
<location filename="../src/utils.cpp" line="35"/>
<source>MiB</source>
<translation>МиБ</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="33"/>
<location filename="../src/utils.cpp" line="36"/>
<source>GiB</source>
<translation>ГиБ</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="34"/>
<location filename="../src/utils.cpp" line="37"/>
<source>TiB</source>
<translation>ТиБ</translation>
</message>
<message>
<location filename="../src/utils.cpp" line="35"/>
<location filename="../src/utils.cpp" line="38"/>
<source>PiB</source>
<translation>ПиБ</translation>
</message>

View file

@ -66,6 +66,9 @@
</item>
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="profileLabel">
<property name="text">