Changeset 76212 in vbox

Timestamp:

Dec 13, 2018 3:17:23 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Separate NLS context for every QITreeWidgetItem sub-class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• hostnetwork/UIHostNetworkManager.cpp (modified) (2 diffs)
• medium/UIMediumItem.cpp (modified) (7 diffs)
• settings/global/UIGlobalSettingsLanguage.cpp (modified) (3 diffs)
• settings/global/UIGlobalSettingsNetwork.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsSF.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (1 diff)
• snapshots/UISnapshotPane.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -96 +96 @@
     setText(Column_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() :
                          QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strPrefixLength6.toInt()));
-    setText(Column_DHCP, UIHostNetworkManager::tr("Enable", "DHCP Server"));
+    setText(Column_DHCP, tr("Enable", "DHCP Server"));
     setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);
 
@@ -106 +106 @@
 
     /* Interface information: */
-    strToolTip += strHeader.arg(UIHostNetworkManager::tr("Adapter"))
+    strToolTip += strHeader.arg(tr("Adapter"))
                            .arg(m_interface.m_fDHCPEnabled ?
-                                UIHostNetworkManager::tr("Automatically configured", "interface") :
-                                UIHostNetworkManager::tr("Manually configured", "interface"));
-    strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Address"))
+                                tr("Automatically configured", "interface") :
+                                tr("Manually configured", "interface"));
+    strToolTip += strSubHeader.arg(tr("IPv4 Address"))
                               .arg(m_interface.m_strAddress.isEmpty() ?
-                                   UIHostNetworkManager::tr ("Not set", "address") :
+                                   tr ("Not set", "address") :
                                    m_interface.m_strAddress) +
-                  strSubHeader.arg(UIHostNetworkManager::tr("IPv4 Network Mask"))
+                  strSubHeader.arg(tr("IPv4 Network Mask"))
                               .arg(m_interface.m_strMask.isEmpty() ?
-                                   UIHostNetworkManager::tr ("Not set", "mask") :
+                                   tr ("Not set", "mask") :
                                    m_interface.m_strMask);
     if (m_interface.m_fSupportedIPv6)
     {
-        strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Address"))
+        strToolTip += strSubHeader.arg(tr("IPv6 Address"))
                                   .arg(m_interface.m_strAddress6.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "address") :
+                                       tr("Not set", "address") :
                                        m_interface.m_strAddress6) +
-                      strSubHeader.arg(UIHostNetworkManager::tr("IPv6 Prefix Length"))
+                      strSubHeader.arg(tr("IPv6 Prefix Length"))
                                   .arg(m_interface.m_strPrefixLength6.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "length") :
+                                       tr("Not set", "length") :
                                        m_interface.m_strPrefixLength6);
     }
 
     /* DHCP server information: */
-    strToolTip += strHeader.arg(UIHostNetworkManager::tr("DHCP Server"))
+    strToolTip += strHeader.arg(tr("DHCP Server"))
                            .arg(m_dhcpserver.m_fEnabled ?
-                                UIHostNetworkManager::tr("Enabled", "server") :
-                                UIHostNetworkManager::tr("Disabled", "server"));
+                                tr("Enabled", "server") :
+                                tr("Disabled", "server"));
     if (m_dhcpserver.m_fEnabled)
     {
-        strToolTip += strSubHeader.arg(UIHostNetworkManager::tr("Address"))
+        strToolTip += strSubHeader.arg(tr("Address"))
                                   .arg(m_dhcpserver.m_strAddress.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "address") :
+                                       tr("Not set", "address") :
                                        m_dhcpserver.m_strAddress) +
-                      strSubHeader.arg(UIHostNetworkManager::tr("Network Mask"))
+                      strSubHeader.arg(tr("Network Mask"))
                                   .arg(m_dhcpserver.m_strMask.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "mask") :
+                                       tr("Not set", "mask") :
                                        m_dhcpserver.m_strMask) +
-                      strSubHeader.arg(UIHostNetworkManager::tr("Lower Bound"))
+                      strSubHeader.arg(tr("Lower Bound"))
                                   .arg(m_dhcpserver.m_strLowerAddress.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "bound") :
+                                       tr("Not set", "bound") :
                                        m_dhcpserver.m_strLowerAddress) +
-                      strSubHeader.arg(UIHostNetworkManager::tr("Upper Bound"))
+                      strSubHeader.arg(tr("Upper Bound"))
                                   .arg(m_dhcpserver.m_strUpperAddress.isEmpty() ?
-                                       UIHostNetworkManager::tr("Not set", "bound") :
+                                       tr("Not set", "bound") :
                                        m_dhcpserver.m_strUpperAddress);
     }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

