Changeset 105827 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 22, 2024 5:27:39 PM (7 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

164541

Message:

FE/Qt: A bit of similar NLS fixes around the GUI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UINetworkReply.cpp (modified) (3 diffs)
• widgets/UIApplianceEditorWidget.cpp (modified) (1 diff)
• widgets/graphics/UIGraphicsTextPane.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMSummaryPage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.cpp

@@ -241 +241 @@
 
 private:
-
-    /** Holds full error template in "Context description: Error description" form. */
-    QString m_strErrorTemplate;
 
     /** Holds the last cached error of the reply. */
@@ -760 +757 @@
     , m_pThread(0)
 {
-    /* Prepare full error template: */
-    m_strErrorTemplate = tr("%1: %2", "Context description: Error description");
-
     /* Create and run reply thread: */
     m_pThread = new UINetworkReplyPrivateThread(type, url, strTarget, requestHeaders);
@@ -787 +781 @@
     {
         case UINetworkReply::NoError:                     break;
-        case UINetworkReply::RemoteHostClosedError:       return m_strErrorTemplate.arg(m_pThread->context(), tr("Unable to initialize HTTP library"));
-        case UINetworkReply::UrlNotFoundError:            return m_strErrorTemplate.arg(m_pThread->context(), tr("Url not found on the server"));
-        case UINetworkReply::HostNotFoundError:           return m_strErrorTemplate.arg(m_pThread->context(), tr("Host not found"));
-        case UINetworkReply::ContentAccessDenied:         return m_strErrorTemplate.arg(m_pThread->context(), tr("Content access denied"));
-        case UINetworkReply::ProtocolFailure:             return m_strErrorTemplate.arg(m_pThread->context(), tr("Protocol failure"));
-        case UINetworkReply::ConnectionRefusedError:      return m_strErrorTemplate.arg(m_pThread->context(), tr("Connection refused"));
-        case UINetworkReply::SslHandshakeFailedError:     return m_strErrorTemplate.arg(m_pThread->context(), tr("SSL authentication failed"));
-        case UINetworkReply::AuthenticationRequiredError: return m_strErrorTemplate.arg(m_pThread->context(), tr("Wrong SSL certificate format"));
-        case UINetworkReply::ContentReSendError:          return m_strErrorTemplate.arg(m_pThread->context(), tr("Content moved"));
-        case UINetworkReply::ProxyNotFoundError:          return m_strErrorTemplate.arg(m_pThread->context(), tr("Proxy not found"));
-        default:                                          return m_strErrorTemplate.arg(m_pThread->context(), tr("Unknown reason"));
+        case UINetworkReply::RemoteHostClosedError:       return QString("%1: %2").arg(m_pThread->context(), tr("Unable to initialize HTTP library"));
+        case UINetworkReply::UrlNotFoundError:            return QString("%1: %2").arg(m_pThread->context(), tr("Url not found on the server"));
+        case UINetworkReply::HostNotFoundError:           return QString("%1: %2").arg(m_pThread->context(), tr("Host not found"));
+        case UINetworkReply::ContentAccessDenied:         return QString("%1: %2").arg(m_pThread->context(), tr("Content access denied"));
+        case UINetworkReply::ProtocolFailure:             return QString("%1: %2").arg(m_pThread->context(), tr("Protocol failure"));
+        case UINetworkReply::ConnectionRefusedError:      return QString("%1: %2").arg(m_pThread->context(), tr("Connection refused"));
+        case UINetworkReply::SslHandshakeFailedError:     return QString("%1: %2").arg(m_pThread->context(), tr("SSL authentication failed"));
+        case UINetworkReply::AuthenticationRequiredError: return QString("%1: %2").arg(m_pThread->context(), tr("Wrong SSL certificate format"));
+        case UINetworkReply::ContentReSendError:          return QString("%1: %2").arg(m_pThread->context(), tr("Content moved"));
+        case UINetworkReply::ProxyNotFoundError:          return QString("%1: %2").arg(m_pThread->context(), tr("Proxy not found"));
+        default:                                          return QString("%1: %2").arg(m_pThread->context(), tr("Unknown reason"));
     }
     /* Return null-string by default: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -288 +288 @@
     {
         case ApplianceModelItemType_VirtualSystem:
-            return tr("%1", "col.1 text")
-                     .arg(data(ApplianceViewSection_Description, Qt::DisplayRole).toString());
+            return data(ApplianceViewSection_Description, Qt::DisplayRole).toString();
         case ApplianceModelItemType_VirtualHardware:
-            return tr("%1: %2", "col.1 text: col.2 text")
-                     .arg(data(ApplianceViewSection_Description, Qt::DisplayRole).toString())
-                     .arg(data(ApplianceViewSection_ConfigValue, Qt::DisplayRole).toString());
+            return QString("%1: %2")
+                           .arg(data(ApplianceViewSection_Description, Qt::DisplayRole).toString())
+                           .arg(data(ApplianceViewSection_ConfigValue, Qt::DisplayRole).toString());
         default:
             break;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -99 +99 @@
         /* Return the description: */
         if (enmTextRole == QAccessible::Description)
-            return UIGraphicsTextPane::tr("%1: %2", "'key: value', like 'Name: MyVM'").arg(line()->string1(), line()->string2());
+            return QString("%1: %2").arg(line()->string1(), line()->string2());
 
         /* Null-string by default: */

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

@@ -181 +181 @@
 {
     return   m_data.isValid()
-           ? UIWizardNewVMSummaryPage::tr("%1: %2", "col.1 text: col.2 text").arg(m_strText, m_data.toString())
-           : UIWizardNewVMSummaryPage::tr("%1", "col.1 text").arg(m_strText);
+           ? QString("%1: %2").arg(m_strText, m_data.toString())
+           : m_strText;
 }