Changeset 28020 in vbox for trunk/src

Timestamp:

Apr 6, 2010 7:31:59 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Change back the translation context to the old locations, so this stuff has not to be translated twice.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIActionsPool.cpp (modified) (37 diffs)
• UIIndicatorsPool.cpp (modified) (17 diffs)
• UIMachineLogic.cpp (modified) (8 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

@@ -174 +174 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&Machine"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&Machine"));
     }
 };
@@ -196 +196 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Fullscreen Mode"), "F"));
-        setStatusTip(UIActionsPool::tr("Switch to fullscreen mode"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Fullscreen Mode"), "F"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to fullscreen mode"));
     }
 };
@@ -219 +219 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Seam&less Mode"), "L"));
-        setStatusTip(UIActionsPool::tr("Switch to seamless desktop integration mode"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Seam&less Mode"), "L"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Switch to seamless desktop integration mode"));
     }
 };
@@ -242 +242 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Auto-resize &Guest Display"), "G"));
-        setStatusTip(UIActionsPool::tr("Automatically resize the guest display when the window is resized (requires Guest Additions)"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Auto-resize &Guest Display"), "G"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
     }
 };
@@ -264 +264 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Adjust Window Size"), "A"));
-        setStatusTip(UIActionsPool::tr("Adjust window size and position to best fit the guest display"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Adjust Window Size"), "A"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Adjust window size and position to best fit the guest display"));
     }
 };
@@ -308 +308 @@
         if (!isChecked())
         {
-            setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Disable &Mouse Integration"), "I"));
-            setStatusTip(UIActionsPool::tr("Temporarily disable host mouse pointer integration"));
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Disable &Mouse Integration"), "I"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Temporarily disable host mouse pointer integration"));
         }
         else
         {
-            setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Enable &Mouse Integration"), "I"));
-            setStatusTip(UIActionsPool::tr("Enable temporarily disabled host mouse pointer integration"));
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Enable &Mouse Integration"), "I"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Enable temporarily disabled host mouse pointer integration"));
         }
     }
@@ -336 +336 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Insert Ctrl-Alt-Del"), "Del"));
-        setStatusTip(UIActionsPool::tr("Send the Ctrl-Alt-Del sequence to the virtual machine"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Insert Ctrl-Alt-Del"), "Del"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Send the Ctrl-Alt-Del sequence to the virtual machine"));
     }
 };
@@ -359 +359 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Insert Ctrl-Alt-Backspace"), "Backspace"));
-        setStatusTip(UIActionsPool::tr("Send the Ctrl-Alt-Backspace sequence to the virtual machine"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Insert Ctrl-Alt-Backspace"), "Backspace"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Send the Ctrl-Alt-Backspace sequence to the virtual machine"));
     }
 };
@@ -382 +382 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Take &Snapshot..."), "S"));
-        setStatusTip(UIActionsPool::tr("Take a snapshot of the virtual machine"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Take &Snapshot..."), "S"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Take a snapshot of the virtual machine"));
     }
 };
@@ -404 +404 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("Session I&nformation Dialog"), "N"));
-        setStatusTip(UIActionsPool::tr("Show Session Information Dialog"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "Session I&nformation Dialog"), "N"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Show Session Information Dialog"));
     }
 };
@@ -428 +428 @@
         if (!isChecked())
         {
-            setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Pause"), "P"));
-            setStatusTip(UIActionsPool::tr("Suspend the execution of the virtual machine"));
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Pause"), "P"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Suspend the execution of the virtual machine"));
         }
         else
         {
-            setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("R&esume"), "P"));
-            setStatusTip(UIActionsPool::tr("Resume the execution of the virtual machine"));
+            setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "R&esume"), "P"));
+            setStatusTip(QApplication::translate("VBoxConsoleWnd", "Resume the execution of the virtual machine"));
         }
     }
@@ -456 +456 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Reset"), "R"));
-        setStatusTip(UIActionsPool::tr("Reset the virtual machine"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Reset"), "R"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Reset the virtual machine"));
     }
 };