@@ -71 +71 @@
     /* Open file-save dialog to choose location for current medium: */
     const QString strFileName = QIFileDialog::getSaveFileName(location(),
-                                                              QApplication::translate("UIMediumManager", "Current extension (*.%1)")
-                                                              .arg(QFileInfo(location()).suffix()),
+                                                              tr("Current extension (*.%1)")
+                                                                 .arg(QFileInfo(location()).suffix()),
                                                               treeWidget(),
-                                                              QApplication::translate("UIMediumManager", "Choose the location of this medium"),
-                                                              0, true, true);
+                                                              tr("Choose the location of this medium"),
+                                                                 0, true, true);
     /* Negative if nothing changed: */
     if (strFileName.isNull())
@@ -101 +101 @@
         {
             /* Show move storage progress: */
-            msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIMediumManager", "Moving medium..."),
+            msgCenter().showModalProgressDialog(comProgress, tr("Moving medium..."),
                                                 ":/progress_media_move_90px.png", treeWidget());
 
@@ -182 +182 @@
 QString UIMediumItem::defaultText() const
 {
-    return QApplication::translate("UIMediumManager", "%1, %2: %3, %4: %5", "col.1 text, col.2 name: col.2 text, col.3 name: col.3 text")
-                               .arg(text(0))
-                               .arg(parentTree()->headerItem()->text(1)).arg(text(1))
-                               .arg(parentTree()->headerItem()->text(2)).arg(text(2));
+    return tr("%1, %2: %3, %4: %5", "col.1 text, col.2 name: col.2 text, col.3 name: col.3 text")
+              .arg(text(0))
+              .arg(parentTree()->headerItem()->text(1)).arg(text(1))
+              .arg(parentTree()->headerItem()->text(2)).arg(text(2));
 }
 
@@ -217 +217 @@
         case UIMediumDeviceType_HardDisk:
         {
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "Format:");
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "Storage details:");
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "Attached to:");
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "Encrypted with key:");
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "UUID:");
+            m_details.m_aLabels << tr("Format:");
+            m_details.m_aLabels << tr("Storage details:");
+            m_details.m_aLabels << tr("Attached to:");
+            m_details.m_aLabels << tr("Encrypted with key:");
+            m_details.m_aLabels << tr("UUID:");
 
             m_details.m_aFields << hardDiskFormat();
             m_details.m_aFields << details();
             m_details.m_aFields << (usage().isNull() ?
-                                    formatFieldText(QApplication::translate("UIMediumManager", "<i>Not&nbsp;Attached</i>"), false) :
+                                    formatFieldText(tr("<i>Not&nbsp;Attached</i>"), false) :
                                     formatFieldText(usage()));
             m_details.m_aFields << (encryptionPasswordID().isNull() ?
-                                    formatFieldText(QApplication::translate("UIMediumManager", "<i>Not&nbsp;Encrypted</i>"), false) :
+                                    formatFieldText(tr("<i>Not&nbsp;Encrypted</i>"), false) :
                                     formatFieldText(encryptionPasswordID()));
             m_details.m_aFields << id().toString();
@@ -238 +238 @@
         case UIMediumDeviceType_Floppy:
         {
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "Attached to:");
-            m_details.m_aLabels << QApplication::translate("UIMediumManager", "UUID:");
+            m_details.m_aLabels << tr("Attached to:");
+            m_details.m_aLabels << tr("UUID:");
 
             m_details.m_aFields << (usage().isNull() ?
-                                    formatFieldText(QApplication::translate("UIMediumManager", "<i>Not&nbsp;Attached</i>"), false) :
+                                    formatFieldText(tr("<i>Not&nbsp;Attached</i>"), false) :
                                     formatFieldText(usage()));
             m_details.m_aFields << id().toString();
@@ -290 +290 @@
     QString strInfo = QString("<nobr>%1%2%3</nobr>")
                               .arg(fCompact ? strCompactString : "")
-                              .arg(strText.isEmpty() ? QApplication::translate("UIMediumManager", "--", "no info") : strText)
+                              .arg(strText.isEmpty() ? tr("--", "no info") : strText)
                               .arg(fCompact ? "</compact>" : "");
     return strInfo;
@@ -414 +414 @@
         }
         /* Show delete storage progress: */
