Merge with develop

This commit is contained in:
kervala 2016-09-29 17:08:03 +02:00
parent 6eb85803eb
commit f983a551a2
17 changed files with 702 additions and 455 deletions

View file

@ -4,7 +4,8 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/client/src/seven_zip ${ZLIB_INCLUD
FILE(GLOB SRC src/*.cpp src/*.h res/*.rc)
FILE(GLOB CLIENT_INSTALL_HDR src/*.h)
FILE(GLOB CLIENT_INSTALL_UIS ui/*.ui)
FILE(GLOB CLIENT_INSTALL_TRANS translations/*.ts)
FILE(GLOB CLIENT_INSTALL_BASE_TRANS translations/qtbase*.ts)
FILE(GLOB CLIENT_INSTALL_TRANS translations/ryzom_installer_*.ts)
FILE(GLOB CLIENT_INSTALL_RCS res/*.qrc)
CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY)
@ -28,7 +29,7 @@ ELSE()
# uncomment this line if you want to update original translations
# QT5_CREATE_TRANSLATION(CLIENT_INSTALL_Q ${CLIENT_INSTALL_UIS} ${SRC} ${CLIENT_INSTALL_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR})
QT5_ADD_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS})
QT5_ADD_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS})
QT5_ADD_RESOURCES(CLIENT_INSTALL_RC_SRCS ${CLIENT_INSTALL_RCS})
QT5_WRAP_CPP(CLIENT_INSTALL_MOC_SRC ${CLIENT_INSTALL_HDR})
QT5_WRAP_UI(CLIENT_INSTALL_UI_HDRS ${CLIENT_INSTALL_UIS})
@ -38,9 +39,9 @@ SOURCE_GROUP("Source" FILES ${SRC})
SOURCE_GROUP("Resources" FILES ${CLIENT_INSTALL_RCS})
SOURCE_GROUP("Forms" FILES ${CLIENT_INSTALL_UIS})
SOURCE_GROUP("Generated Files" FILES ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_RC_SRCS})
SOURCE_GROUP("Translation Files" FILES ${CLIENT_INSTALL_TRANS})
SOURCE_GROUP("Translation Files" FILES ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS})
ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_RC_SRCS} ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_QM})
ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIENT_INSTALL_UI_HDRS} ${CLIENT_INSTALL_RC_SRCS} ${CLIENT_INSTALL_TRANS} ${CLIENT_INSTALL_BASE_TRANS} ${CLIENT_INSTALL_QM})
NL_DEFAULT_PROPS(ryzom_installer_qt "Ryzom, Tools: Ryzom Installer" )
NL_ADD_RUNTIME_FLAGS(ryzom_installer_qt)
NL_ADD_LIB_SUFFIX(ryzom_installer_qt)

View file

@ -49,9 +49,8 @@ CInstallDialog::CInstallDialog():QDialog()
updateAnotherLocationText();
m_dstDirectory = CConfigFile::getNewInstallationDirectory();
updateDestinationText();
// update default destination
onDestinationDefaultButtonClicked();
// check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS())
@ -71,6 +70,7 @@ CInstallDialog::CInstallDialog():QDialog()
destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize)));
connect(anotherLocationBrowseButton, SIGNAL(clicked()), SLOT(onAnotherLocationBrowseButtonClicked()));
connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked()));
connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked()));
// TODO: if found a folder with initial data, get its total size and check if at least that size is free on the disk
@ -117,9 +117,16 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked()
updateAnotherLocationText();
}
void CInstallDialog::onDestinationDefaultButtonClicked()
{
m_dstDirectory = CConfigFile::getNewInstallationDirectory();
updateDestinationText();
}
void CInstallDialog::onDestinationBrowseButtonClicked()
{
QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"));
QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_dstDirectory);
if (directory.isEmpty()) return;
@ -151,6 +158,40 @@ void CInstallDialog::accept()
return;
}
// create directory if doesn't exist
bool succeedsToWrite = QDir().mkpath(m_dstDirectory);
// if unable to create directory, don't expect to write a file in it
if (succeedsToWrite)
{
// check if directory is writable by current user
QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt");
if (file.open(QFile::WriteOnly))
{
file.close();
// remove it
file.remove();
}
else
{
succeedsToWrite = false;
}
}
if (!succeedsToWrite)
{
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to write in directory"), tr("You don't have the permission to write in this directory with your current user account, please choose another directory."));
return;
}
if (!isDirectoryEmpty(m_dstDirectory, true))
{
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
return;
}
if (oldDirectoryRadioButton->isChecked())
{
CConfigFile::getInstance()->setSrcServerDirectory(m_oldDirectory);

View file

@ -36,6 +36,7 @@ public:
private slots:
void onShowAdvancedParameters(int state);
void onAnotherLocationBrowseButtonClicked();
void onDestinationDefaultButtonClicked();
void onDestinationBrowseButtonClicked();
void accept();

View file

@ -46,9 +46,8 @@ CMigrateDialog::CMigrateDialog():QDialog()
}
}
m_dstDirectory = CConfigFile::getNewInstallationDirectory();
updateDestinationText();
// update default destination
onDestinationDefaultButtonClicked();
// check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS())
@ -66,6 +65,7 @@ CMigrateDialog::CMigrateDialog():QDialog()
destinationGroupBox->setTitle(tr("Files will be installed to (requires %1):").arg(qBytesToHumanReadable(server.dataUncompressedSize)));
connect(destinationDefaultButton, SIGNAL(clicked()), SLOT(onDestinationDefaultButtonClicked()));
connect(destinationBrowseButton, SIGNAL(clicked()), SLOT(onDestinationBrowseButtonClicked()));
connect(continueButton, SIGNAL(clicked()), SLOT(accept()));
connect(quitButton, SIGNAL(clicked()), SLOT(reject()));
@ -91,9 +91,16 @@ void CMigrateDialog::onShowAdvancedParameters(int state)
adjustSize();
}
void CMigrateDialog::onDestinationDefaultButtonClicked()
{
m_dstDirectory = CConfigFile::getNewInstallationDirectory();
updateDestinationText();
}
void CMigrateDialog::onDestinationBrowseButtonClicked()
{
QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"));
QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_dstDirectory);
if (directory.isEmpty()) return;
@ -120,6 +127,40 @@ void CMigrateDialog::accept()
return;
}
// create directory if doesn't exist
bool succeedsToWrite = QDir().mkpath(m_dstDirectory);
// if unable to create directory, don't expect to write a file in it
if (succeedsToWrite)
{
// check if directory is writable by current user
QFile file(m_dstDirectory + "/writable_test_for_ryzom_installer.txt");
if (file.open(QFile::WriteOnly))
{
file.close();
// remove it
file.remove();
}
else
{
succeedsToWrite = false;
}
}
if (!succeedsToWrite)
{
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Unable to write in directory"), tr("You don't have the permission to write in this directory with your current user account, please choose another directory."));
return;
}
if (!isDirectoryEmpty(m_dstDirectory, true))
{
QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
return;
}
CConfigFile::getInstance()->setSrcServerDirectory(m_currentDirectory);
CConfigFile::getInstance()->setInstallationDirectory(m_dstDirectory);
CConfigFile::getInstance()->setUse64BitsClient(clientArch64RadioButton->isChecked());

View file

@ -35,6 +35,7 @@ public:
private slots:
void onShowAdvancedParameters(int state);
void onDestinationDefaultButtonClicked();
void onDestinationBrowseButtonClicked();
void accept();

View file

@ -38,6 +38,37 @@ QString qBytesToHumanReadable(qint64 bytes)
return QString::fromUtf8(NLMISC::bytesToHumanReadableUnits(bytes, units).c_str());
}
bool isDirectoryEmpty(const QString &directory, bool recursize)
{
bool res = true;
if (!directory.isEmpty())
{
QDir dir(directory);
if (dir.exists())
{
QFileInfoList list = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot);
for (int i = 0; i < list.size(); ++i)
{
QFileInfo fileInfo = list.at(i);
if (fileInfo.isDir())
{
if (recursize) if (!isDirectoryEmpty(fileInfo.absoluteFilePath(), true)) return false;
}
else
{
return false;
}
}
}
}
return res;
}
qint64 getDirectorySize(const QString &directory, bool recursize)
{
qint64 size = 0;

View file

@ -30,6 +30,8 @@
QString qBytesToHumanReadable(qint64 bytes);
bool isDirectoryEmpty(const QString &directory, bool recursize);
qint64 getDirectorySize(const QString &directory, bool recursize);
// Convert a UTF-8 string to QString

View file

@ -52,12 +52,12 @@
<translation>Alte Installation: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 herunterzuladen)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="71"/>
<location filename="../src/installdialog.cpp" line="70"/>
<source>Files will be installed to (requires %1):</source>
<translation>Dateien werden installiert nach (benötigt %1):</translation>
</message>
@ -77,30 +77,50 @@
<translation>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="122"/>
<location filename="../src/installdialog.cpp" line="129"/>
<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="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Ein anderer Ort: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Undefiniert</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMainWindow</name>
@ -133,25 +153,45 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="67"/>
<location filename="../src/migratedialog.cpp" line="66"/>
<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="96"/>
<location filename="../src/migratedialog.cpp" line="103"/>
<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="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>COperationDialog</name>
@ -160,109 +200,109 @@
<translation type="vanished">Profile aktualisieren</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="258"/>
<location filename="../src/operationdialog.cpp" line="261"/>
<source>Updating profiles...</source>
<translation>Aktualisiere Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<source>Confirmation</source>
<translation>Bestätigung</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<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="434"/>
<location filename="../src/operationdialog.cpp" line="437"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m KiB)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="494"/>
<location filename="../src/operationdialog.cpp" line="497"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="515"/>
<location filename="../src/operationdialog.cpp" line="518"/>
<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="526"/>
<location filename="../src/operationdialog.cpp" line="529"/>
<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="548"/>
<location filename="../src/operationdialog.cpp" line="551"/>
<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="559"/>
<location filename="../src/operationdialog.cpp" line="562"/>
<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="586"/>
<location filename="../src/operationdialog.cpp" line="589"/>
<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="620"/>
<location filename="../src/operationdialog.cpp" line="623"/>
<source>Copying old profile to new location...</source>
<translation>Kopiere alte Profile zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="655"/>
<location filename="../src/operationdialog.cpp" line="658"/>
<source>Extracting client to new location...</source>
<translation>Extrahiere Client an neuem Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="722"/>
<location filename="../src/operationdialog.cpp" line="725"/>
<source>Copying installer to new location...</source>
<translation>Kopiere Installer zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="841"/>
<location filename="../src/operationdialog.cpp" line="844"/>
<source>Cleaning obsolete files...</source>
<translation>Bereinige überholte Dateien...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="856"/>
<location filename="../src/operationdialog.cpp" line="859"/>
<source>Creating default profile...</source>
<translation>Erstelle Standard-Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="915"/>
<location filename="../src/operationdialog.cpp" line="918"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Erstelle Verknüpfungen für Profile %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1019"/>
<location filename="../src/operationdialog.cpp" line="1022"/>
<source>Deleting client...</source>
<translation>Lösche Client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1076"/>
<location filename="../src/operationdialog.cpp" line="1079"/>
<source>Adding profiles...</source>
<translation>Füge Profile hinzu...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1096"/>
<location filename="../src/operationdialog.cpp" line="1099"/>
<source>Deleting profiles...</source>
<translation>Lösche Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1146"/>
<location filename="../src/operationdialog.cpp" line="1149"/>
<source>Deleting installer...</source>
<translation>Lösche Installer...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1188"/>
<location filename="../src/operationdialog.cpp" line="1191"/>
<source>Deleting downloaded files...</source>
<translation>Lösche heruntergeladene Dateien...</translation>
</message>
@ -312,12 +352,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="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<source>Uninstall old client</source>
<translation>Deinstalliere alten Client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<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>
@ -342,7 +382,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Client-Dateien</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1049"/>
<location filename="../src/operationdialog.cpp" line="1052"/>
<source>Unable to delete files for client %1</source>
<translation>Dateien für Client %1 konnten nicht gelöscht werden</translation>
</message>
@ -363,7 +403,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Profil %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1125"/>
<location filename="../src/operationdialog.cpp" line="1128"/>
<source>Unable to delete files for profile %1</source>
<translation>Dateien für Profil %1 konnten nicht gelöscht werden</translation>
</message>
@ -481,48 +521,48 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten
<translation>Dateien werden installiert von:</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="103"/>
<source>Old installation: %1</source>
<translation>Alte Installation: %1</translation>
<translation type="vanished">Alte Installation: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="118"/>
<source>Another location: %1</source>
<translation>Ein anderer Ort: %1</translation>
<translation type="vanished">Ein anderer Ort: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="167"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="137"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 herunterzuladen)</translation>
<translation type="vanished">Internet (%1 herunterzuladen)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="147"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Dateien werden installiert nach (benötigt 10 GiB):</translation>
<translation type="vanished">Dateien werden installiert nach (benötigt 10 GiB):</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="153"/>
<source>c:\</source>
<translation>c:\</translation>
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="170"/>
<location filename="../ui/installdialog.ui" line="160"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<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="176"/>
<location filename="../ui/installdialog.ui" line="183"/>
<source>64 bit (recommended)</source>
<translation>64 bit (empfohlen)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="186"/>
<location filename="../ui/installdialog.ui" line="193"/>
<source>32 bit</source>
<translation>32 bit</translation>
</message>
@ -535,66 +575,65 @@ Folge den verschiedenen Schritten und wähle aus den Optionen, die dir angeboten
<translation>Ryzom-Installationsprogramm</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="48"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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;</source>
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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="83"/>
<location filename="../ui/mainwindow.ui" line="86"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="91"/>
<location filename="../ui/mainwindow.ui" line="94"/>
<source>Play</source>
<translation>Spielen</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="98"/>
<location filename="../ui/mainwindow.ui" line="101"/>
<source>Configure</source>
<translation>Konfigurieren</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="118"/>
<location filename="../ui/mainwindow.ui" line="153"/>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<source>&amp;Settings</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="128"/>
<location filename="../ui/mainwindow.ui" line="131"/>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="138"/>
<location filename="../ui/mainwindow.ui" line="141"/>
<source>About Qt</source>
<translation>Über Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="143"/>
<location filename="../ui/mainwindow.ui" line="146"/>
<source>About...</source>
<translation>Über...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="148"/>
<location filename="../ui/mainwindow.ui" line="151"/>
<source>&amp;Profiles</source>
<translation>&amp;Profile</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="158"/>
<location filename="../ui/mainwindow.ui" line="161"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="163"/>
<location filename="../ui/mainwindow.ui" line="166"/>
<source>&amp;Uninstall</source>
<translation>&amp;Deinstallieren</translation>
</message>
@ -625,42 +664,45 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Zeige erweiterte Parameter (Experte)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="94"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Dateien werden installiert nach (benötigt 10GiB):</translation>
<translation type="vanished">Dateien werden installiert nach (benötigt 10GiB):</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="100"/>
<source>c:\</source>
<translation>c:\</translation>
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="117"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<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="123"/>
<location filename="../ui/migratedialog.ui" line="130"/>
<source>64 bit (recommended)</source>
<translation>64 bit (empfohlen)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="133"/>
<location filename="../ui/migratedialog.ui" line="140"/>
<source>32 bit</source>
<translation>32 bit</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="161"/>
<location filename="../ui/migratedialog.ui" line="168"/>
<source>Continue</source>
<translation>Weiter</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="175"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
@ -668,17 +710,17 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<context>
<name>OperationDialog</name>
<message>
<location filename="../ui/operationdialog.ui" line="35"/>
<location filename="../ui/operationdialog.ui" line="29"/>
<source>Ryzom Installer</source>
<translation>Ryzom-Installationsprogramm</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="41"/>
<location filename="../ui/operationdialog.ui" line="35"/>
<source>Operation</source>
<translation>Verarbeitung</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="48"/>
<location filename="../ui/operationdialog.ui" line="42"/>
<source>Operation progress</source>
<translation>Verarbeitungsfortschritt</translation>
</message>
@ -711,9 +753,8 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Profil:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="79"/>
<source>0</source>
<translation>0</translation>
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
@ -726,72 +767,70 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Server:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="104"/>
<location filename="../ui/profilesdialog.ui" line="107"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="109"/>
<location filename="../ui/profilesdialog.ui" line="112"/>
<source>Yubo</source>
<translation>Yubo</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="117"/>
<location filename="../ui/profilesdialog.ui" line="120"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="126"/>
<source>ryzom_client_r.exe</source>
<translation>ryzom_client_r.exe</translation>
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="133"/>
<location filename="../ui/profilesdialog.ui" line="136"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="140"/>
<location filename="../ui/profilesdialog.ui" line="143"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="149"/>
<location filename="../ui/profilesdialog.ui" line="152"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="159"/>
<location filename="../ui/profilesdialog.ui" line="162"/>
<source>Comments:</source>
<translation>Kommentare:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="176"/>
<location filename="../ui/profilesdialog.ui" line="179"/>
<source>Directory:</source>
<translation>Verzeichnis:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="185"/>
<source>~/.ryzom/0</source>
<translation>~/.ryzom/0</translation>
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="192"/>
<location filename="../ui/profilesdialog.ui" line="195"/>
<source>Open</source>
<translation>Öffnen</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="201"/>
<location filename="../ui/profilesdialog.ui" line="204"/>
<source>Create shortcuts:</source>
<translation>Erstelle Verknüpfungen:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="210"/>
<location filename="../ui/profilesdialog.ui" line="213"/>
<source>Desktop</source>
<translation>Desktop</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="217"/>
<location filename="../ui/profilesdialog.ui" line="220"/>
<source>Start Menu</source>
<translation>Start-Menü</translation>
</message>
@ -973,14 +1012,12 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Ort der Ryzom-Quelldateien:</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="64"/>
<source>D:\Ryzom</source>
<translation>D:\Ryzom</translation>
<translation type="vanished">D:\Ryzom</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="71"/>
<source>E:\Ryzom</source>
<translation>E:\Ryzom</translation>
<translation type="vanished">E:\Ryzom</translation>
</message>
</context>
<context>

View file

@ -52,12 +52,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<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="71"/>
<location filename="../src/installdialog.cpp" line="70"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
@ -77,30 +77,50 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="122"/>
<location filename="../src/installdialog.cpp" line="129"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMainWindow</name>
@ -133,151 +153,171 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="67"/>
<location filename="../src/migratedialog.cpp" line="66"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="96"/>
<location filename="../src/migratedialog.cpp" line="103"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="258"/>
<location filename="../src/operationdialog.cpp" line="261"/>
<source>Updating profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<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="434"/>
<location filename="../src/operationdialog.cpp" line="437"/>
<source>%p% (%v/%m KiB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="494"/>
<location filename="../src/operationdialog.cpp" line="497"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="515"/>
<location filename="../src/operationdialog.cpp" line="518"/>
<source>Downloading data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="526"/>
<location filename="../src/operationdialog.cpp" line="529"/>
<source>Extracting data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="548"/>
<location filename="../src/operationdialog.cpp" line="551"/>
<source>Downloading client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="559"/>
<location filename="../src/operationdialog.cpp" line="562"/>
<source>Extracting client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="586"/>
<location filename="../src/operationdialog.cpp" line="589"/>
<source>Copying data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="620"/>
<location filename="../src/operationdialog.cpp" line="623"/>
<source>Copying old profile to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="655"/>
<location filename="../src/operationdialog.cpp" line="658"/>
<source>Extracting client to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="722"/>
<location filename="../src/operationdialog.cpp" line="725"/>
<source>Copying installer to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="841"/>
<location filename="../src/operationdialog.cpp" line="844"/>
<source>Cleaning obsolete files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="856"/>
<location filename="../src/operationdialog.cpp" line="859"/>
<source>Creating default profile...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="915"/>
<location filename="../src/operationdialog.cpp" line="918"/>
<source>Creating shortcuts for profile %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1019"/>
<location filename="../src/operationdialog.cpp" line="1022"/>
<source>Deleting client...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1076"/>
<location filename="../src/operationdialog.cpp" line="1079"/>
<source>Adding profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1096"/>
<location filename="../src/operationdialog.cpp" line="1099"/>
<source>Deleting profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1146"/>
<location filename="../src/operationdialog.cpp" line="1149"/>
<source>Deleting installer...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1188"/>
<location filename="../src/operationdialog.cpp" line="1191"/>
<source>Deleting downloaded files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<source>Uninstall old client</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<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="1049"/>
<location filename="../src/operationdialog.cpp" line="1052"/>
<source>Unable to delete files for client %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1125"/>
<location filename="../src/operationdialog.cpp" line="1128"/>
<source>Unable to delete files for profile %1</source>
<translation type="unfinished"></translation>
</message>
@ -381,49 +421,29 @@ Just follow the different steps and make your choice between the options presen
<source>Files will be installed from:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="103"/>
<source>Old installation: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="118"/>
<source>Another location: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="167"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="137"/>
<source>Internet (%1 to download)</source>
<location filename="../ui/installdialog.ui" line="160"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="147"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="153"/>
<source>c:\</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="170"/>
<location filename="../ui/installdialog.ui" line="177"/>
<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="176"/>
<location filename="../ui/installdialog.ui" line="183"/>
<source>64 bit (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="186"/>
<location filename="../ui/installdialog.ui" line="193"/>
<source>32 bit</source>
<translation type="unfinished"></translation>
</message>
@ -436,62 +456,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="48"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="83"/>
<location filename="../ui/mainwindow.ui" line="86"/>
<source>Atys</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="91"/>
<location filename="../ui/mainwindow.ui" line="94"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="98"/>
<location filename="../ui/mainwindow.ui" line="101"/>
<source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="118"/>
<location filename="../ui/mainwindow.ui" line="153"/>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="128"/>
<location filename="../ui/mainwindow.ui" line="131"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="138"/>
<location filename="../ui/mainwindow.ui" line="141"/>
<source>About Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="143"/>
<location filename="../ui/mainwindow.ui" line="146"/>
<source>About...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="148"/>
<location filename="../ui/mainwindow.ui" line="151"/>
<source>&amp;Profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="158"/>
<location filename="../ui/mainwindow.ui" line="161"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="163"/>
<location filename="../ui/mainwindow.ui" line="166"/>
<source>&amp;Uninstall</source>
<translation type="unfinished"></translation>
</message>
@ -517,43 +528,38 @@ Just press Continue button and follow the different steps until everything is do
<source>Show advanced parameters (expert)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="94"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="100"/>
<source>c:\</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="117"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<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="123"/>
<location filename="../ui/migratedialog.ui" line="130"/>
<source>64 bit (recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="133"/>
<location filename="../ui/migratedialog.ui" line="140"/>
<source>32 bit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="161"/>
<location filename="../ui/migratedialog.ui" line="168"/>
<source>Continue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="175"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
@ -561,17 +567,17 @@ Just press Continue button and follow the different steps until everything is do
<context>
<name>OperationDialog</name>
<message>
<location filename="../ui/operationdialog.ui" line="35"/>
<location filename="../ui/operationdialog.ui" line="29"/>
<source>Ryzom Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="41"/>
<location filename="../ui/operationdialog.ui" line="35"/>
<source>Operation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="48"/>
<location filename="../ui/operationdialog.ui" line="42"/>
<source>Operation progress</source>
<translation type="unfinished"></translation>
</message>
@ -603,11 +609,6 @@ Just press Continue button and follow the different steps until everything is do
<source>Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="79"/>
<source>0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
<source>Name:</source>
@ -619,72 +620,62 @@ Just press Continue button and follow the different steps until everything is do
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="104"/>
<location filename="../ui/profilesdialog.ui" line="107"/>
<source>Atys</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="109"/>
<location filename="../ui/profilesdialog.ui" line="112"/>
<source>Yubo</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="117"/>
<location filename="../ui/profilesdialog.ui" line="120"/>
<source>Executable:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="126"/>
<source>ryzom_client_r.exe</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="133"/>
<location filename="../ui/profilesdialog.ui" line="136"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="140"/>
<location filename="../ui/profilesdialog.ui" line="143"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="149"/>
<location filename="../ui/profilesdialog.ui" line="152"/>
<source>Arguments:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="159"/>
<location filename="../ui/profilesdialog.ui" line="162"/>
<source>Comments:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="176"/>
<location filename="../ui/profilesdialog.ui" line="179"/>
<source>Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="185"/>
<source>~/.ryzom/0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="192"/>
<location filename="../ui/profilesdialog.ui" line="195"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="201"/>
<location filename="../ui/profilesdialog.ui" line="204"/>
<source>Create shortcuts:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="210"/>
<location filename="../ui/profilesdialog.ui" line="213"/>
<source>Desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="217"/>
<location filename="../ui/profilesdialog.ui" line="220"/>
<source>Start Menu</source>
<translation type="unfinished"></translation>
</message>
@ -865,16 +856,6 @@ Just press Continue button and follow the different steps until everything is do
<source>Location of source Ryzom files:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="64"/>
<source>D:\Ryzom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="71"/>
<source>E:\Ryzom</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>UninstallDialog</name>

View file

@ -52,12 +52,12 @@
<translation>Ancienne installation : %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 à télécharger)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="71"/>
<location filename="../src/installdialog.cpp" line="70"/>
<source>Files will be installed to (requires %1):</source>
<translation>Les fichiers seront installés dans (%1 nécessaires) :</translation>
</message>
@ -77,30 +77,54 @@
<translation>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="122"/>
<location filename="../src/installdialog.cpp" line="129"/>
<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="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Autre emplacement : %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Non défini</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<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"/>
<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"/>
<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"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<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>
<message>
<source>This directory is not empty, please choose or create another directory.</source>
<translation type="vanished">Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
</context>
<context>
<name>CMainWindow</name>
@ -133,25 +157,49 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="67"/>
<location filename="../src/migratedialog.cpp" line="66"/>
<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="96"/>
<location filename="../src/migratedialog.cpp" line="103"/>
<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="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<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"/>
<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"/>
<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"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<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>
<message>
<source>This directory is not empty, please choose or create another directory.</source>
<translation type="vanished">Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
</context>
<context>
<name>COperationDialog</name>
@ -160,109 +208,109 @@
<translation type="vanished">Mettre à jour les profils</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="258"/>
<location filename="../src/operationdialog.cpp" line="261"/>
<source>Updating profiles...</source>
<translation>Mise à jour des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<source>Confirmation</source>
<translation>Confirmation</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<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="434"/>
<location filename="../src/operationdialog.cpp" line="437"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Kio)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="494"/>
<location filename="../src/operationdialog.cpp" line="497"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="515"/>
<location filename="../src/operationdialog.cpp" line="518"/>
<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="526"/>
<location filename="../src/operationdialog.cpp" line="529"/>
<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="548"/>
<location filename="../src/operationdialog.cpp" line="551"/>
<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="559"/>
<location filename="../src/operationdialog.cpp" line="562"/>
<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="586"/>
<location filename="../src/operationdialog.cpp" line="589"/>
<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="620"/>
<location filename="../src/operationdialog.cpp" line="623"/>
<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="655"/>
<location filename="../src/operationdialog.cpp" line="658"/>
<source>Extracting client to new location...</source>
<translation>Extraction du client vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="722"/>
<location filename="../src/operationdialog.cpp" line="725"/>
<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="841"/>
<location filename="../src/operationdialog.cpp" line="844"/>
<source>Cleaning obsolete files...</source>
<translation>Nettoyage des fichiers obsolètes...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="856"/>
<location filename="../src/operationdialog.cpp" line="859"/>
<source>Creating default profile...</source>
<translation>Création du profil par défaut...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="915"/>
<location filename="../src/operationdialog.cpp" line="918"/>
<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="1019"/>
<location filename="../src/operationdialog.cpp" line="1022"/>
<source>Deleting client...</source>
<translation>Suppression du client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1076"/>
<location filename="../src/operationdialog.cpp" line="1079"/>
<source>Adding profiles...</source>
<translation>Ajout des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1096"/>
<location filename="../src/operationdialog.cpp" line="1099"/>
<source>Deleting profiles...</source>
<translation>Suppression des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1146"/>
<location filename="../src/operationdialog.cpp" line="1149"/>
<source>Deleting installer...</source>
<translation>Suppression de l&apos;installateur...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1188"/>
<location filename="../src/operationdialog.cpp" line="1191"/>
<source>Deleting downloaded files...</source>
<translation>Suppression des fichiers téléchargés...</translation>
</message>
@ -311,12 +359,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="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<source>Uninstall old client</source>
<translation>Désinstaller l&apos;ancien client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<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>
@ -341,7 +389,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="1049"/>
<location filename="../src/operationdialog.cpp" line="1052"/>
<source>Unable to delete files for client %1</source>
<translation>Impossible de supprimer les fichiers du client %1</translation>
</message>
@ -362,7 +410,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="1125"/>
<location filename="../src/operationdialog.cpp" line="1128"/>
<source>Unable to delete files for profile %1</source>
<translation>Impossible de supprimer les fichiers du profil %1</translation>
</message>
@ -480,52 +528,52 @@ Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix en
<translation>Les fichiers seront installés à partir de :</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="103"/>
<source>Old installation: %1</source>
<translation>Ancienne installation : %1</translation>
<translation type="vanished">Ancienne installation : %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="118"/>
<source>Another location: %1</source>
<translation>Autre emplacement : %1</translation>
<translation type="vanished">Autre emplacement : %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="167"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="137"/>
<source>Internet (%1 to download)</source>
<translation>Internet (%1 à télécharger)</translation>
<translation type="vanished">Internet (%1 à télécharger)</translation>
</message>
<message>
<source>Internet (%1 GiB to download)</source>
<translation type="vanished">Internet (%1 à télécharger)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="147"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Les fichiers seront installés dans (10 Gio nécessaires) :</translation>
<translation type="vanished">Les fichiers seront installés dans (10 Gio nécessaires) :</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="153"/>
<source>c:\</source>
<translation>c:\</translation>
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="170"/>
<location filename="../ui/installdialog.ui" line="160"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<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="176"/>
<location filename="../ui/installdialog.ui" line="183"/>
<source>64 bit (recommended)</source>
<translation>64 bits (recommandé)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="186"/>
<location filename="../ui/installdialog.ui" line="193"/>
<source>32 bit</source>
<translation>32 bits</translation>
</message>
@ -538,66 +586,65 @@ Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix en
<translation>Installateur de Ryzom</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="48"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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;</source>
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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="83"/>
<location filename="../ui/mainwindow.ui" line="86"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="91"/>
<location filename="../ui/mainwindow.ui" line="94"/>
<source>Play</source>
<translation>Jouer</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="98"/>
<location filename="../ui/mainwindow.ui" line="101"/>
<source>Configure</source>
<translation>Configurer</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="118"/>
<location filename="../ui/mainwindow.ui" line="153"/>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<source>&amp;Settings</source>
<translation>&amp;Préférences</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="128"/>
<location filename="../ui/mainwindow.ui" line="131"/>
<source>&amp;Help</source>
<translation>&amp;Aide</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="138"/>
<location filename="../ui/mainwindow.ui" line="141"/>
<source>About Qt</source>
<translation>À propos de Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="143"/>
<location filename="../ui/mainwindow.ui" line="146"/>
<source>About...</source>
<translation>À propos de...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="148"/>
<location filename="../ui/mainwindow.ui" line="151"/>
<source>&amp;Profiles</source>
<translation>&amp;Profils</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="158"/>
<location filename="../ui/mainwindow.ui" line="161"/>
<source>&amp;Quit</source>
<translation>&amp;Quitter</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="163"/>
<location filename="../ui/mainwindow.ui" line="166"/>
<source>&amp;Uninstall</source>
<translation>&amp;Désinstaller</translation>
</message>
@ -628,42 +675,45 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>Afficher les paramètres avancés (expert)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="94"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Les fichiers seront installés dans (10 Gio nécessaires) :</translation>
<translation type="vanished">Les fichiers seront installés dans (10 Gio nécessaires) :</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="100"/>
<source>c:\</source>
<translation>c:\</translation>
<translation type="vanished">c:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="117"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<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="123"/>
<location filename="../ui/migratedialog.ui" line="130"/>
<source>64 bit (recommended)</source>
<translation>64 bits (recommandé)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="133"/>
<location filename="../ui/migratedialog.ui" line="140"/>
<source>32 bit</source>
<translation>32 bits</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="161"/>
<location filename="../ui/migratedialog.ui" line="168"/>
<source>Continue</source>
<translation>Suivant</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="175"/>
<source>Quit</source>
<translation>Quitter</translation>
</message>
@ -671,17 +721,17 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<context>
<name>OperationDialog</name>
<message>
<location filename="../ui/operationdialog.ui" line="35"/>
<location filename="../ui/operationdialog.ui" line="29"/>
<source>Ryzom Installer</source>
<translation>Installateur de Ryzom</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="41"/>
<location filename="../ui/operationdialog.ui" line="35"/>
<source>Operation</source>
<translation>Opération</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="48"/>
<location filename="../ui/operationdialog.ui" line="42"/>
<source>Operation progress</source>
<translation>Progression de l&apos;opération</translation>
</message>
@ -714,9 +764,8 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>Profil :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="79"/>
<source>0</source>
<translation>0</translation>
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
@ -729,72 +778,70 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>Serveur :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="104"/>
<location filename="../ui/profilesdialog.ui" line="107"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="109"/>
<location filename="../ui/profilesdialog.ui" line="112"/>
<source>Yubo</source>
<translation>Yubo</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="117"/>
<location filename="../ui/profilesdialog.ui" line="120"/>
<source>Executable:</source>
<translation>Exécutable :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="126"/>
<source>ryzom_client_r.exe</source>
<translation>ryzom_client_r.exe</translation>
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="133"/>
<location filename="../ui/profilesdialog.ui" line="136"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="140"/>
<location filename="../ui/profilesdialog.ui" line="143"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="149"/>
<location filename="../ui/profilesdialog.ui" line="152"/>
<source>Arguments:</source>
<translation>Arguments :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="159"/>
<location filename="../ui/profilesdialog.ui" line="162"/>
<source>Comments:</source>
<translation>Commentaires :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="176"/>
<location filename="../ui/profilesdialog.ui" line="179"/>
<source>Directory:</source>
<translation>Répertoire :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="185"/>
<source>~/.ryzom/0</source>
<translation>~/.ryzom/0</translation>
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="192"/>
<location filename="../ui/profilesdialog.ui" line="195"/>
<source>Open</source>
<translation>Ouvrir</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="201"/>
<location filename="../ui/profilesdialog.ui" line="204"/>
<source>Create shortcuts:</source>
<translation>Créer les raccourcis :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="210"/>
<location filename="../ui/profilesdialog.ui" line="213"/>
<source>Desktop</source>
<translation>Bureau</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="217"/>
<location filename="../ui/profilesdialog.ui" line="220"/>
<source>Start Menu</source>
<translation>Menu Démarrer</translation>
</message>
@ -976,14 +1023,12 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>Emplacement des fichiers sources de Ryzom :</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="64"/>
<source>D:\Ryzom</source>
<translation>D:\Ryzom</translation>
<translation type="vanished">D:\Ryzom</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="71"/>
<source>E:\Ryzom</source>
<translation>E:\Ryzom</translation>
<translation type="vanished">E:\Ryzom</translation>
</message>
</context>
<context>

View file

@ -52,12 +52,12 @@
<translation>Предыдущая установка: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="70"/>
<location filename="../src/installdialog.cpp" line="69"/>
<source>Internet (%1 to download)</source>
<translation>Интернет (%1 для загрузки)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="71"/>
<location filename="../src/installdialog.cpp" line="70"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
@ -77,30 +77,50 @@
<translation>Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="122"/>
<location filename="../src/installdialog.cpp" line="129"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберите директорию для установки Ryzom</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Another location: %1</source>
<translation>Другое местоположение: %1</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="133"/>
<location filename="../src/installdialog.cpp" line="140"/>
<source>Undefined</source>
<translation>Не определено</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="150"/>
<location filename="../src/installdialog.cpp" line="157"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="185"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="191"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CMainWindow</name>
@ -133,131 +153,151 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="67"/>
<location filename="../src/migratedialog.cpp" line="66"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="96"/>
<location filename="../src/migratedialog.cpp" line="103"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберете директорию для установки Ryzom</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="119"/>
<location filename="../src/migratedialog.cpp" line="126"/>
<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"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="154"/>
<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"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="160"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="258"/>
<location filename="../src/operationdialog.cpp" line="261"/>
<source>Updating profiles...</source>
<translation>Обновление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<source>Confirmation</source>
<translation>Подтверждение</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="409"/>
<location filename="../src/operationdialog.cpp" line="412"/>
<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="434"/>
<location filename="../src/operationdialog.cpp" line="437"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Кб)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="494"/>
<location filename="../src/operationdialog.cpp" line="497"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="515"/>
<location filename="../src/operationdialog.cpp" line="518"/>
<source>Downloading data required by server %1...</source>
<translation>Загрузка данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="526"/>
<location filename="../src/operationdialog.cpp" line="529"/>
<source>Extracting data required by server %1...</source>
<translation>Извлечение данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="548"/>
<location filename="../src/operationdialog.cpp" line="551"/>
<source>Downloading client required by server %1...</source>
<translation>Загрузка клиента, необходимого серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="559"/>
<location filename="../src/operationdialog.cpp" line="562"/>
<source>Extracting client required by server %1...</source>
<translation>Извлечение файлов клиента, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="586"/>
<location filename="../src/operationdialog.cpp" line="589"/>
<source>Copying data required by server %1...</source>
<translation>Копирование данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="620"/>
<location filename="../src/operationdialog.cpp" line="623"/>
<source>Copying old profile to new location...</source>
<translation>Копирование предыдущего профиля в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="655"/>
<location filename="../src/operationdialog.cpp" line="658"/>
<source>Extracting client to new location...</source>
<translation>Извлечение файлов клиента в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="722"/>
<location filename="../src/operationdialog.cpp" line="725"/>
<source>Copying installer to new location...</source>
<translation>Копирование инсталлятора в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="841"/>
<location filename="../src/operationdialog.cpp" line="844"/>
<source>Cleaning obsolete files...</source>
<translation>Удаление устаревших файлов...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="856"/>
<location filename="../src/operationdialog.cpp" line="859"/>
<source>Creating default profile...</source>
<translation>Создание профиля по умолчанию...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="915"/>
<location filename="../src/operationdialog.cpp" line="918"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Создание ярлыков для профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1019"/>
<location filename="../src/operationdialog.cpp" line="1022"/>
<source>Deleting client...</source>
<translation>Удаление клиента...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1076"/>
<location filename="../src/operationdialog.cpp" line="1079"/>
<source>Adding profiles...</source>
<translation>Добавление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1096"/>
<location filename="../src/operationdialog.cpp" line="1099"/>
<source>Deleting profiles...</source>
<translation>Удаление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1146"/>
<location filename="../src/operationdialog.cpp" line="1149"/>
<source>Deleting installer...</source>
<translation>Удаление инсталлятора...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1188"/>
<location filename="../src/operationdialog.cpp" line="1191"/>
<source>Deleting downloaded files...</source>
<translation>Удаление загруженных файлов...</translation>
</message>
@ -294,12 +334,12 @@ Are you sure to abort download?</source>
<translation type="vanished">Копирование %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<source>Uninstall old client</source>
<translation>Удалить предыдущую версию клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="806"/>
<location filename="../src/operationdialog.cpp" line="809"/>
<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>
@ -320,7 +360,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удалить файлы клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1049"/>
<location filename="../src/operationdialog.cpp" line="1052"/>
<source>Unable to delete files for client %1</source>
<translation>Невозможно удалить файлы клиента %1</translation>
</message>
@ -341,7 +381,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удаление профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1125"/>
<location filename="../src/operationdialog.cpp" line="1128"/>
<source>Unable to delete files for profile %1</source>
<translation>Невозможно удалить файлы профиля %1</translation>
</message>
@ -458,48 +498,48 @@ Just follow the different steps and make your choice between the options presen
<translation>Файлы будут установлены из:</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="103"/>
<source>Old installation: %1</source>
<translation>Предыдущая установка: %1</translation>
<translation type="vanished">Предыдущая установка: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="118"/>
<source>Another location: %1</source>
<translation>Другое местоположение: %1</translation>
<translation type="vanished">Другое местоположение: %1</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="128"/>
<location filename="../ui/installdialog.ui" line="160"/>
<location filename="../ui/installdialog.ui" line="167"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="137"/>
<source>Internet (%1 to download)</source>
<translation>Интернет (%1 для загрузки)</translation>
<translation type="vanished">Интернет (%1 для загрузки)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="147"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Файлы будут установлены в (требуется 10 Гб):</translation>
<translation type="vanished">Файлы будут установлены в (требуется 10 Гб):</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="153"/>
<source>c:\</source>
<translation>C:\</translation>
<translation type="vanished">C:\</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="170"/>
<location filename="../ui/installdialog.ui" line="160"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="177"/>
<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="176"/>
<location filename="../ui/installdialog.ui" line="183"/>
<source>64 bit (recommended)</source>
<translation>64-битный (рекомендуемый)</translation>
</message>
<message>
<location filename="../ui/installdialog.ui" line="186"/>
<location filename="../ui/installdialog.ui" line="193"/>
<source>32 bit</source>
<translation>32-битный</translation>
</message>
@ -512,66 +552,65 @@ Just follow the different steps and make your choice between the options presen
<translation>Инсталлятор Ryzom</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="48"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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;</source>
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&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="83"/>
<location filename="../ui/mainwindow.ui" line="86"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="91"/>
<location filename="../ui/mainwindow.ui" line="94"/>
<source>Play</source>
<translation>Играть</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="98"/>
<location filename="../ui/mainwindow.ui" line="101"/>
<source>Configure</source>
<translation>Настроить</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="118"/>
<location filename="../ui/mainwindow.ui" line="153"/>
<location filename="../ui/mainwindow.ui" line="121"/>
<location filename="../ui/mainwindow.ui" line="156"/>
<source>&amp;Settings</source>
<translation>&amp;Настройки</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="128"/>
<location filename="../ui/mainwindow.ui" line="131"/>
<source>&amp;Help</source>
<translation>&amp;Помощь</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="138"/>
<location filename="../ui/mainwindow.ui" line="141"/>
<source>About Qt</source>
<translation>О Qt</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="143"/>
<location filename="../ui/mainwindow.ui" line="146"/>
<source>About...</source>
<translation>О...</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="148"/>
<location filename="../ui/mainwindow.ui" line="151"/>
<source>&amp;Profiles</source>
<translation>&amp;Профили</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="158"/>
<location filename="../ui/mainwindow.ui" line="161"/>
<source>&amp;Quit</source>
<translation>&amp;Выход</translation>
</message>
<message>
<location filename="../ui/mainwindow.ui" line="163"/>
<location filename="../ui/mainwindow.ui" line="166"/>
<source>&amp;Uninstall</source>
<translation>&amp;Удалить</translation>
</message>
@ -602,42 +641,45 @@ Just press Continue button and follow the different steps until everything is do
<translation>Показать расширенные параметры</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="94"/>
<source>Files will be installed to (requires 10 GiB):</source>
<translation>Файлы будут установлены в (требуется 10 ГиБ):</translation>
<translation type="vanished">Файлы будут установлены в (требуется 10 ГиБ):</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="100"/>
<source>c:\</source>
<translation>C:\</translation>
<translation type="vanished">C:\</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="107"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="114"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="117"/>
<location filename="../ui/migratedialog.ui" line="124"/>
<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="123"/>
<location filename="../ui/migratedialog.ui" line="130"/>
<source>64 bit (recommended)</source>
<translation>64-битный (рекомендуемый)</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="133"/>
<location filename="../ui/migratedialog.ui" line="140"/>
<source>32 bit</source>
<translation>32-битный</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="161"/>
<location filename="../ui/migratedialog.ui" line="168"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/migratedialog.ui" line="168"/>
<location filename="../ui/migratedialog.ui" line="175"/>
<source>Quit</source>
<translation>Выход</translation>
</message>
@ -645,17 +687,17 @@ Just press Continue button and follow the different steps until everything is do
<context>
<name>OperationDialog</name>
<message>
<location filename="../ui/operationdialog.ui" line="35"/>
<location filename="../ui/operationdialog.ui" line="29"/>
<source>Ryzom Installer</source>
<translation>Инсталлятор Ryzom</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="41"/>
<location filename="../ui/operationdialog.ui" line="35"/>
<source>Operation</source>
<translation>Действие</translation>
</message>
<message>
<location filename="../ui/operationdialog.ui" line="48"/>
<location filename="../ui/operationdialog.ui" line="42"/>
<source>Operation progress</source>
<translation>Ход выполнения действия</translation>
</message>
@ -688,9 +730,8 @@ Just press Continue button and follow the different steps until everything is do
<translation>Профиль:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="79"/>
<source>0</source>
<translation>0</translation>
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
@ -703,72 +744,70 @@ Just press Continue button and follow the different steps until everything is do
<translation>Сервер:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="104"/>
<location filename="../ui/profilesdialog.ui" line="107"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="109"/>
<location filename="../ui/profilesdialog.ui" line="112"/>
<source>Yubo</source>
<translation></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="117"/>
<location filename="../ui/profilesdialog.ui" line="120"/>
<source>Executable:</source>
<translation>Исполняемый файл:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="126"/>
<source>ryzom_client_r.exe</source>
<translation>ryzom_client_r.exe</translation>
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="133"/>
<location filename="../ui/profilesdialog.ui" line="136"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="140"/>
<location filename="../ui/profilesdialog.ui" line="143"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="149"/>
<location filename="../ui/profilesdialog.ui" line="152"/>
<source>Arguments:</source>
<translation>Аргументы:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="159"/>
<location filename="../ui/profilesdialog.ui" line="162"/>
<source>Comments:</source>
<translation>Комментарии:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="176"/>
<location filename="../ui/profilesdialog.ui" line="179"/>
<source>Directory:</source>
<translation>Директория:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="185"/>
<source>~/.ryzom/0</source>
<translation>~/.ryzom/0</translation>
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="192"/>
<location filename="../ui/profilesdialog.ui" line="195"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="201"/>
<location filename="../ui/profilesdialog.ui" line="204"/>
<source>Create shortcuts:</source>
<translation>Создать ярлыки:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="210"/>
<location filename="../ui/profilesdialog.ui" line="213"/>
<source>Desktop</source>
<translation>Рабочий стол</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="217"/>
<location filename="../ui/profilesdialog.ui" line="220"/>
<source>Start Menu</source>
<translation>меню Пуск</translation>
</message>
@ -950,14 +989,12 @@ Just press Continue button and follow the different steps until everything is do
<translation>Местоположение исходных файлов Ryzom:</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="64"/>
<source>D:\Ryzom</source>
<translation>D:\Ryzom</translation>
<translation type="vanished">D:\Ryzom</translation>
</message>
<message>
<location filename="../ui/settingsdialog.ui" line="71"/>
<source>E:\Ryzom</source>
<translation>E:\Ryzom</translation>
<translation type="vanished">E:\Ryzom</translation>
</message>
</context>
<context>

View file

@ -100,7 +100,7 @@ Just follow the different steps and make your choice between the options presen
<item>
<widget class="QRadioButton" name="oldDirectoryRadioButton">
<property name="text">
<string>Old installation: %1</string>
<string notr="true">Old installation: %1</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
@ -115,7 +115,7 @@ Just follow the different steps and make your choice between the options presen
<item>
<widget class="QRadioButton" name="anotherLocationRadioButton">
<property name="text">
<string>Another location: %1</string>
<string notr="true">Another location: %1</string>
</property>
<property name="autoExclusive">
<bool>true</bool>
@ -134,7 +134,7 @@ Just follow the different steps and make your choice between the options presen
<item>
<widget class="QRadioButton" name="internetRadioButton">
<property name="text">
<string>Internet (%1 to download)</string>
<string notr="true">Internet (%1 to download)</string>
</property>
</widget>
</item>
@ -144,13 +144,20 @@ Just follow the different steps and make your choice between the options presen
<item>
<widget class="QGroupBox" name="destinationGroupBox">
<property name="title">
<string>Files will be installed to (requires 10 GiB):</string>
<string notr="true">Files will be installed to (requires %1):</string>
</property>
<layout class="QHBoxLayout" name="destinationLayout" stretch="1,0">
<layout class="QHBoxLayout" name="destinationLayout" stretch="1,0,0">
<item>
<widget class="QLabel" name="destinationLabel">
<property name="text">
<string>c:\</string>
<string notr="true">c:\</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="destinationDefaultButton">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
@ -206,10 +213,12 @@ Just follow the different steps and make your choice between the options presen
</layout>
</widget>
<tabstops>
<tabstop>advancedCheckBox</tabstop>
<tabstop>oldDirectoryRadioButton</tabstop>
<tabstop>anotherLocationRadioButton</tabstop>
<tabstop>anotherLocationBrowseButton</tabstop>
<tabstop>internetRadioButton</tabstop>
<tabstop>destinationDefaultButton</tabstop>
<tabstop>destinationBrowseButton</tabstop>
<tabstop>clientArch64RadioButton</tabstop>
<tabstop>clientArch32RadioButton</tabstop>

View file

@ -45,7 +45,7 @@
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
@ -78,6 +78,9 @@ p, li { white-space: pre-wrap; }
</property>
<item>
<widget class="QComboBox" name="profilesComboBox">
<property name="currentText">
<string notr="true">Atys</string>
</property>
<item>
<property name="text">
<string>Atys</string>

View file

@ -91,13 +91,20 @@ Just press Continue button and follow the different steps until everything is do
<item>
<widget class="QGroupBox" name="destinationGroupBox">
<property name="title">
<string>Files will be installed to (requires 10 GiB):</string>
<string notr="true">Files will be installed to (requires %1):</string>
</property>
<layout class="QHBoxLayout" name="destinationLayout" stretch="1,0">
<layout class="QHBoxLayout" name="destinationLayout" stretch="1,0,0">
<item>
<widget class="QLabel" name="destinationLabel">
<property name="text">
<string>c:\</string>
<string notr="true">c:\</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="destinationDefaultButton">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
@ -174,9 +181,13 @@ Just press Continue button and follow the different steps until everything is do
</layout>
</widget>
<tabstops>
<tabstop>advancedCheckBox</tabstop>
<tabstop>destinationDefaultButton</tabstop>
<tabstop>destinationBrowseButton</tabstop>
<tabstop>clientArch64RadioButton</tabstop>
<tabstop>clientArch32RadioButton</tabstop>
<tabstop>continueButton</tabstop>
<tabstop>quitButton</tabstop>
</tabstops>
<resources/>
<connections/>

View file

@ -51,6 +51,9 @@
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="format">
<string notr="true">%p%</string>
</property>
</widget>
</item>
<item>

View file

@ -76,7 +76,7 @@
<item row="0" column="1">
<widget class="QLabel" name="profileIdLabel">
<property name="text">
<string>0</string>
<string notr="true">0</string>
</property>
</widget>
</item>
@ -99,6 +99,9 @@
</item>
<item row="2" column="1">
<widget class="QComboBox" name="serverComboBox">
<property name="currentText">
<string notr="true">Atys</string>
</property>
<item>
<property name="text">
<string>Atys</string>
@ -123,7 +126,7 @@
<item>
<widget class="QLabel" name="executablePathLabel">
<property name="text">
<string>ryzom_client_r.exe</string>
<string notr="true">ryzom_client_r.exe</string>
</property>
</widget>
</item>
@ -182,7 +185,7 @@
<item>
<widget class="QLabel" name="directoryPathLabel">
<property name="text">
<string>~/.ryzom/0</string>
<string notr="true">~/.ryzom/0</string>
</property>
</widget>
</item>

View file

@ -61,14 +61,14 @@
<item row="1" column="1">
<widget class="QLabel" name="installationDirectoryLabel">
<property name="text">
<string>D:\Ryzom</string>
<string notr="true">D:\Ryzom</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="oldDirectoryLabel">
<property name="text">
<string>E:\Ryzom</string>
<string notr="true">E:\Ryzom</string>
</property>
</widget>
</item>