Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (revision 55179) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (revision 55180) @@ -1,5 +1,5 @@ /* $Id$ */ /** @file - * VBoxDnD.cpp - Windows-specific bits of the drag'n drop service. + * VBoxDnD.cpp - Windows-specific bits of the drag and drop service. */ @@ -413,5 +413,5 @@ hide(); - LogFlowThisFunc(("Starting drag'n drop: uAllActions=0x%x, dwOKEffects=0x%x ...\n", + LogFlowThisFunc(("Starting drag and drop: uAllActions=0x%x, dwOKEffects=0x%x ...\n", uAllActions, startupInfo.dwOKEffects)); @@ -433,5 +433,5 @@ default: - LogFlowThisFunc(("Drag'n drop failed with %Rhrc\n", hr)); + LogFlowThisFunc(("Drag and drop failed with %Rhrc\n", hr)); mState = Canceled; rc = VERR_GENERAL_FAILURE; /** @todo Find a better status code. */ @@ -778,5 +778,5 @@ */ if (!this->lstFormats.size()) - LogRel(("DnD: Warning: No supported drag'n drop formats on the guest found!\n")); + LogRel(("DnD: Warning: No supported drag and drop formats on the guest found!\n")); /* @@ -874,5 +874,5 @@ LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState)); - LogRel(("DnD: Drag'n drop operation aborted\n")); + LogRel(("DnD: Drag and drop operation aborted\n")); reset(); @@ -881,5 +881,5 @@ /* Post ESC to our window to officially abort the - * drag'n drop operation. */ + * drag and drop operation. */ PostMessage(hWnd, WM_KEYDOWN, VK_ESCAPE, 0 /* lParam */); @@ -1130,7 +1130,7 @@ /** @todo Add some i18l tr() macros here. */ - RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions Drag'n Drop"); - RTStrPrintf(szMsg, sizeof(szMsg), "Drag'n drop to the host either is not supported or disabled. " - "Please enable Guest to Host or Bidirectional drag'n drop mode " + RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions Drag and Drop"); + RTStrPrintf(szMsg, sizeof(szMsg), "Drag and drop to the host either is not supported or disabled. " + "Please enable Guest to Host or Bidirectional drag and drop mode " "or re-install the VirtualBox Guest Additions."); switch (rc) @@ -1498,5 +1498,5 @@ /** - * Initializes drag'n drop. + * Initializes drag and drop. * * @return IPRT status code. @@ -1529,5 +1529,5 @@ if (!fSupportedOS) { - LogRel(("DnD: Not supported Windows version, disabling drag'n drop support\n")); + LogRel(("DnD: Not supported Windows version, disabling drag and drop support\n")); rc = VERR_NOT_SUPPORTED; } @@ -1565,9 +1565,9 @@ *pfStartThread = true; - LogRel(("DnD: Drag'n drop service successfully started\n")); + LogRel(("DnD: Drag and drop service successfully started\n")); return VINF_SUCCESS; } - LogRel(("DnD: Initializing drag'n drop service failed with rc=%Rrc\n", rc)); + LogRel(("DnD: Initializing drag and drop service failed with rc=%Rrc\n", rc)); return rc; } Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (revision 55179) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (revision 55180) @@ -180,5 +180,5 @@ case ERROR_INVALID_FUNCTION: { - LogRel(("DnD: Drag'n drop format is not supported by VBoxTray\n")); + LogRel(("DnD: Drag and drop format is not supported by VBoxTray\n")); /* Enumerate supported source formats. This shouldn't happen too often Index: /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp =================================================================== --- /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (revision 55179) +++ /trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (revision 55180) @@ -2255,5 +2255,5 @@ int rc = VbglR3DnDConnect(&uClientID); if (RT_FAILURE(rc)) - LogRel(("DnD: Unable to connect to drag'n drop service, rc=%Rrc\n", rc)); + LogRel(("DnD: Unable to connect to drag and drop service, rc=%Rrc\n", rc)); /* Not RT_FAILURE: VINF_PERMISSION_DENIED is host service not present. */ if (rc != VINF_SUCCESS) Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 55179) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 55180) @@ -197,5 +197,5 @@ 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; Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 55179) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 55180) @@ -1618,5 +1618,5 @@ } - /* Drag'n'drop */ + /* Drag and drop */ { const char *psz = "Unknown"; @@ -1657,5 +1657,5 @@ RTPrintf("draganddrop=\"%s\"\n", psz); else - RTPrintf("Drag'n'drop Mode: %s\n", psz); + RTPrintf("Drag and drop Mode: %s\n", psz); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp (revision 55179) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp (revision 55180) @@ -671,5 +671,5 @@ 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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 55179) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 55180) @@ -1507,5 +1507,5 @@ void retranslateUi() { - setName(QApplication::translate("UIActionPool", "Drag'n'Drop")); + setName(QApplication::translate("UIActionPool", "Drag and Drop")); } }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp (revision 55179) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp (revision 55180) @@ -223,5 +223,5 @@ if (static_cast(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; } Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 55179) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 55180) @@ -5480,5 +5480,5 @@ HRESULT rc = S_OK; - /* don't trigger the drag'n'drop mode change if the VM isn't running */ + /* don't trigger the drag and drop mode change if the VM isn't running */ SafeVMPtrQuiet ptrVM(this); if (ptrVM.isOk()) @@ -8748,7 +8748,7 @@ /** - * Changes the drag'n_drop mode. - * - * @param aDnDMode new drag'n'drop mode. + * Changes the drag and drop mode. + * + * @param aDnDMode new drag and drop mode. */ int Console::i_changeDnDMode(DnDMode_T aDnDMode) @@ -8765,17 +8765,17 @@ default: case DnDMode_Disabled: - LogRel(("Changed drag'n drop mode to: Off\n")); + LogRel(("Changed drag and drop mode to: Off\n")); parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_OFF; break; case DnDMode_GuestToHost: - LogRel(("Changed drag'n drop mode to: Guest to Host\n")); + LogRel(("Changed drag and drop mode to: Guest to Host\n")); parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_GUEST_TO_HOST; break; case DnDMode_HostToGuest: - LogRel(("Changed drag'n drop mode to: Host to Guest\n")); + LogRel(("Changed drag and drop mode to: Host to Guest\n")); parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_HOST_TO_GUEST; break; case DnDMode_Bidirectional: - LogRel(("Changed drag'n drop mode to: Bidirectional\n")); + LogRel(("Changed drag and drop mode to: Bidirectional\n")); parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL; break; Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 55179) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 55180) @@ -2849,5 +2849,5 @@ #ifdef VBOX_WITH_DRAG_AND_DROP /* - * Drag'n Drop. + * Drag and Drop. */ { @@ -2859,5 +2859,5 @@ if (RT_FAILURE(rc)) { - LogRel(("Drag'n drop service is not available, rc=%Rrc\n", rc)); + LogRel(("Drag and drop service is not available, rc=%Rrc\n", rc)); /* That is not a fatal failure. */ rc = VINF_SUCCESS; @@ -2873,5 +2873,5 @@ else { - LogRel(("Drag'n drop service loaded\n")); + LogRel(("Drag and drop service loaded\n")); rc = i_changeDnDMode(enmMode); } Index: /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (revision 55179) +++ /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (revision 55180) @@ -225,5 +225,5 @@ strError += Utf8StrFmt(pGuest->tr("One or more guest files or directories selected for transferring to the host were not" "found on the guest anymore. This can be the case if the guest files were moved and/or" - "altered while the drag'n drop operation was in progress.")); + "altered while the drag and drop operation was in progress.")); break; @@ -235,5 +235,5 @@ default: - strError += Utf8StrFmt("Drag'n drop guest error (%Rrc)", guestRc); + strError += Utf8StrFmt("Drag and drop guest error (%Rrc)", guestRc); break; } Index: /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (revision 55179) +++ /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (revision 55180) @@ -1,5 +1,5 @@ /* $Id$ */ /** @file - * VBox Console COM Class implementation - Guest drag'n drop source. + * VBox Console COM Class implementation - Guest drag and drop source. */ @@ -261,5 +261,5 @@ if (RT_FAILURE(rc)) return setError(VBOX_E_IPRT_ERROR, - tr("Unable to create the temporary drag'n drop directory \"%s\" (%Rrc)\n"), + tr("Unable to create the temporary drag and drop directory \"%s\" (%Rrc)\n"), szDropDir, rc); Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 55179) +++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 55180) @@ -131,5 +131,5 @@ } - LogFlowFunc(("Drag'n drop initializied with hr=%Rhrc\n", hr)); + LogFlowFunc(("Drag and drop initializied with hr=%Rhrc\n", hr)); } catch (std::bad_alloc &)