-        msgCenter().showModalProgressDialog(progress, QApplication::translate("UIMediumManager", "Removing medium..."),
+        msgCenter().showModalProgressDialog(progress, UIMediumItem::tr("Removing medium..."),
                                             ":/progress_media_delete_90px.png", treeWidget());
         if (!progress.isOk() || progress.GetResultCode() != 0)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -114 +114 @@
         else
         {
-            strItemName += UIGlobalSettingsLanguage::tr(" (built-in)", "Language");
-            strLanguageName += UIGlobalSettingsLanguage::tr(" (built-in)", "Language");
+            strItemName += tr(" (built-in)", "Language");
+            strLanguageName += tr(" (built-in)", "Language");
         }
 
@@ -141 +141 @@
         setText(0, QString("<%1>").arg(strId));
         setText(1, strId);
-        setText(2, UIGlobalSettingsLanguage::tr("<unavailable>", "Language"));
-        setText(3, UIGlobalSettingsLanguage::tr("<unknown>", "Author(s)"));
+        setText(2, tr("<unavailable>", "Language"));
+        setText(3, tr("<unknown>", "Author(s)"));
 
         /* Invalid language appears in italic: */
@@ -155 +155 @@
         : QITreeWidgetItem(pParent), m_fBuiltIn(false)
     {
-        setText(0, UIGlobalSettingsLanguage::tr("Default", "Language"));
+        setText(0, tr("Default", "Language"));
         setText(1, QString::null);
         /* Empty strings of some reasonable length to prevent the info part

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -125 +125 @@
         /* Just use the old one: */
         setText(1, m_strName);
-        strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Network Name"), m_strName);
+        strToolTip += strHeader.arg(tr("Network Name"), m_strName);
     }
     /* If name was changed: */
@@ -132 +132 @@
         /* We should explain that: */
         const QString oldName = m_strName;
-        const QString newName = m_strNewName.isEmpty() ? UIGlobalSettingsNetwork::tr("[empty]") : m_strNewName;
-        setText(1, UIGlobalSettingsNetwork::tr("%1 (renamed from %2)").arg(newName, oldName));
-        strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Old Network Name"), m_strName);
-        strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("New Network Name"), m_strNewName);
+        const QString newName = m_strNewName.isEmpty() ? tr("[empty]") : m_strNewName;
+        setText(1, tr("%1 (renamed from %2)").arg(newName, oldName));
+        strToolTip += strHeader.arg(tr("Old Network Name"), m_strName);
+        strToolTip += strHeader.arg(tr("New Network Name"), m_strNewName);
     }
 
     /* Other tool-tip information: */
-    strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Network CIDR"), m_strCIDR);
-    strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Supports DHCP"),
-                                m_fSupportsDHCP ? UIGlobalSettingsNetwork::tr("yes") : UIGlobalSettingsNetwork::tr("no"));
-    strToolTip += strHeader.arg(UIGlobalSettingsNetwork::tr("Supports IPv6"),
-                                m_fSupportsIPv6 ? UIGlobalSettingsNetwork::tr("yes") : UIGlobalSettingsNetwork::tr("no"));
+    strToolTip += strHeader.arg(tr("Network CIDR"), m_strCIDR);
+    strToolTip += strHeader.arg(tr("Supports DHCP"),
+                                m_fSupportsDHCP ? tr("yes") : tr("no"));
+    strToolTip += strHeader.arg(tr("Supports IPv6"),
+                                m_fSupportsIPv6 ? tr("yes") : tr("no"));
     if (m_fSupportsIPv6 && m_fAdvertiseDefaultIPv6Route)
-        strToolTip += strSubHeader.arg(UIGlobalSettingsNetwork::tr("Default IPv6 route"), UIGlobalSettingsNetwork::tr("yes"));
+        strToolTip += strSubHeader.arg(tr("Default IPv6 route"), tr("yes"));
 
     /* Assign tool-tip finally: */
@@ -167 +167 @@
     {
         /* Emptiness validation: */
-        message.second << UIGlobalSettingsNetwork::tr("No new name specified for the NAT network previously called <b>%1</b>.").arg(m_strName);
+        message.second << tr("No new name specified for the NAT network previously called <b>%1</b>.").arg(m_strName);
         fNameValid = false;
         fPass = false;
@@ -177 +177 @@
         /* Emptiness validation: */
         if (fNameValid)
-            message.second << UIGlobalSettingsNetwork::tr("No CIDR specified for the NAT network <b>%1</b>.").arg(m_strNewName);
+            message.second << tr("No CIDR specified for the NAT network <b>%1</b>.").arg(m_strNewName);
         else
-            message.second << UIGlobalSettingsNetwork::tr("No CIDR specified for the NAT network previously called <b>%1</b>.").arg(m_strName);
+            message.second << tr("No CIDR specified for the NAT network previously called <b>%1</b>.").arg(m_strName);
         fPass = false;
     }