@@ -480 +480 @@
 #ifdef Q_WS_MAC
         /* Host+H is Hide on the mac */
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("ACPI Sh&utdown"), "U"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "ACPI Sh&utdown"), "U"));
 #else /* Q_WS_MAC */
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("ACPI S&hutdown"), "H"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "ACPI S&hutdown"), "H"));
 #endif /* !Q_WS_MAC */
-        setStatusTip(UIActionsPool::tr("Send the ACPI Power Button press event to the virtual machine"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Send the ACPI Power Button press event to the virtual machine"));
     }
 };
@@ -506 +506 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Close..." ), "Q"));
-        setStatusTip(UIActionsPool::tr("Close the virtual machine"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Close..." ), "Q"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Close the virtual machine"));
     }
 };
@@ -527 +527 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&View"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&View"));
     }
 };
@@ -547 +547 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&Devices"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&Devices"));
     }
 };
@@ -568 +568 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&CD/DVD Devices"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&CD/DVD Devices"));
     }
 };
@@ -589 +589 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&Floppy Devices"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&Floppy Devices"));
     }
 };
@@ -610 +610 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("&USB Devices"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "&USB Devices"));
     }
 };
@@ -650 +650 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Network Adapters..."));
-        setStatusTip(UIActionsPool::tr("Change the settings of network adapters"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Network Adapters..."));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Change the settings of network adapters"));
     }
 };
@@ -691 +691 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Shared Folders..."));
-        setStatusTip(UIActionsPool::tr("Create or modify shared folders"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Shared Folders..."));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Create or modify shared folders"));
     }
 };
@@ -714 +714 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Remote Display"));
-        setStatusTip(UIActionsPool::tr("Enable or disable remote desktop (RDP) connections to this machine"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Remote Display"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Enable or disable remote desktop (RDP) connections to this machine"));
     }
 };
@@ -736 +736 @@
     void retranslateUi()
     {
-        setText(VBoxGlobal::insertKeyToActionText(UIActionsPool::tr("&Install Guest Additions..."), "D"));
-        setStatusTip(UIActionsPool::tr("Mount the Guest Additions installation image"));
+        setText(VBoxGlobal::insertKeyToActionText(QApplication::translate("VBoxConsoleWnd", "&Install Guest Additions..."), "D"));
+        setStatusTip(QApplication::translate("VBoxConsoleWnd", "Mount the Guest Additions installation image"));
     }
 };
@@ -758 +758 @@
     void retranslateUi()
     {
-        menu()->setTitle(UIActionsPool::tr("De&bug"));
+        menu()->setTitle(QApplication::translate("VBoxConsoleWnd", "De&bug"));
     }
 };
@@ -778 +778 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Statistics...", "debug action"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Statistics...", "debug action"));
     }
 };
@@ -798 +798 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Command Line...", "debug action"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Command Line...", "debug action"));
     }
 };
@@ -818 +818 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Logging...", "debug action"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Logging...", "debug action"));
     }
 };
@@ -839 +839 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Help"));
+        setText(QApplication::translate("VBoxConsoleWnd", "&Help"));
     }
 };
@@ -861 +861 @@
     {
         setShortcut(QKeySequence::HelpContents);
-        setText(UIActionsPool::tr("&Contents..."));
-        setStatusTip(UIActionsPool::tr("Show the online help contents"));
+        setText(QApplication::translate("VBoxProblemReporter", "&Contents..."));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Show the online help contents"));
     }
 };
@@ -883 +883 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&VirtualBox Web Site..."));
-        setStatusTip(UIActionsPool::tr("Open the browser and go to the VirtualBox product web site"));
+        setText(QApplication::translate("VBoxProblemReporter", "&VirtualBox Web Site..."));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Open the browser and go to the VirtualBox product web site"));
     }
 };
@@ -905 +905 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&Reset All Warnings"));
-        setStatusTip(UIActionsPool::tr("Go back to showing all suppressed warnings and messages"));
+        setText(QApplication::translate("VBoxProblemReporter", "&Reset All Warnings"));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Go back to showing all suppressed warnings and messages"));
     }
 };
