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

Timestamp:

Apr 10, 2015 10:29:54 AM (10 years ago)

Author:

vboxsync

Message:

s/drag'n'drop/drag and drop/

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VirtualBox/src/UIVMInfoDialog.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UIActionPoolRuntime.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UIDnDMIMEData.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -197 +197 @@
             if (a->argc <= 1 + 1)
             {
-                errorArgument("Missing argument to '%s'. Expected drag'n'drop mode.", a->argv[1]);
+                errorArgument("Missing argument to '%s'. Expected drag and drop mode.", a->argv[1]);
                 rc = E_FAIL;
                 break;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1618 +1618 @@
     }
 
-    /* Drag'n'drop */
+    /* Drag and drop */
     {
         const char *psz = "Unknown";
@@ -1657 +1657 @@
             RTPrintf("draganddrop=\"%s\"\n", psz);
         else
-            RTPrintf("Drag'n'drop Mode: %s\n", psz);
+            RTPrintf("Drag and drop Mode: %s\n", psz);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -671 +671 @@
         strResult += formatValue(tr("VM Uptime"), strUptime, iMaxLength);
         strResult += formatValue(tr("Clipboard Mode"), strClipboardMode, iMaxLength);
-        strResult += formatValue(tr("Drag'n'Drop Mode"), strDnDMode, iMaxLength);
+        strResult += formatValue(tr("Drag and Drop Mode"), strDnDMode, iMaxLength);
         strResult += formatValue(VBoxGlobal::tr("VT-x/AMD-V", "details report"), strVirtualization, iMaxLength);
         strResult += formatValue(VBoxGlobal::tr("Nested Paging", "details report"), strNestedPaging, iMaxLength);

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

@@ -1507 +1507 @@
     void retranslateUi()
     {
-        setName(QApplication::translate("UIActionPool", "Drag'n'Drop"));
+        setName(QApplication::translate("UIActionPool", "Drag and Drop"));
     }
 };

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

@@ -223 +223 @@
                 if (static_cast<QKeyEvent*>(pEvent)->key() == Qt::Key_Escape)
                 {
-                    LogFlowFunc(("ESC pressed, cancelling drag'n drop operation\n"));
+                    LogFlowFunc(("ESC pressed, cancelling drag and drop operation\n"));
                     m_enmState = Canceled;
                 }