@@ -190 +190 @@
         {
             if (fNameValid)
-                message.second << UIGlobalSettingsNetwork::tr("Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.")
+                message.second << tr("Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.")
                                                               .arg(m_strCIDR, m_strNewName);
             else
-                message.second << UIGlobalSettingsNetwork::tr("Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.")
+                message.second << tr("Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.")
                                                               .arg(m_strCIDR, m_strName);
             fPass = false;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -168 +168 @@
             m_fields << m_strName
                      << m_strPath
-                     << (m_fWritable ? UIMachineSettingsSF::tr("Full") : UIMachineSettingsSF::tr("Read-only"))
-                     << (m_fAutoMount ? UIMachineSettingsSF::tr("Yes") : "")
+                     << (m_fWritable ? tr("Full") : tr("Read-only"))
+                     << (m_fAutoMount ? tr("Yes") : "")
                      << m_strAutoMountPoint;
 
@@ -189 +189 @@
     {
         return parentItem()
-             ? UIMachineSettingsSF::tr("%1, %2: %3, %4: %5, %6: %7, %8: %9",
+             ? tr("%1, %2: %3, %4: %5, %6: %7, %8: %9",
                   "col.1 text, col.2 name: col.2 text, col.3 name: col.3 text, col.4 name: col.4 text, col.5 name: col.5 text")
                   .arg(text(0))

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -294 +294 @@
         const QString strVendorId = m_strVendorId;
         if (!strVendorId.isEmpty())
-            strToolTip += UIMachineSettingsUSB::tr("<nobr>Vendor ID: %1</nobr>", "USB filter tooltip").arg(strVendorId);
+            strToolTip += tr("<nobr>Vendor ID: %1</nobr>", "USB filter tooltip").arg(strVendorId);
 
         const QString strProductId = m_strProductId;
         if (!strProductId.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Product ID: %2</nobr>", "USB filter tooltip").arg(strProductId);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product ID: %2</nobr>", "USB filter tooltip").arg(strProductId);
 
         const QString strRevision = m_strRevision;
         if (!strRevision.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Revision: %3</nobr>", "USB filter tooltip").arg(strRevision);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Revision: %3</nobr>", "USB filter tooltip").arg(strRevision);
 
         const QString strProduct = m_strProduct;
         if (!strProduct.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Product: %4</nobr>", "USB filter tooltip").arg(strProduct);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Product: %4</nobr>", "USB filter tooltip").arg(strProduct);
 
         const QString strManufacturer = m_strManufacturer;
         if (!strManufacturer.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Manufacturer: %5</nobr>", "USB filter tooltip").arg(strManufacturer);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Manufacturer: %5</nobr>", "USB filter tooltip").arg(strManufacturer);
 
         const QString strSerial = m_strSerialNumber;
         if (!strSerial.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Serial No.: %1</nobr>", "USB filter tooltip").arg(strSerial);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Serial No.: %1</nobr>", "USB filter tooltip").arg(strSerial);
 
         const QString strPort = m_strPort;
         if (!strPort.isEmpty())
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>Port: %1</nobr>", "USB filter tooltip").arg(strPort);
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>Port: %1</nobr>", "USB filter tooltip").arg(strPort);
 
         /* Add the state field if it's a host USB device: */
         if (m_fHostUSBDevice)
         {
-            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + UIMachineSettingsUSB::tr("<nobr>State: %1</nobr>", "USB filter tooltip")
-                                                              .arg(gpConverter->toString(m_enmHostUSBDeviceState));
+            strToolTip += strToolTip.isEmpty() ? "":"<br/>" + tr("<nobr>State: %1</nobr>", "USB filter tooltip")
+                                                                 .arg(gpConverter->toString(m_enmHostUSBDeviceState));
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -279 +279 @@
         m_fCurrentStateModified = m_comMachine.GetCurrentStateModified();
         m_strName = m_fCurrentStateModified
-                  ? UISnapshotPane::tr("Current State (changed)", "Current State (Modified)")
-                  : UISnapshotPane::tr("Current State", "Current State (Unmodified)");
+                  ? tr("Current State (changed)", "Current State (Modified)")
+                  : tr("Current State", "Current State (Unmodified)");
         setText(Column_Name, m_strName);
         m_strDescription = m_fCurrentStateModified
-                         ? UISnapshotPane::tr("The current state differs from the state stored in the current snapshot")
+                         ? tr("The current state differs from the state stored in the current snapshot")
                          : QTreeWidgetItem::parent() != 0
-                         ? UISnapshotPane::tr("The current state is identical to the state stored in the current snapshot")
+                         ? tr("The current state is identical to the state stored in the current snapshot")
                          : QString();
     }
@@ -349 +349 @@
     else if (then.secsTo(now) > 60 * 60 * 24)
     {
-        strAge = UISnapshotPane::tr("%1 (%2 ago)", "date time (how long ago)")
-                 .arg(then.toString(Qt::LocalDate), VBoxGlobal::daysToString(then.secsTo(now) / 60 / 60 / 24));
+        strAge = tr("%1 (%2 ago)", "date time (how long ago)")
+                    .arg(then.toString(Qt::LocalDate), VBoxGlobal::daysToString(then.secsTo(now) / 60 / 60 / 24));
         enmAgeFormat = SnapshotAgeFormat_InDays;
     }
     else if (then.secsTo(now) > 60 * 60)
     {
-        strAge = UISnapshotPane::tr("%1 (%2 ago)", "date time (how long ago)")
-                 .arg(then.toString(Qt::LocalDate), VBoxGlobal::hoursToString(then.secsTo(now) / 60 / 60));
+        strAge = tr("%1 (%2 ago)", "date time (how long ago)")
+                    .arg(then.toString(Qt::LocalDate), VBoxGlobal::hoursToString(then.secsTo(now) / 60 / 60));
         enmAgeFormat = SnapshotAgeFormat_InHours;
     }
     else if (then.secsTo(now) > 60)
     {
-        strAge = UISnapshotPane::tr("%1 (%2 ago)", "date time (how long ago)")
-                 .arg(then.toString(Qt::LocalDate), VBoxGlobal::minutesToString(then.secsTo(now) / 60));
+        strAge = tr("%1 (%2 ago)", "date time (how long ago)")
+                    .arg(then.toString(Qt::LocalDate), VBoxGlobal::minutesToString(then.secsTo(now) / 60));
         enmAgeFormat = SnapshotAgeFormat_InMinutes;
     }
     else
     {
-        strAge = UISnapshotPane::tr("%1 (%2 ago)", "date time (how long ago)")
-                 .arg(then.toString(Qt::LocalDate), VBoxGlobal::secondsToString(then.secsTo(now)));
+        strAge = tr("%1 (%2 ago)", "date time (how long ago)")
+                    .arg(then.toString(Qt::LocalDate), VBoxGlobal::secondsToString(then.secsTo(now)));
         enmAgeFormat = SnapshotAgeFormat_InSeconds;
     }
@@ -396 +396 @@
     if (m_fCurrentStateItem)
     {
-        strDateTime = UISnapshotPane::tr("%1 since %2", "Current State (time or date + time)")
-                      .arg(gpConverter->toString(m_enmMachineState)).arg(strDateTime);
+        strDateTime = tr("%1 since %2", "Current State (time or date + time)")
+                         .arg(gpConverter->toString(m_enmMachineState)).arg(strDateTime);
     }
     /* For snapshot item: */
@@ -405 +405 @@
         QStringList details;
         if (isCurrentSnapshotItem())
-            details << UISnapshotPane::tr("current", "snapshot");
-        details << (m_fOnline ? UISnapshotPane::tr("online", "snapshot")
-                              : UISnapshotPane::tr("offline", "snapshot"));
+            details << tr("current", "snapshot");
+        details << (m_fOnline ? tr("online", "snapshot")
+                              : tr("offline", "snapshot"));
         strDetails = QString(" (%1)").arg(details.join(", "));
 
         /* Add date/time information: */
         if (fDateTimeToday)
-            strDateTime = UISnapshotPane::tr("Taken at %1", "Snapshot (time)").arg(strDateTime);
+            strDateTime = tr("Taken at %1", "Snapshot (time)").arg(strDateTime);
         else
-            strDateTime = UISnapshotPane::tr("Taken on %1", "Snapshot (date + time)").arg(strDateTime);
+            strDateTime = tr("Taken on %1", "Snapshot (date + time)").arg(strDateTime);
     }