@@ -930 +930 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("R&egister VirtualBox..."));
-        setStatusTip(UIActionsPool::tr("Open VirtualBox registration form"));
+        setText(QApplication::translate("VBoxProblemReporter", "R&egister VirtualBox..."));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Open VirtualBox registration form"));
     }
 };
@@ -954 +954 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("C&heck for Updates..."));
-        setStatusTip(UIActionsPool::tr("Check for a new VirtualBox version"));
+        setText(QApplication::translate("VBoxProblemReporter", "C&heck for Updates..."));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Check for a new VirtualBox version"));
     }
 };
@@ -977 +977 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("&About VirtualBox..."));
-        setStatusTip(UIActionsPool::tr("Show a dialog with product information"));
+        setText(QApplication::translate("VBoxProblemReporter", "&About VirtualBox..."));
+        setStatusTip(QApplication::translate("VBoxProblemReporter", "Show a dialog with product information"));
     }
 };
@@ -1016 +1016 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("Dock Icon"));
+        setText(QApplication::translate("VBoxConsoleWnd", "Dock Icon"));
     }
 };
@@ -1036 +1036 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("Show Monitor Preview"));
+        setText(QApplication::translate("VBoxConsoleWnd", "Show Monitor Preview"));
     }
 };
@@ -1056 +1056 @@
     void retranslateUi()
     {
-        setText(UIActionsPool::tr("Show Application Icon"));
+        setText(QApplication::translate("VBoxConsoleWnd", "Show Application Icon"));
     }
 };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -56 +56 @@
         const CMachine &machine = m_session.GetMachine();
 
-        QString strToolTip = tr("<p style='white-space:pre'><nobr>Indicates the activity "
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
                                 "of the virtual hard disks:</nobr>%1</p>", "HDD tooltip");
 
@@ -81 +81 @@
 
         if (!bAttachmentsPresent)
-            strFullData += tr("<br><nobr><b>No hard disks attached</b></nobr>", "HDD tooltip");
+            strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No hard disks attached</b></nobr>", "HDD tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
@@ -120 +120 @@
         const CMachine &machine = m_session.GetMachine();
 
-        QString strToolTip = tr("<p style='white-space:pre'><nobr>Indicates the activity "
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
                                 "of the CD/DVD devices:</nobr>%1</p>", "CD/DVD tooltip");
 
@@ -147 +147 @@
 
         if (strFullData.isNull())
-            strFullData = tr("<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
+            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No CD/DVD devices attached</b></nobr>", "CD/DVD tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
@@ -186 +186 @@
         const CMachine &machine = m_session.GetMachine();
 
-        QString tip = tr ("<p style='white-space:pre'><nobr>Indicates the activity "
+        QString tip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity "
                           "of the floppy devices:</nobr>%1</p>", "FD tooltip");
         QString data;
@@ -212 +212 @@
 
         if (data.isNull())
-            data = tr ("<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
+            data = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No floppy devices attached</b></nobr>", "FD tooltip");
 
         setToolTip (tip.arg (data));
@@ -258 +258 @@
         setState(uCount > 0 ? KDeviceActivity_Idle : KDeviceActivity_Null);
 
-        QString strToolTip = tr("<p style='white-space:pre'><nobr>Indicates the activity of the "
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity of the "
                                 "network interfaces:</nobr>%1</p>", "Network adapters tooltip");
         QString strFullData;
@@ -266 +266 @@
             CNetworkAdapter adapter = machine.GetNetworkAdapter(uSlot);
             if (adapter.GetEnabled())
-                strFullData += tr("<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>", "Network adapters tooltip")
+                strFullData += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr>", "Network adapters tooltip")
                     .arg(uSlot + 1)
                     .arg(vboxGlobal().toString(adapter.GetAttachmentType()))
                     .arg(adapter.GetCableConnected() ?
-                          tr("connected", "Network adapters tooltip") :
-                          tr("disconnected", "Network adapters tooltip"));
+                          QApplication::translate("VBoxConsoleWnd", "connected", "Network adapters tooltip") :
+                          QApplication::translate("VBoxConsoleWnd", "disconnected", "Network adapters tooltip"));
         }
 
         if (strFullData.isNull())
