Changed: Improved English texts (thanks to Cerulean!), see #279

--HG--
branch : develop

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;
 	}
 

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;
 

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;
 

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;
 

code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui

@@ -28,9 +28,9 @@
      <property name="text">
       <string>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.</string>
+Just follow the  different steps and make your choice between the options presented.</string>
      </property>
      <property name="textFormat">
       <enum>Qt::PlainText</enum>
@@ -134,7 +134,7 @@ Just follow the different steps and make your choice between the different propo
          <item>
           <widget class="QRadioButton" name="internetRadioButton">
            <property name="text">
-            <string>Internet (%1 GiB to download)</string>
+            <string>Internet (%1 to download)</string>
            </property>
           </widget>
          </item>
@@ -167,13 +167,13 @@ Just follow the different steps and make your choice between the different propo
       <item>
        <widget class="QGroupBox" name="clientArchGroupBox">
         <property name="title">
-         <string>Do you prefer to use a 64 or 32 bits client?</string>
+         <string>Do you prefer to use a 64 or 32 bit client?</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QRadioButton" name="clientArch64RadioButton">
            <property name="text">
-            <string>64 bits (recommended)</string>
+            <string>64 bit (recommended)</string>
            </property>
            <property name="checked">
             <bool>true</bool>
@@ -183,7 +183,7 @@ Just follow the different steps and make your choice between the different propo
          <item>
           <widget class="QRadioButton" name="clientArch32RadioButton">
            <property name="text">
-            <string>32 bits</string>
+            <string>32 bit</string>
            </property>
           </widget>
          </item>

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
       <item>
        <widget class="QGroupBox" name="clientArchGroupBox">
         <property name="title">
-         <string>Do you prefer to use a 64 or 32 bits client?</string>
+         <string>Do you prefer to use a 64 or 32 bit client?</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QRadioButton" name="clientArch64RadioButton">
            <property name="text">
-            <string>64 bits (recommended)</string>
+            <string>64 bit (recommended)</string>
            </property>
            <property name="checked">
             <bool>true</bool>
@@ -130,7 +130,7 @@ Just press Continue button and follow the different steps until everything is do
          <item>
           <widget class="QRadioButton" name="clientArch32RadioButton">
            <property name="text">
-            <string>32 bits</string>
+            <string>32 bit</string>
            </property>
           </widget>
          </item>

code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui

@@ -19,7 +19,7 @@
      <item row="3" column="0">
       <widget class="QCheckBox" name="use64bitsClientsCheckBox">
        <property name="text">
-        <string>Use 64 bits client</string>
+        <string>Use 64 bit client</string>
        </property>
       </widget>
      </item>

code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui

@@ -34,7 +34,7 @@
        <item>
         <widget class="QLabel" name="messageLabel">
          <property name="text">
-          <string>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).</string>
+          <string>You're about to uninstall some or all components of Ryzom. Please check each component you want to remove (Warning, it cannot be undone).</string>
          </property>
          <property name="textFormat">
           <enum>Qt::PlainText</enum>