Changeset 56102 in vbox for trunk/src

Timestamp:

May 27, 2015 2:24:28 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Action-pool: Another NLS consistency fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (9 diffs)

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

@@ -526 +526 @@
     {
         setName(QApplication::translate("UIActionPool", "&Minimize"));
-        setStatusTip(QApplication::translate("UIActionPool", "Minimize active machine-window"));
+        setStatusTip(QApplication::translate("UIActionPool", "Minimize active window"));
     }
 };

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

@@ -530 +530 @@
     {
         setName(QApplication::translate("UIActionPool", "&Minimize Window"));
-        setStatusTip(QApplication::translate("UIActionPool", "Minimize currently active window"));
+        setStatusTip(QApplication::translate("UIActionPool", "Minimize active window"));
     }
 };
@@ -603 +603 @@
     {
         setName(QApplication::translate("UIActionPool", "Auto-resize &Guest Display"));
-        setStatusTip(QApplication::translate("UIActionPool", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
+        setStatusTip(QApplication::translate("UIActionPool", "Automatically resize the guest display when the window is resized"));
     }
 };
@@ -1382 +1382 @@
     void retranslateUi()
     {
-        setName(QApplication::translate("UIActionPool", "Network"));
+        setName(QApplication::translate("UIActionPool", "&Network"));
     }
 };
@@ -2447 +2447 @@
             QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
                                                                  ":/virtual_screen_disabled_16px.png"),
-                                             QApplication::translate("UIMultiScreenLayout",
-                                                                     "Virtual Screen %1").arg(iGuestScreenIndex + 1));
+                                             QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
             connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
@@ -2463 +2462 @@
                 QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
                                                                      ":/virtual_screen_disabled_16px.png"),
-                                                 QApplication::translate("UIMultiScreenLayout",
-                                                                         "Virtual Screen %1").arg(iGuestScreenIndex + 1));
+                                                 QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
                 pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
                 connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewMultiscreen()));
@@ -2511 +2509 @@
             QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
                                                                  ":/virtual_screen_disabled_16px.png"),
-                                             QApplication::translate("UIMultiScreenLayout",
-                                                                     "Virtual Screen %1").arg(iGuestScreenIndex + 1));
+                                             QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
             pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
             connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewScreen()));
@@ -2616 +2613 @@
         {
             /* Create exclusive 'scale-factor' action: */
-            QAction *pAction = pActionGroup->addAction(tr("%1%", "scale-factor")
-                                                          .arg(dScaleFactor * 100));
+            QAction *pAction = pActionGroup->addAction(QApplication::translate("UIActionPool", "%1%", "scale-factor")
+                                                                               .arg(dScaleFactor * 100));
             AssertPtrReturnVoid(pAction);
             {
@@ -2667 +2664 @@
     {
         /* Create 'toggle' action: */
-        QAction *pToggleAction = pMenu->addAction(UIActionPoolRuntime::tr("Enable", "Virtual Screen"),
+        QAction *pToggleAction = pMenu->addAction(QApplication::translate("UIActionPool", "Enable", "Virtual Screen"),
                                                   this, SLOT(sltHandleActionTriggerViewScreenToggle()));
         AssertPtrReturnVoid(pToggleAction);
@@ -2691 +2688 @@
         {
             /* Create exclusive 'resize' action: */
-            QAction *pAction = pActionGroup->addAction(UIActionPoolRuntime::tr("Resize to %1x%2", "Virtual Screen")
+            QAction *pAction = pActionGroup->addAction(QApplication::translate("UIActionPool", "Resize to %1x%2", "Virtual Screen")
                                                                                .arg(size.width()).arg(size.height()));
             AssertPtrReturnVoid(pAction);