-            strFullData = tr("<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
+            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>All network adapters are disabled</b></nobr>", "Network adapters tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
@@ -313 +313 @@
         const CMachine &machine = m_session.GetMachine();
 
-        QString strToolTip = tr("<p style='white-space:pre'><nobr>Indicates the activity of "
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity of "
                                 "the attached USB devices:</nobr>%1</p>", "USB device tooltip");
         QString strFullData;
@@ -329 +329 @@
             }
             if (strFullData.isNull())
-                strFullData = tr("<br><nobr><b>No USB devices attached</b></nobr>", "USB device tooltip");
+                strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No USB devices attached</b></nobr>", "USB device tooltip");
         }
         else
-            strFullData = tr("<br><nobr><b>USB Controller is disabled</b></nobr>", "USB device tooltip");
+            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>USB Controller is disabled</b></nobr>", "USB device tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
@@ -371 +371 @@
         const CConsole &console = m_session.GetConsole();
 
-        QString strToolTip = tr("<p style='white-space:pre'><nobr>Indicates the activity of "
+        QString strToolTip = QApplication::translate("VBoxConsoleWnd", "<p style='white-space:pre'><nobr>Indicates the activity of "
                                 "the machine's shared folders:</nobr>%1</p>", "Shared folders tooltip");
 
@@ -407 +407 @@
 
         if (sfs.count() == 0)
-            strFullData = tr("<br><nobr><b>No shared folders</b></nobr>", "Shared folders tooltip");
+            strFullData = QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>No shared folders</b></nobr>", "Shared folders tooltip");
 
         setToolTip(strToolTip.arg(strFullData));
@@ -449 +449 @@
             setState(fVRDPEnabled ? 1 : 0);
 
-            QString tip = tr("Indicates whether the Remote Display (VRDP Server) "
+            QString tip = QApplication::translate("VBoxConsoleWnd", "Indicates whether the Remote Display (VRDP Server) "
                              "is enabled (<img src=:/vrdp_16px.png/>) or not "
                              "(<img src=:/vrdp_disabled_16px.png/>).");
             if (vrdpsrv.GetEnabled())
-                tip += tr ("<hr>The VRDP Server is listening on port %1").arg(vrdpsrv.GetPorts());
+                tip += QApplication::translate("VBoxConsoleWnd", "<hr>The VRDP Server is listening on port %1").arg(vrdpsrv.GetPorts());
             setToolTip(tip);
         }
@@ -499 +499 @@
             VBoxGlobal::tr("Disabled", "nested paging");
 
-        QString tip(tr("Indicates the status of the hardware virtualization "
+        QString tip(QApplication::translate("VBoxConsoleWnd", "Indicates the status of the hardware virtualization "
                        "features used by this virtual machine:"
                        "<br><nobr><b>%1:</b>&nbsp;%2</nobr>"
@@ -509 +509 @@
         int cpuCount = console.GetMachine().GetCPUCount();
         if (cpuCount > 1)
-            tip += tr("<br><nobr><b>%1:</b>&nbsp;%2</nobr>", "Virtualization Stuff LED")
+            tip += QApplication::translate("VBoxConsoleWnd", "<br><nobr><b>%1:</b>&nbsp;%2</nobr>", "Virtualization Stuff LED")
                       .arg(VBoxGlobal::tr("Processor(s)", "details report")).arg(cpuCount);
 
@@ -543 +543 @@
     void retranslateUi()
     {
-        setToolTip(tr("Indicates whether the host mouse pointer is captured by the guest OS:<br>"
+        setToolTip(QApplication::translate("VBoxConsoleWnd", "Indicates whether the host mouse pointer is captured by the guest OS:<br>"
                       "<nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br>"
                       "<nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br>"
@@ -594 +594 @@
     void retranslateUi()
     {
-        setToolTip(tr("Indicates whether the keyboard is captured by the guest OS "
+        setToolTip(QApplication::translate("VBoxConsoleWnd", "Indicates whether the keyboard is captured by the guest OS "
                       "(<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>)."));
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -136 +136 @@
     void retranslateUi()
     {
-        setWindowTitle(tr("Network Adapters"));
+        setWindowTitle(QApplication::translate("VBoxNetworkDialog", "Network Adapters"));
     }
 
@@ -210 +210 @@
     void retranslateUi()
     {
-        setWindowTitle(tr("Shared Folders"));
+        setWindowTitle(QApplication::translate("VBoxSFDialog", "Shared Folders"));
     }
 
@@ -241 +241 @@
     CSession &m_session;
 };
-
-#if 0 // TODO: Rework additions downloader logic!
-class UIAdditionsDownloader : public VBoxDownloaderWgt
-{
-    Q_OBJECT;
-
-public:
-
-    UIAdditionsDownloader (const QString &aSource, const QString &aTarget, QAction *aAction)
-        : VBoxDownloaderWgt (aSource, aTarget)
-        , mAction (aAction)
-    {
-        mAction->setEnabled (false);
-        retranslateUi();
-    }
-
-    void start()
-    {
-        acknowledgeStart();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        mCancelButton->setText (tr ("Cancel"));
-        mProgressBar->setToolTip (tr ("Downloading the VirtualBox Guest Additions "
-                                      "CD image from <nobr><b>%1</b>...</nobr>")
-                                      .arg (mSource.toString()));
-        mCancelButton->setToolTip (tr ("Cancel the VirtualBox Guest "
-                                       "Additions CD image download"));
-    }
-
-private slots:
-
-    void downloadFinished (bool aError)
-    {
-        if (aError)
-            VBoxDownloaderWgt::downloadFinished (aError);
-        else
-        {
-            QByteArray receivedData (mHttp->readAll());
-            /* Serialize the incoming buffer into the .iso image. */
-            while (true)
-            {
-                QFile file (mTarget);
-                if (file.open (QIODevice::WriteOnly))
-                {
-                    file.write (receivedData);
-                    file.close();
-                    //if (vboxProblem().confirmMountAdditions (mSource.toString(),QDir::toNativeSeparators (mTarget)))
-                    //    vboxGlobal().consoleWnd().installGuestAdditionsFrom (mTarget);
-                    QTimer::singleShot (0, this, SLOT (suicide()));
-                    break;
-                }
-                else
-                {
-                    vboxProblem().message (window(), VBoxProblemReporter::Error,
-                        tr ("<p>Failed to save the downloaded file as "
-                            "<nobr><b>%1</b>.</nobr></p>")
-                        .arg (QDir::toNativeSeparators (mTarget)));
-                }
-
-                QString target = QIFileDialog::getExistingDirectory (
-                    QFileInfo (mTarget).absolutePath(), this,
-                    tr ("Select folder to save Guest Additions image to"), true);
-                if (target.isNull())
-                    QTimer::singleShot (0, this, SLOT (suicide()));
-                else
-                    mTarget = QDir (target).absoluteFilePath (QFileInfo (mTarget).fileName());
-            }
-        }
-    }
-
-    void suicide()
-    {
-        QStatusBar *sb = qobject_cast <QStatusBar*> (parent());
-        Assert (sb);
-        sb->removeWidget (this);
-        mAction->setEnabled (true);
-        VBoxDownloaderWgt::suicide();
-    }
-
-private:
-
-    bool confirmDownload()
-    {
-        return vboxProblem().confirmDownloadAdditions (mSource.toString(),
-            mHttp->lastResponse().contentLength());
-    }
-
-    void warnAboutError (const QString &aError)
-    {
-        return vboxProblem().cannotDownloadGuestAdditions (mSource.toString(), aError);
-    }
-
-    QAction *mAction;
-};
-#endif
 
 UIMachineLogic* UIMachineLogic::create(QObject *pParent,
@@ -469 +370 @@
         {
             QAction *pAction = actions.at(i);
-            pAction->setText(tr("Preview Monitor %1").arg(pAction->data().toInt() + 1));
+            pAction->setText(QApplication::translate("VBoxConsoleWnd", "Preview Monitor %1").arg(pAction->data().toInt() + 1));
         }
     }
@@ -993 +894 @@
 
     /* Search for the max available filter index. */
-    QString strNameTemplate = tr("Snapshot %1");
+    QString strNameTemplate = QApplication::translate("VBoxConsoleWnd", "Snapshot %1");
     int iMaxSnapshotIndex = searchMaxSnapshotIndex(machine, machine.GetSnapshot(QString()), strNameTemplate);
     dlg.mLeName->setText(strNameTemplate.arg(++ iMaxSnapshotIndex));
@@ -1209 +1110 @@
             {
                 case VBoxDefs::MediumType_DVD:
-                    callVMMAction->setText(tr("More CD/DVD Images..."));
-                    unmountMediumAction->setText(tr("Unmount CD/DVD Device"));
+                    callVMMAction->setText(QApplication::translate("VBoxConsoleWnd", "More CD/DVD Images..."));
+                    unmountMediumAction->setText(QApplication::translate("VBoxConsoleWnd", "Unmount CD/DVD Device"));
                     unmountMediumAction->setIcon(VBoxGlobal::iconSet(":/cd_unmount_16px.png",
                                                                      ":/cd_unmount_dis_16px.png"));
                     break;
                 case VBoxDefs::MediumType_Floppy:
-                    callVMMAction->setText(tr("More Floppy Images..."));
-                    unmountMediumAction->setText(tr("Unmount Floppy Device"));
+                    callVMMAction->setText(QApplication::translate("VBoxConsoleWnd", "More Floppy Images..."));
+                    unmountMediumAction->setText(QApplication::translate("VBoxConsoleWnd", "Unmount Floppy Device"));
                     unmountMediumAction->setIcon(VBoxGlobal::iconSet(":/fd_unmount_16px.png",
                                                                      ":/fd_unmount_dis_16px.png"));
@@ -1235 +1136 @@
         {
             case VBoxDefs::MediumType_DVD:
-                pEmptyMenuAction->setText(tr("No CD/DVD Devices Attached"));
-                pEmptyMenuAction->setToolTip(tr("No CD/DVD devices attached to that VM"));
+                pEmptyMenuAction->setText(QApplication::translate("VBoxConsoleWnd", "No CD/DVD Devices Attached"));
+                pEmptyMenuAction->setToolTip(QApplication::translate("VBoxConsoleWnd", "No CD/DVD devices attached to that VM"));
                 break;
             case VBoxDefs::MediumType_Floppy:
-                pEmptyMenuAction->setText(tr("No Floppy Devices Attached"));
-                pEmptyMenuAction->setToolTip(tr("No floppy devices attached to that VM"));
+                pEmptyMenuAction->setText(QApplication::translate("VBoxConsoleWnd", "No Floppy Devices Attached"));
+                pEmptyMenuAction->setToolTip(QApplication::translate("VBoxConsoleWnd", "No floppy devices attached to that VM"));
                 break;
             default:
@@ -1344 +1245 @@
         QAction *pEmptyMenuAction = new QAction(pMenu);
         pEmptyMenuAction->setEnabled(false);
-        pEmptyMenuAction->setText(tr("No USB Devices Connected"));
+        pEmptyMenuAction->setText(QApplication::translate("VBoxConsoleWnd", "No USB Devices Connected"));
         pEmptyMenuAction->setIcon(VBoxGlobal::iconSet(":/delete_16px.png", ":/delete_dis_16px.png"));
-        pEmptyMenuAction->setToolTip(tr("No supported devices connected to the host PC"));
+        pEmptyMenuAction->setToolTip(QApplication::translate("VBoxConsoleWnd", "No supported devices connected to the host PC"));
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -242 +242 @@
 
     m_pNameHostkey->setToolTip(
-        tr("Shows the currently assigned Host key.<br>"
+        QApplication::translate("VBoxConsoleWnd", "Shows the currently assigned Host key.<br>"
            "This key, when pressed alone, toggles the keyboard and mouse "
            "capture state. It can also be used in combination with other keys "