From 1b9c6bdd7d3594c7fe903e20ad153f5c89d9ae21 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 16 Sep 2016 18:58:33 +0200 Subject: [PATCH] Changed: Improved English texts (thanks to Cerulean!), see #279 --- .../tools/client/ryzom_installer/src/downloader.cpp | 6 +++--- .../client/ryzom_installer/src/installdialog.cpp | 4 ++-- .../client/ryzom_installer/src/migratedialog.cpp | 2 +- .../client/ryzom_installer/src/settingsdialog.cpp | 2 +- .../tools/client/ryzom_installer/ui/installdialog.ui | 12 ++++++------ .../tools/client/ryzom_installer/ui/migratedialog.ui | 6 +++--- .../client/ryzom_installer/ui/settingsdialog.ui | 2 +- .../client/ryzom_installer/ui/uninstalldialog.ui | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp index ba49a8842..713dc9b80 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/downloader.cpp @@ -153,7 +153,7 @@ void CDownloader::getFileHead() else { // or has wrong size - if (m_listener) m_listener->operationFail(tr("File (%1B) is larger than expected (%2B)").arg(m_offset).arg(m_size)); + if (m_listener) m_listener->operationFail(tr("File is larger (%1B) than expected (%2B)").arg(m_offset).arg(m_size)); } return; @@ -183,7 +183,7 @@ void CDownloader::downloadFile() if (freeSpace < m_size - m_offset) { // we have not enough free disk space to continue download - if (m_listener) m_listener->operationFail(tr("You only have %1 bytes left on device, but %2 bytes are required.").arg(freeSpace).arg(m_size - m_offset)); + if (m_listener) m_listener->operationFail(tr("You only have %1 bytes left on the device, but %2 bytes are needed.").arg(freeSpace).arg(m_size - m_offset)); return; } @@ -326,7 +326,7 @@ void CDownloader::onHeadFinished() // other status else { - if (m_listener) m_listener->operationFail(tr("Wrong status code: %1").arg(status)); + if (m_listener) m_listener->operationFail(tr("Incorrect status code: %1").arg(status)); return; } diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index baf9516f0..ca24277fd 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -98,7 +98,7 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked() for(;;) { - directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where is installed Ryzom")); + directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where Ryzom is currently installed.")); if (directory.isEmpty()) return; @@ -117,7 +117,7 @@ void CInstallDialog::onAnotherLocationBrowseButtonClicked() void CInstallDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); if (directory.isEmpty()) return; diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index b2941744c..5eb15eb4b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -91,7 +91,7 @@ void CMigrateDialog::onShowAdvancedParameters(int state) void CMigrateDialog::onDestinationBrowseButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in")); if (directory.isEmpty()) return; diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp index 53090b592..ec2ceb06f 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.cpp @@ -65,7 +65,7 @@ void CSettingsDialog::accept() void CSettingsDialog::onInstallationDirectoryButtonClicked() { - QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom"), m_installationDirectory); + QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory to install Ryzom in"), m_installationDirectory); if (directory.isEmpty()) return; diff --git a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui index b8f03b356..c0736c23c 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui @@ -28,9 +28,9 @@ Welcome to Ryzom Installer! -This program will allow you to download, install, configure or manage Ryzom on your computer. +This program will allow you to download, install, configure and manage Ryzom on your computer. -Just follow the different steps and make your choice between the different propositions. +Just follow the different steps and make your choice between the options presented. Qt::PlainText @@ -134,7 +134,7 @@ Just follow the different steps and make your choice between the different propo - Internet (%1 GiB to download) + Internet (%1 to download) @@ -167,13 +167,13 @@ Just follow the different steps and make your choice between the different propo - Do you prefer to use a 64 or 32 bits client? + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + 64 bit (recommended) true @@ -183,7 +183,7 @@ Just follow the different steps and make your choice between the different propo - 32 bits + 32 bit diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui index e63c8eeb3..e8d37007f 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui @@ -114,13 +114,13 @@ Just press Continue button and follow the different steps until everything is do - Do you prefer to use a 64 or 32 bits client? + Do you prefer to use a 64 or 32 bit client? - 64 bits (recommended) + 64 bit (recommended) true @@ -130,7 +130,7 @@ Just press Continue button and follow the different steps until everything is do - 32 bits + 32 bit diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui index 11f91f7d4..daa03a8f4 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui @@ -19,7 +19,7 @@ - Use 64 bits client + Use 64 bit client diff --git a/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui index 3a9570262..0b85f7a29 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui @@ -34,7 +34,7 @@ - You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (warning, it can't be reverted). + You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone). Qt::PlainText