Changeset 96430 in vbox

Timestamp:

Aug 23, 2022 8:37:08 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: A bunch of NLS fixes across the GUI #3; Preparing for BETA NLS update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (1 diff)
• globals/UIErrorString.cpp (modified) (6 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1212 +1212 @@
         arg(QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss"));
     QString strFileName = QIFileDialog::getSaveFileName(strStartFileName,"",this,
-                                                        QString("%1 \"%2\"")
-                                                        .arg(QApplication::translate("UIVMInformationDialog", "Export activity data of the machine"))
-                                                        .arg(m_comMachine.GetName()));
+                                                        QApplication::translate("UIVMInformationDialog",
+                                                                                "Export activity data of the machine \"%1\"")
+                                                                                .arg(m_comMachine.GetName()));
     QFile dataFile(strFileName);
     if (dataFile.open(QFile::WriteOnly | QFile::Truncate))

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIErrorString.cpp

@@ -108 +108 @@
                    "<tr><td>%2</td><td><tt>%3</tt></td></tr></table>")
                    .arg(QApplication::palette().color(QPalette::Active, QPalette::Window).name(QColor::HexRgb))
-                   .arg(QApplication::translate("UIErrorString", "Result&nbsp;Code: ", "error info"))
+                   .arg(QApplication::translate("UIErrorString", "Result&nbsp;Code:", "error info"))
                    .arg(formatRCFull(comProgress.GetResultCode()))
                    .prepend("<!--EOM-->") /* move to details */;
@@ -192 +192 @@
         {
             strFormatted += QString("<tr><td>%1</td><td><tt>%2</tt></td></tr>")
-                .arg(QApplication::translate("UIErrorString", "Result&nbsp;Code: ", "error info"))
+                .arg(QApplication::translate("UIErrorString", "Result&nbsp;Code:", "error info"))
                 .arg(formatRCFull(comInfo.resultCode()));
         }
@@ -198 +198 @@
         if (fHaveComponent)
             strFormatted += QString("<tr><td>%1</td><td>%2</td></tr>")
-                .arg(QApplication::translate("UIErrorString", "Component: ", "error info"), comInfo.component());
+                .arg(QApplication::translate("UIErrorString", "Component:", "error info"), comInfo.component());
 
         if (fHaveInterfaceID)
@@ -206 +206 @@
                 s = comInfo.interfaceName() + ' ' + s;
             strFormatted += QString("<tr><td>%1</td><td>%2</td></tr>")
-                .arg(QApplication::translate("UIErrorString", "Interface: ", "error info"), s);
+                .arg(QApplication::translate("UIErrorString", "Interface:", "error info"), s);
         }
 
@@ -215 +215 @@
                 s = comInfo.calleeName() + ' ' + s;
             strFormatted += QString("<tr><td>%1</td><td>%2</td></tr>")
-                .arg(QApplication::translate("UIErrorString", "Callee: ", "error info"), s);
+                .arg(QApplication::translate("UIErrorString", "Callee:", "error info"), s);
         }
     }
@@ -223 +223 @@
     {
         strFormatted += QString("<tr><td>%1</td><td><tt>%2</tt></td></tr>")
-            .arg(QApplication::translate("UIErrorString", "Callee&nbsp;RC: ", "error info"))
+            .arg(QApplication::translate("UIErrorString", "Callee&nbsp;RC:", "error info"))
             .arg(formatRCFull(wrapperRC));
     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1790 +1790 @@
                              "</table>")
                              .arg(QApplication::palette().color(QPalette::Active, QPalette::Window).name(QColor::HexRgb))
-                             .arg(tr("<nobr>Error ID: </nobr>", "runtime error info"), strErrorId)
-                             .arg(tr("Severity: ", "runtime error info"), severity);
+                             .arg(tr("<nobr>Error ID:</nobr>", "runtime error info"), strErrorId)
+                             .arg(tr("Severity:", "runtime error info"), severity);
     if (!formatted.isEmpty())
         formatted = "<qt>" + formatted + "</qt>";

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -2764 +2764 @@
 
         if (fileToDelete.remove(strFilePath))
-            sigStatusBarMessage(QString("%1 %2 %3").arg(UISoftKeyboard::tr("The file ")).arg(strFilePath).arg(UISoftKeyboard::tr(" has been deleted")));
+            sigStatusBarMessage(UISoftKeyboard::tr("The file %1 has been deleted").arg(strFilePath));
         else
-            sigStatusBarMessage(QString("%1 %2 %3").arg(UISoftKeyboard::tr("Deleting the file ")).arg(strFilePath).arg(UISoftKeyboard::tr(" has failed")));
+            sigStatusBarMessage(UISoftKeyboard::tr("Deleting the file %1 has failed").arg(strFilePath));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -546 +546 @@
         QString strType = uiCommon().vmGuestOSTypeDescription(pWizard->detectedOSTypeId());
         if (!pWizard->isUnattendedInstallSupported())
-            strMessage = QString("%1 %2. %3").arg(UIWizardNewVM::tr("Detected OS type: ")).arg(strType)
-                                                 .arg(UIWizardNewVM::tr("This OS type cannot be installed unattendedly. The install "
-                                                                        "needs to be started manually."));
+            strMessage = UIWizardNewVM::tr("Detected OS type: %1. %2")
+                                           .arg(strType)
+                                           .arg(UIWizardNewVM::tr("This OS type cannot be installed unattendedly. "
+                                                                  "The install needs to be started manually."));
         else if (pWizard->skipUnattendedInstall())
-            strMessage = UIWizardNewVM::tr("You have selected to skip unattended guest OS install, the guest OS will need to be installed manually.");
+            strMessage = UIWizardNewVM::tr("You have selected to skip unattended guest OS install, "
+                                           "the guest OS will need to be installed manually.");
         else
-            strMessage = QString("%1 %2. %3").arg(UIWizardNewVM::tr("Detected OS type: ")).arg(strType)
-                                                 .arg(UIWizardNewVM::tr("This OS type can be installed unattendedly. The install "
-                                                                        "will start after this wizard is closed."));
+            strMessage = UIWizardNewVM::tr("Detected OS type: %1. %2")
+                                           .arg(strType)
+                                           .arg(UIWizardNewVM::tr("This OS type can be installed unattendedly. "
+                                                                  "The install will start after this wizard is closed."));
     }