Changeset 91503 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 1, 2021 8:57:59 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147192

Message:

Main: bugref:1909: Added missed translation marks, removed redundant ones. Expanded one macro to make the lupdate get string correctly. Removed GuestBase::setErrorExternal and changed calls from it to setErrorBoth to handle translation correctly.

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (4 diffs)
• src-all/AutoCaller.cpp (modified) (3 diffs)
• src-all/EventImpl.cpp (modified) (5 diffs)
• src-all/Global.cpp (modified) (5 diffs)
• src-all/TextScript.cpp (modified) (6 diffs)
• src-all/VirtualBoxBase.cpp (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (6 diffs)
• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-client/ConsoleImplTeleporter.cpp (modified) (2 diffs)
• src-client/EmulatedUSBImpl.cpp (modified) (3 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestDirectoryImpl.cpp (modified) (3 diffs)
• src-client/GuestFileImpl.cpp (modified) (3 diffs)
• src-client/GuestImpl.cpp (modified) (2 diffs)
• src-client/GuestProcessImpl.cpp (modified) (4 diffs)
• src-client/GuestSessionImpl.cpp (modified) (17 diffs)
• src-client/MachineDebuggerImpl.cpp (modified) (8 diffs)
• src-client/VirtualBoxClientImpl.cpp (modified) (3 diffs)
• src-server/ApplianceImpl.cpp (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (12 diffs)
• src-server/CertificateImpl.cpp (modified) (2 diffs)
• src-server/DHCPServerImpl.cpp (modified) (2 diffs)
• src-server/HostImpl.cpp (modified) (4 diffs)
• src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)
• src-server/HostVideoInputDeviceImpl.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (6 diffs)
• src-server/MachineImplCloneVM.cpp (modified) (2 diffs)
• src-server/MachineImplMoveVM.cpp (modified) (4 diffs)
• src-server/MediumImpl.cpp (modified) (4 diffs)
• src-server/NATNetworkImpl.cpp (modified) (10 diffs)
• src-server/PerformanceImpl.cpp (modified) (3 diffs)
• src-server/UnattendedImpl.cpp (modified) (2 diffs)
• src-server/VRDEServerImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (7 diffs)
• src-server/generic/NetIf-generic.cpp (modified) (9 diffs)
• src-server/win/NetIf-win.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -1278 +1278 @@
     int waitForEvent(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, VBoxEventType_T *pType, IEvent **ppEvent);
 
-#ifndef VBOX_GUESTCTRL_TEST_CASE
-    HRESULT setErrorExternal(VirtualBoxBase *pInterface, const Utf8Str &strAction, const GuestErrorInfo &guestErrorInfo);
-#endif
-
 public:
 

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -174 +174 @@
             AssertMsgFailed(("%s\n", #expr)); \
             setError(E_FAIL, \
-                     "Assertion failed: [%s] at '%s' (%d) in %s.\nPlease contact the product vendor!", \
+                     VirtualBoxBase::tr("Assertion failed: [%s] at '%s' (%d) in %s.\nPlease contact the product vendor!"), \
                      #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
         } \
@@ -194 +194 @@
         AssertFailed(); \
         setError(E_FAIL, \
-                 "Assertion failed: at '%s' (%d) in %s.\nPlease contact the product vendor!", \
+                 VirtualBoxBase::tr("Assertion failed: at '%s' (%d) in %s.\nPlease contact the product vendor!"), \
                  __FILE__, __LINE__, __PRETTY_FUNCTION__); \
     } while (0)
@@ -216 +216 @@
             AssertMsgFailed(("%s\n", MyAssertMsg.c_str())); \
             setError(E_FAIL, \
-                     "Assertion failed: [%s] at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!", \
+                     VirtualBoxBase::tr("Assertion failed: [%s] at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!"), \
                      #expr, __FILE__, __LINE__, __PRETTY_FUNCTION__, MyAssertMsg.c_str()); \
         } \
@@ -234 +234 @@
         AssertMsgFailed(("%s\n", MyAssertMsg.c_str())); \
         setError(E_FAIL, \
-                 "Assertion failed: at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!", \
+                 VirtualBoxBase::tr("Assertion failed: at '%s' (%d) in %s.\n%s.\nPlease contact the product vendor!"), \
                  __FILE__, __LINE__, __PRETTY_FUNCTION__, MyAssertMsg.c_str()); \
     } while (0)

trunk/src/VBox/Main/src-all/AutoCaller.cpp

@@ -23 +23 @@
 #include "LoggingNew.h"
 
+#include "VBoxNls.h"
+
+
+DECLARE_TRANSLATION_CONTEXT(AutoCallerCtx);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -201 +205 @@
     {
         if (mState == Limited)
-            rc = mObj->setError(rc, "The object functionality is limited");
+            rc = mObj->setError(rc, AutoCallerCtx::tr("The object functionality is limited"));
         else if (FAILED(mFailedRC) && mFailedRC != E_ACCESSDENIED)
         {
@@ -210 +214 @@
         }
         else
-            rc = mObj->setError(rc, "The object is not ready");
+            rc = mObj->setError(rc, AutoCallerCtx::tr("The object is not ready"));
     }
 

trunk/src/VBox/Main/src-all/EventImpl.cpp

@@ -1299 +1299 @@
     STDMETHOD(HandleEvent)(IEvent *)
     {
-        ComAssertMsgRet(false, ("HandleEvent() of wrapper shall never be called"),
+        ComAssertMsgRet(false, (tr("HandleEvent() of wrapper shall never be called")),
                         E_FAIL);
     }
@@ -1443 +1443 @@
 
     HRESULT rc = listener.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create wrapper object (%Rhrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create wrapper object (%Rhrc)"), rc),
                     E_FAIL);
     listener.queryInterfaceTo(aListener.asOutParam());
@@ -1455 +1455 @@
 
     HRESULT rc = agg.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create aggregator (%Rhrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create aggregator (%Rhrc)"), rc),
                     E_FAIL);
 
@@ -1474 +1474 @@
 
     rc = mSource.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create source (%Rhrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create source (%Rhrc)"), rc),
                     E_FAIL);
     rc = mSource->init();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not init source (%Rhrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not init source (%Rhrc)"), rc),
                     E_FAIL);
 
@@ -1613 +1613 @@
 
     HRESULT rc = proxy.createObject();
-    ComAssertMsgRet(SUCCEEDED(rc), ("Could not create proxy (%Rhrc)", rc),
+    ComAssertMsgRet(SUCCEEDED(rc), (tr("Could not create proxy (%Rhrc)"), rc),
                     E_FAIL);
 

trunk/src/VBox/Main/src-all/Global.cpp

@@ -24 +24 @@
 #include <iprt/errcore.h>
 
+#include "VBoxNls.h"
+
+DECLARE_TRANSLATION_CONTEXT(GlobalCtx);
+
+
 /* static */
 const Global::OSType Global::sOSTypes[] =
@@ -581 +586 @@
     switch (aState)
     {
-        case MachineState_Null:                 return "Null";
-        case MachineState_PoweredOff:           return "PoweredOff";
-        case MachineState_Saved:                return "Saved";
-        case MachineState_Teleported:           return "Teleported";
-        case MachineState_Aborted:              return "Aborted";
-        case MachineState_AbortedSaved:         return "Aborted-Saved";
-        case MachineState_Running:              return "Running";
-        case MachineState_Paused:               return "Paused";
-        case MachineState_Stuck:                return "GuruMeditation";
-        case MachineState_Teleporting:          return "Teleporting";
-        case MachineState_LiveSnapshotting:     return "LiveSnapshotting";
-        case MachineState_Starting:             return "Starting";
-        case MachineState_Stopping:             return "Stopping";
-        case MachineState_Saving:               return "Saving";
-        case MachineState_Restoring:            return "Restoring";
-        case MachineState_TeleportingPausedVM:  return "TeleportingPausedVM";
-        case MachineState_TeleportingIn:        return "TeleportingIn";
-        case MachineState_DeletingSnapshotOnline: return "DeletingSnapshotOnline";
-        case MachineState_DeletingSnapshotPaused: return "DeletingSnapshotPaused";
-        case MachineState_OnlineSnapshotting:   return "OnlineSnapshotting";
-        case MachineState_RestoringSnapshot:    return "RestoringSnapshot";
-        case MachineState_DeletingSnapshot:     return "DeletingSnapshot";
-        case MachineState_SettingUp:            return "SettingUp";
-        case MachineState_Snapshotting:         return "Snapshotting";
+        case MachineState_Null:                 return GlobalCtx::tr("Null");
+        case MachineState_PoweredOff:           return GlobalCtx::tr("PoweredOff");
+        case MachineState_Saved:                return GlobalCtx::tr("Saved");
+        case MachineState_Teleported:           return GlobalCtx::tr("Teleported");
+        case MachineState_Aborted:              return GlobalCtx::tr("Aborted");
+        case MachineState_AbortedSaved:         return GlobalCtx::tr("Aborted-Saved");
+        case MachineState_Running:              return GlobalCtx::tr("Running");
+        case MachineState_Paused:               return GlobalCtx::tr("Paused");
+        case MachineState_Stuck:                return GlobalCtx::tr("GuruMeditation");
+        case MachineState_Teleporting:          return GlobalCtx::tr("Teleporting");
+        case MachineState_LiveSnapshotting:     return GlobalCtx::tr("LiveSnapshotting");
+        case MachineState_Starting:             return GlobalCtx::tr("Starting");
+        case MachineState_Stopping:             return GlobalCtx::tr("Stopping");
+        case MachineState_Saving:               return GlobalCtx::tr("Saving");
+        case MachineState_Restoring:            return GlobalCtx::tr("Restoring");
+        case MachineState_TeleportingPausedVM:  return GlobalCtx::tr("TeleportingPausedVM");
+        case MachineState_TeleportingIn:        return GlobalCtx::tr("TeleportingIn");
+        case MachineState_DeletingSnapshotOnline: return GlobalCtx::tr("DeletingSnapshotOnline");
+        case MachineState_DeletingSnapshotPaused: return GlobalCtx::tr("DeletingSnapshotPaused");
+        case MachineState_OnlineSnapshotting:   return GlobalCtx::tr("OnlineSnapshotting");
+        case MachineState_RestoringSnapshot:    return GlobalCtx::tr("RestoringSnapshot");
+        case MachineState_DeletingSnapshot:     return GlobalCtx::tr("DeletingSnapshot");
+        case MachineState_SettingUp:            return GlobalCtx::tr("SettingUp");
+        case MachineState_Snapshotting:         return GlobalCtx::tr("Snapshotting");
         default:
         {
             AssertMsgFailed(("%d (%#x)\n", aState, aState));
             static char s_szMsg[48];
-            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidState-0x%08x\n", aState);
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidState-0x%08x\n"), aState);
             return s_szMsg;
         }
@@ -620 +625 @@
     switch (aState)
     {
-        case SessionState_Null:         return "Null";
-        case SessionState_Unlocked:     return "Unlocked";
-        case SessionState_Locked:       return "Locked";
-        case SessionState_Spawning:     return "Spawning";
-        case SessionState_Unlocking:    return "Unlocking";
+        case SessionState_Null:         return GlobalCtx::tr("Null");
+        case SessionState_Unlocked:     return GlobalCtx::tr("Unlocked");
+        case SessionState_Locked:       return GlobalCtx::tr("Locked");
+        case SessionState_Spawning:     return GlobalCtx::tr("Spawning");
+        case SessionState_Unlocking:    return GlobalCtx::tr("Unlocking");
         default:
         {
             AssertMsgFailed(("%d (%#x)\n", aState, aState));
             static char s_szMsg[48];
-            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidState-0x%08x\n", aState);
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidState-0x%08x\n"), aState);
             return s_szMsg;
         }
@@ -640 +645 @@
     switch (aType)
     {
-        case DeviceType_Null:         return "Null";
-        case DeviceType_Floppy:       return "Floppy";
-        case DeviceType_DVD:          return "DVD";
-        case DeviceType_HardDisk:     return "HardDisk";
-        case DeviceType_Network:      return "Network";
-        case DeviceType_USB:          return "USB";
-        case DeviceType_SharedFolder: return "ShardFolder";
+        case DeviceType_Null:         return GlobalCtx::tr("Null");
+        case DeviceType_Floppy:       return GlobalCtx::tr("Floppy");
+        case DeviceType_DVD:          return GlobalCtx::tr("DVD");
+        case DeviceType_HardDisk:     return GlobalCtx::tr("HardDisk");
+        case DeviceType_Network:      return GlobalCtx::tr("Network");
+        case DeviceType_USB:          return GlobalCtx::tr("USB");
+        case DeviceType_SharedFolder: return GlobalCtx::tr("ShardFolder");
         default:
         {
             AssertMsgFailed(("%d (%#x)\n", aType, aType));
             static char s_szMsg[48];
-            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "InvalidType-0x%08x\n", aType);
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("InvalidType-0x%08x\n"), aType);
             return s_szMsg;
         }
@@ -663 +668 @@
     switch (aReason)
     {
-        case Reason_Unspecified:      return "unspecified";
-        case Reason_HostSuspend:      return "host suspend";
-        case Reason_HostResume:       return "host resume";
-        case Reason_HostBatteryLow:   return "host battery low";
-        case Reason_Snapshot:         return "snapshot";
+        case Reason_Unspecified:      return GlobalCtx::tr("unspecified");
+        case Reason_HostSuspend:      return GlobalCtx::tr("host suspend");
+        case Reason_HostResume:       return GlobalCtx::tr("host resume");
+        case Reason_HostBatteryLow:   return GlobalCtx::tr("host battery low");
+        case Reason_Snapshot:         return GlobalCtx::tr("snapshot");
         default:
         {
             AssertMsgFailed(("%d (%#x)\n", aReason, aReason));
             static char s_szMsg[48];
-            RTStrPrintf(s_szMsg, sizeof(s_szMsg), "invalid reason %#010x\n", aReason);
+            RTStrPrintf(s_szMsg, sizeof(s_szMsg), GlobalCtx::tr("invalid reason %#010x\n"), aReason);
             return s_szMsg;
         }

trunk/src/VBox/Main/src-all/TextScript.cpp

@@ -194 +194 @@
 HRESULT GeneralTextScript::parse()
 {
-//  AssertReturn(!mfDataParsed, mpSetError->setErrorBoth(E_FAIL, VERR_WRONG_ORDER, "parse called more than once"));
+//  AssertReturn(!mfDataParsed, mpSetError->setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("parse called more than once")));
 
     /*
@@ -215 +215 @@
 HRESULT GeneralTextScript::saveToString(Utf8Str &rStrDst)
 {
-    AssertReturn(mfDataParsed, mpSetError->setErrorBoth(E_FAIL, VERR_WRONG_ORDER, "saveToString() called before parse()"));
+    AssertReturn(mfDataParsed, mpSetError->setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("saveToString() called before parse()")));
 
     /*
@@ -264 +264 @@
 {
     AssertReturn(idxLine < mScriptContentByLines.size(),
-                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, "attempting to set line %zu when there are only %zu lines",
+                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, tr("attempting to set line %zu when there are only %zu lines"),
                                           idxLine, mScriptContentByLines.size()));
     try
@@ -293 +293 @@
     AssertReturn(idxLine < mScriptContentByLines.size(),
                  mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE,
-                                          "attempting search&replace in line %zu when there are only %zu lines",
+                                          tr("attempting search&replace in line %zu when there are only %zu lines"),
                                           idxLine, mScriptContentByLines.size()));
 
@@ -320 +320 @@
 {
     AssertReturn(idxLine < mScriptContentByLines.size(),
-                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, "appending to line %zu when there are only %zu lines",
+                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, tr("appending to line %zu when there are only %zu lines"),
                                           idxLine, mScriptContentByLines.size()));
 
@@ -337 +337 @@
 {
     AssertReturn(idxLine < mScriptContentByLines.size(),
-                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, "prepending to line %zu when there are only %zu lines",
+                 mpSetError->setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, tr("prepending to line %zu when there are only %zu lines"),
                                           idxLine, mScriptContentByLines.size()));
 

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -231 +231 @@
                                  true /* aLogIt */,
                                  0 /* aResultDetail */,
-                                 tr("%s.\n%s[%d] (%s)"),
+                                 "%s.\n%s[%d] (%s)",
                                  err.what(), pszFile, iLine, pszFunction);
     }
@@ -346 +346 @@
         switch (aResultCode)
         {
-            case E_INVALIDARG:                 strText = "A parameter has an invalid value"; break;
-            case E_POINTER:                    strText = "A parameter is an invalid pointer"; break;
-            case E_UNEXPECTED:                 strText = "The result of the operation is unexpected"; break;
-            case E_ACCESSDENIED:               strText = "The access to an object is not allowed"; break;
-            case E_OUTOFMEMORY:                strText = "The allocation of new memory failed"; break;
-            case E_NOTIMPL:                    strText = "The requested operation is not implemented"; break;
-            case E_NOINTERFACE:                strText = "The requested interface is not implemented"; break;
-            case E_FAIL:                       strText = "A general error occurred"; break;
-            case E_ABORT:                      strText = "The operation was canceled"; break;
-            case VBOX_E_OBJECT_NOT_FOUND:      strText = "Object corresponding to the supplied arguments does not exist"; break;
-            case VBOX_E_INVALID_VM_STATE:      strText = "Current virtual machine state prevents the operation"; break;
-            case VBOX_E_VM_ERROR:              strText = "Virtual machine error occurred attempting the operation"; break;
-            case VBOX_E_FILE_ERROR:            strText = "File not accessible or erroneous file contents"; break;
-            case VBOX_E_IPRT_ERROR:            strText = "Runtime subsystem error"; break;
-            case VBOX_E_PDM_ERROR:             strText = "Pluggable Device Manager error"; break;
-            case VBOX_E_INVALID_OBJECT_STATE:  strText = "Current object state prohibits operation"; break;
-            case VBOX_E_HOST_ERROR:            strText = "Host operating system related error"; break;
-            case VBOX_E_NOT_SUPPORTED:         strText = "Requested operation is not supported"; break;
-            case VBOX_E_XML_ERROR:             strText = "Invalid XML found"; break;
-            case VBOX_E_INVALID_SESSION_STATE: strText = "Current session state prohibits operation"; break;
-            case VBOX_E_OBJECT_IN_USE:         strText = "Object being in use prohibits operation"; break;
-            case VBOX_E_PASSWORD_INCORRECT:    strText = "Incorrect password provided"; break;
-            default:                           strText = "Unknown error"; break;
+            case E_INVALIDARG:                 strText = tr("A parameter has an invalid value"); break;
+            case E_POINTER:                    strText = tr("A parameter is an invalid pointer"); break;
+            case E_UNEXPECTED:                 strText = tr("The result of the operation is unexpected"); break;
+            case E_ACCESSDENIED:               strText = tr("The access to an object is not allowed"); break;
+            case E_OUTOFMEMORY:                strText = tr("The allocation of new memory failed"); break;
+            case E_NOTIMPL:                    strText = tr("The requested operation is not implemented"); break;
+            case E_NOINTERFACE:                strText = tr("The requested interface is not implemented"); break;
+            case E_FAIL:                       strText = tr("A general error occurred"); break;
+            case E_ABORT:                      strText = tr("The operation was canceled"); break;
+            case VBOX_E_OBJECT_NOT_FOUND:      strText = tr("Object corresponding to the supplied arguments does not exist"); break;
+            case VBOX_E_INVALID_VM_STATE:      strText = tr("Current virtual machine state prevents the operation"); break;
+            case VBOX_E_VM_ERROR:              strText = tr("Virtual machine error occurred attempting the operation"); break;
+            case VBOX_E_FILE_ERROR:            strText = tr("File not accessible or erroneous file contents"); break;
+            case VBOX_E_IPRT_ERROR:            strText = tr("Runtime subsystem error"); break;
+            case VBOX_E_PDM_ERROR:             strText = tr("Pluggable Device Manager error"); break;
+            case VBOX_E_INVALID_OBJECT_STATE:  strText = tr("Current object state prohibits operation"); break;
+            case VBOX_E_HOST_ERROR:            strText = tr("Host operating system related error"); break;
+            case VBOX_E_NOT_SUPPORTED:         strText = tr("Requested operation is not supported"); break;
+            case VBOX_E_XML_ERROR:             strText = tr("Invalid XML found"); break;
+            case VBOX_E_INVALID_SESSION_STATE: strText = tr("Current session state prohibits operation"); break;
+            case VBOX_E_OBJECT_IN_USE:         strText = tr("Object being in use prohibits operation"); break;
+            case VBOX_E_PASSWORD_INCORRECT:    strText = tr("Incorrect password provided"); break;
+            default:                           strText = tr("Unknown error"); break;
         }
     }

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -2226 +2226 @@
             if (!pTask->isOk())
             {
-                hrc = setError(FAILED(pTask->rc()) ? pTask->rc() : E_FAIL, "Could not create VMPowerDownTask object\n");
+                hrc = setError(FAILED(pTask->rc()) ? pTask->rc() : E_FAIL, tr("Could not create VMPowerDownTask object\n"));
                 delete(pTask);
                 pTask = NULL;
@@ -3395 +3395 @@
                                      true /*aLogIt*/,
                                      0 /* aResultDetail */,
-                                     "Invalid state '%s' for changing medium",
+                                     tr("Invalid state '%s' for changing medium"),
                                      VMR3GetStateName(enmVMState));
     }
@@ -5508 +5508 @@
          * Not fatal if we start the VM, fatal if the VM is already running. */
         LogRel(("VRDE: VirtualBox Remote Desktop Extension is not available.\n"));
-        errMsg = Utf8Str("VirtualBox Remote Desktop Extension is not available");
+        errMsg = Utf8Str(tr("VirtualBox Remote Desktop Extension is not available"));
     }
     else if (RT_FAILURE(vrc))
@@ -6451 +6451 @@
 
     if (RT_FAILURE(vrc))
-        return setErrorBoth(E_FAIL, vrc, tr("%Rrc"), vrc);
+        return setErrorBoth(E_FAIL, vrc, "%Rrc", vrc);
     if (FAILED(rc))
         return rc;
@@ -6497 +6497 @@
 
     if (RT_FAILURE(vrc))
-        return setErrorBoth(E_FAIL, vrc, tr("%Rrc"), vrc);
+        return setErrorBoth(E_FAIL, vrc, "%Rrc", vrc);
     if (FAILED(rc))
         return rc;
@@ -6579 +6579 @@
                                    pAttachment, mMachineState, &rc);
         if (RT_FAILURE(vrc))
-            throw setErrorBoth(E_FAIL, vrc, tr("%Rrc"), vrc);
+            throw setErrorBoth(E_FAIL, vrc, "%Rrc", vrc);
         if (FAILED(rc))
             throw rc;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -275 +275 @@
                 int vrc,
                 const char *pcszName)
-        : RTCError(Utf8StrFmt("%s failed: rc=%Rrc, pcszName=%s", pcszFunction, vrc, pcszName)),
+        : RTCError(Utf8StrFmt(Console::tr("%s failed: rc=%Rrc, pcszName=%s"), pcszFunction, vrc, pcszName)),
           m_vrc(vrc)
     {
@@ -5072 +5072 @@
                     hrc = ptrMedium->COMGETTER(Location)(loc.asOutParam());                 H();
                     i_atVMRuntimeErrorCallbackF(0, "DvdOrFloppyImageInaccessible",
-                                                "The image file '%ls' is inaccessible and is being ignored. "
-                                                "Please select a different image file for the virtual %s drive.",
+                                                N_("The image file '%ls' is inaccessible and is being ignored. "
+                                                   "Please select a different image file for the virtual %s drive."),
                                                 loc.raw(),
                                                 enmType == DeviceType_DVD ? "DVD" : "floppy");

trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp

@@ -708 +708 @@
                 return hrc;
         }
-        return setErrorBoth(E_FAIL, vrc, tr("VMR3Teleport -> %Rrc"), vrc);
+        return setErrorBoth(E_FAIL, vrc, "VMR3Teleport -> %Rrc", vrc);
     }
 
@@ -1017 +1017 @@
         ptrProgress->i_setCancelCallback(NULL, NULL);
         delete pState;
-        hrc = setErrorBoth(E_FAIL, vrc, tr("RTThreadCreate -> %Rrc"), vrc);
+        hrc = setErrorBoth(E_FAIL, vrc, "RTThreadCreate -> %Rrc", vrc);
     }
 

trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp

@@ -213 +213 @@
     {
         LogFlowThisFunc(("%Rrc\n", vrc));
-        hrc = pConsole->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, "Init emulated USB webcam (%Rrc)", vrc);
+        hrc = pConsole->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, EmulatedUSB::tr("Init emulated USB webcam (%Rrc)"), vrc);
     }
 
@@ -312 +312 @@
     {
         LogFlowThisFunc(("%Rrc\n", vrc));
-        hrc = pConsole->setErrorBoth(VBOX_E_VM_ERROR, vrc, "Attach emulated USB webcam (%Rrc)", vrc);
+        hrc = pConsole->setErrorBoth(VBOX_E_VM_ERROR, vrc, EmulatedUSB::tr("Attach emulated USB webcam (%Rrc)"), vrc);
     }
 
@@ -330 +330 @@
     {
         LogFlowThisFunc(("%Rrc\n", vrc));
-        hrc = pConsole->setErrorBoth(VBOX_E_VM_ERROR, vrc, "Detach emulated USB webcam (%Rrc)", vrc);
+        hrc = pConsole->setErrorBoth(VBOX_E_VM_ERROR, vrc, EmulatedUSB::tr("Detach emulated USB webcam (%Rrc)"), vrc);
     }
 

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -520 +520 @@
      */
     GuestSessionStartupInfo startupInfo;
-    startupInfo.mName = strAction + " guest";
+    startupInfo.mName = (fFlags & GuestShutdownFlag_Reboot) ? tr("Rebooting guest") : tr("Shutting down guest");
 
     GuestCredentials guestCreds;

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -1379 +1379 @@
 }
 
-/**
- * Sets a guest error as error info, needed for API clients.
- *
- * @returns HRESULT COM error.
- * @param   pInterface          Interface to set error for.
- * @param   strAction           What action was involved causing this error.
- * @param   guestErrorInfo      Guest error info to use.
- */
-/* static */ HRESULT GuestBase::setErrorExternal(VirtualBoxBase *pInterface,
-                                                 const Utf8Str &strAction, const GuestErrorInfo &guestErrorInfo)
-{
-    AssertPtrReturn(pInterface, E_POINTER);
-    return pInterface->setErrorBoth(VBOX_E_IPRT_ERROR,
-                                    guestErrorInfo.getRc(),
-                                    "%s", Utf8StrFmt("%s: %s", strAction.c_str(), GuestBase::getErrorAsString(guestErrorInfo).c_str()).c_str());
-}
 #endif /* VBOX_GUESTCTRL_TEST_CASE */
 

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -249 +249 @@
             char szDefine[80];
             RTErrQueryDefine(rcGuest, szDefine, sizeof(szDefine), false /*fFailIfUnknown*/);
-            strErr = Utf8StrFmt("Error %s for guest directory \"%s\" occurred\n", szDefine, pcszWhat);
+            strErr = Utf8StrFmt(tr("Error %s for guest directory \"%s\" occurred\n"), szDefine, pcszWhat);
             break;
         }
@@ -414 +414 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, tr("Closing guest directory failed"),
-                                      GuestErrorInfo(GuestErrorInfo::Type_Directory, rcGuest, mData.mOpenInfo.mPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, mData.mOpenInfo.mPath.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Closing guest directory failed: %s"),
+                                       GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             case VERR_NOT_SUPPORTED:
                 /* Silently skip old Guest Additions which do not support killing the
@@ -455 +457 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, tr("Reading guest directory failed"),
-                                      GuestErrorInfo(GuestErrorInfo::Type_ToolLs, rcGuest, mData.mOpenInfo.mPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolLs, rcGuest, mData.mOpenInfo.mPath.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Reading guest directory failed: %s"),
+                                       GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             case VERR_GSTCTL_PROCESS_EXIT_CODE:
                 hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" failed: %Rrc"),

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -1388 +1388 @@
     {
         if (vrc == VERR_GSTCTL_GUEST_ERROR)
-            return setErrorExternal(this, tr("Closing guest file failed"),
-                                    GuestErrorInfo(GuestErrorInfo::Type_File, rcGuest, mData.mOpenInfo.mFilename.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_File, rcGuest, mData.mOpenInfo.mFilename.c_str());
+            return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Closing guest file failed: %s"),
+                                     GuestBase::getErrorAsString(ge).c_str());
+        }
         return setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Closing guest file \"%s\" failed with %Rrc\n"),
                             mData.mOpenInfo.mFilename.c_str(), vrc);
@@ -1428 +1431 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hr = setErrorExternal(this, tr("Querying guest file information failed"),
-                                  GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, mData.mOpenInfo.mFilename.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, mData.mOpenInfo.mFilename.c_str());
+            hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file information failed: %s"),
+                                   GuestBase::getErrorAsString(ge).c_str());
+        }
         else
             hr = setErrorVrc(vrc,
@@ -1458 +1464 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hr = setErrorExternal(this, tr("Querying guest file size failed"),
-                                  GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, mData.mOpenInfo.mFilename.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, mData.mOpenInfo.mFilename.c_str());
+            hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file size failed: %s"),
+                                   GuestBase::getErrorAsString(ge).c_str());
+        }
         else
             hr = setErrorVrc(vrc, tr("Querying guest file size for \"%s\" failed: %Rrc"), mData.mOpenInfo.mFilename.c_str(), vrc);

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -633 +633 @@
         {
             vrc = RTTimerLRCreate(&mStatTimer, aStatisticsUpdateInterval * RT_MS_1SEC, &Guest::i_staticUpdateStats, this);
-            AssertRCStmt(vrc, hrc = setErrorVrc(vrc, "Failed to create guest statistics update timer (%Rrc)", vrc));
+            AssertRCStmt(vrc, hrc = setErrorVrc(vrc, tr("Failed to create guest statistics update timer (%Rrc)"), vrc));
         }
         else if (aStatisticsUpdateInterval != mStatUpdateInterval)
         {
             vrc = RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval * RT_NS_1SEC_64);
-            AssertRCStmt(vrc, hrc = setErrorVrc(vrc, "Failed to change guest statistics update timer interval from %u to %u failed (%Rrc)",
+            AssertRCStmt(vrc, hrc = setErrorVrc(vrc, tr("Failed to change guest statistics update timer interval from %u to %u failed (%Rrc)"),
                                                 mStatUpdateInterval, aStatisticsUpdateInterval, vrc));
             if (mStatUpdateInterval == 0)
             {
                 vrc = RTTimerLRStart(mStatTimer, 0);
-                AssertRCStmt(vrc, hrc = setErrorVrc(vrc, "Failed to start the guest statistics update timer (%Rrc)", vrc));
+                AssertRCStmt(vrc, hrc = setErrorVrc(vrc, tr("Failed to start the guest statistics update timer (%Rrc)"), vrc));
             }
         }
@@ -651 +651 @@
     {
         vrc = RTTimerLRStop(mStatTimer);
-        AssertRCStmt(vrc, hrc = setErrorVrc(vrc, "Failed to stop the guest statistics update timer (%Rrc)", vrc));
+        AssertRCStmt(vrc, hrc = setErrorVrc(vrc, tr("Failed to stop the guest statistics update timer (%Rrc)"), vrc));
     }
 

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -1785 +1785 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, Utf8StrFmt("Reading %RU32 bytes from guest process handle %RU32 failed", aToRead, aHandle),
-                                      GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Reading %RU32 bytes from guest process handle %RU32 failed: %s"),
+                                       aToRead, aHandle, GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading from guest process \"%s\" (PID %RU32) failed: %Rrc"),
@@ -1817 +1819 @@
         switch (vrc)
         {
-           case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, "Terminating guest process failed",
-                                      GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str()));
-                break;
-
+            case VERR_GSTCTL_GUEST_ERROR:
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Terminating guest process failed: %s"),
+                                       GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             case VERR_NOT_SUPPORTED:
                 hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
@@ -1877 +1881 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, Utf8StrFmt("Waiting for guest process (flags %#x) failed", aWaitFor),
-                                      GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Waiting for guest process (flags %#x) failed: %s"),
+                                       aWaitFor, GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             case VERR_TIMEOUT:
                 *aReason = ProcessWaitResult_Timeout;
@@ -1931 +1937 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hr = setErrorExternal(this, Utf8StrFmt("Writing %RU32 bytes (flags %#x) to guest process failed", cbData, aFlags),
-                                      GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, mData.mProcess.mExecutable.c_str());
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Writing %RU32 bytes (flags %#x) to guest process failed: %s"),
+                                       cbData, aFlags, GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Writing to guest process \"%s\" (PID %RU32) failed: %Rrc"),

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -2790 +2790 @@
      */
     if (mData.mProtocolVersion < 2)
-        LogRelMax(3, (tr("Warning: Guest Additions v%u.%u.%u only supports the older guest control protocol version %u.\n"
-                         "         Please upgrade GAs to the current version to get full guest control capabilities.\n"),
+        LogRelMax(3, ("Warning: Guest Additions v%u.%u.%u only supports the older guest control protocol version %u.\n"
+                      "         Please upgrade GAs to the current version to get full guest control capabilities.\n",
                       VBOX_FULL_VERSION_GET_MAJOR(uGaVersion), VBOX_FULL_VERSION_GET_MINOR(uGaVersion),
                       VBOX_FULL_VERSION_GET_BUILD(uGaVersion), mData.mProtocolVersion));
@@ -3063 +3063 @@
     {
         if (vrc == VERR_GSTCTL_GUEST_ERROR)
-            return setErrorExternal(this, tr("Closing guest session failed"),
-                                    GuestErrorInfo(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str());
+            return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Closing guest session failed: %s"),
+                                     GuestBase::getErrorAsString(ge).c_str());
+        }
         return setError(VBOX_E_IPRT_ERROR, tr("Closing guest session \"%s\" failed with %Rrc"),
                         mData.mSession.mName.c_str(), vrc);
@@ -3165 +3168 @@
         {
             if (GuestProcess::i_isGuestError(vrc))
-                return setErrorExternal(this, tr("Querying type for guest source failed"),
-                                        GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, (*itSource).c_str()));
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, (*itSource).c_str());
+                return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying type for guest source failed: %s"),
+                                         GuestBase::getErrorAsString(ge).c_str());
+            }
             else
                 return setError(E_FAIL, tr("Querying type for guest source \"%s\" failed: %Rrc"), (*itSource).c_str(), vrc);
@@ -3388 +3394 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hrc = setErrorExternal(this, tr("Guest directory creation failed"),
-                                   GuestErrorInfo(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
+            return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Guest directory creation failed: %s"),
+                                     GuestBase::getErrorAsString(ge).c_str());
+        }
         else
         {
@@ -3435 +3444 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Temporary guest directory creation failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_ToolMkTemp, rcGuest, aPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolMkTemp, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Temporary guest directory creation failed: %s"),
+                                         GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Temporary guest directory creation \"%s\" with template \"%s\" failed: %Rrc"),
@@ -3478 +3489 @@
                         break;
                     default:
-                        hrc = setErrorExternal(this, "Querying directory existence failed",
-                                               GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str()));
+                    {
+                        GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying directory existence failed: %s"),
+                                                 GuestBase::getErrorAsString(ge).c_str());
                         break;
+                    }
                 }
                 break;
@@ -3547 +3561 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Opening guest directory failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Opening guest directory failed: %s"),
+                                         GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Opening guest directory \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
@@ -3586 +3602 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Removing guest directory failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Removing guest directory failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Removing guest directory \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
@@ -3666 +3684 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Recursively removing guest directory failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Recursively removing guest directory failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recursively removing guest directory \"%s\" failed: %Rrc"),
@@ -3811 +3831 @@
 
                 default:
-                    hrc = setErrorExternal(this, tr("Querying guest file existence failed"),
-                                           GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str()));
+                {
+                    GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
+                    hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file existence failed: %s"),
+                                            GuestBase::getErrorAsString(ge).c_str());
                     break;
+                }
             }
 
@@ -3929 +3952 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Opening guest file failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_File, rcGuest, aPath.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_File, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Opening guest file failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Opening guest file \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
@@ -3960 +3985 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hrc = setErrorExternal(this, tr("Querying guest file size failed"),
-                                   GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file size failed: %s"),
+                                    GuestBase::getErrorAsString(ge).c_str());
+        }
         else
             hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Querying guest file size of \"%s\" failed: %Rrc"),
@@ -4002 +4030 @@
             }
             else
-                hrc = setErrorExternal(this, tr("Querying guest file existence information failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str()));
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file existence information failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+            }
         }
         else
@@ -4041 +4072 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hrc = setErrorExternal(this, tr("Querying guest file information failed"),
-                                   GuestErrorInfo(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file information failed: %s"),
+                                    GuestBase::getErrorAsString(ge).c_str());
+        }
         else
             hrc = setErrorVrc(vrc, tr("Querying guest file information for \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
@@ -4066 +4100 @@
     {
         if (GuestProcess::i_isGuestError(vrc))
-            hrc = setErrorExternal(this, tr("Removing guest file failed"),
-                                   GuestErrorInfo(GuestErrorInfo::Type_ToolRm, rcGuest, aPath.c_str()));
+        {
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolRm, rcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Removing guest file failed: %s"),
+                                    GuestBase::getErrorAsString(ge).c_str());
+        }
         else
             hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Removing guest file \"%s\" failed: %Rrc"), aPath.c_str(), vrc);
@@ -4125 +4162 @@
 
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Renaming guest path failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_Process, rcGuest, aSource.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, aSource.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Renaming guest path failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             default:
                 hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Renaming guest path \"%s\" failed: %Rrc"),
@@ -4360 +4399 @@
         {
             case VERR_GSTCTL_GUEST_ERROR:
-                hrc = setErrorExternal(this, tr("Waiting for guest process failed"),
-                                       GuestErrorInfo(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str()));
-                break;
-
+            {
+                GuestErrorInfo ge(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Waiting for guest process failed: %s"),
+                                        GuestBase::getErrorAsString(ge).c_str());
+                break;
+            }
             case VERR_TIMEOUT:
                 *aReason = GuestSessionWaitResult_Timeout;

trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp

@@ -1160 +1160 @@
                 hrc = S_OK;
             else if (vrc == VERR_NOT_FOUND)
-                hrc = setErrorBoth(E_FAIL, vrc, "Plug-in '%s' was not found", aName.c_str());
+                hrc = setErrorBoth(E_FAIL, vrc, tr("Plug-in '%s' was not found"), aName.c_str());
             else
-                hrc = setErrorVrc(vrc, "Error unloading '%s': %Rrc", aName.c_str(), vrc);
+                hrc = setErrorVrc(vrc, tr("Error unloading '%s': %Rrc"), aName.c_str(), vrc);
         }
     }
@@ -1237 +1237 @@
                     aDmesg.jolt();
                 else if (vrc == VERR_BUFFER_OVERFLOW)
-                    hrc = setError(E_FAIL, "Too much log available, must use the maxMessages parameter to restrict.");
+                    hrc = setError(E_FAIL, tr("Too much log available, must use the maxMessages parameter to restrict."));
                 else
                     hrc = setErrorVrc(vrc);
@@ -1245 +1245 @@
         }
         else
-            hrc = setError(E_FAIL, "The dmesg interface isn't implemented by guest OS digger, or detectOS() has not been called.");
+            hrc = setError(E_FAIL, tr("The dmesg interface isn't implemented by guest OS digger, or detectOS() has not been called."));
     }
     return hrc;
@@ -1540 +1540 @@
 
     if (!ptrVM.isOk())
-        return setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
+        return setError(VBOX_E_INVALID_VM_STATE, tr("Machine is not running"));
 
     STAMR3Reset(ptrVM.rawUVM(), aPattern.c_str());
@@ -1558 +1558 @@
 
     if (!ptrVM.isOk())
-        return setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
+        return setError(VBOX_E_INVALID_VM_STATE, tr("Machine is not running"));
 
     STAMR3Dump(ptrVM.rawUVM(), aPattern.c_str());
@@ -1577 +1577 @@
     Console::SafeVMPtrQuiet ptrVM(mParent);
     if (!ptrVM.isOk())
-        return setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
+        return setError(VBOX_E_INVALID_VM_STATE, tr("Machine is not running"));
 
     char *pszSnapshot;
@@ -1621 +1621 @@
     }
     else
-        hrc = setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
+        hrc = setError(VBOX_E_INVALID_VM_STATE, tr("Machine is not running"));
     return hrc;
 }
@@ -1670 +1670 @@
         }
         else
-            hrc = setError(VBOX_E_INVALID_VM_STATE, "A sample report is already in progress");
+            hrc = setError(VBOX_E_INVALID_VM_STATE, tr("A sample report is already in progress"));
     }
 

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -162 +162 @@
     {
         if (ASMAtomicIncU32(&g_cInstances) != 1)
-            AssertFailedStmt(throw setError(E_FAIL, tr("Attempted to create more than one VirtualBoxClient instance")));
+            AssertFailedStmt(throw setError(E_FAIL, "Attempted to create more than one VirtualBoxClient instance"));
 
         mData.m_ThreadWatcher = NIL_RTTHREAD;
@@ -182 +182 @@
 
         rc = unconst(mData.m_pEventSource).createObject();
-        AssertComRCThrow(rc, setError(rc, tr("Could not create EventSource for VirtualBoxClient")));
+        AssertComRCThrow(rc, setError(rc, "Could not create EventSource for VirtualBoxClient"));
         rc = mData.m_pEventSource->init();
-        AssertComRCThrow(rc, setError(rc, tr("Could not initialize EventSource for VirtualBoxClient")));
+        AssertComRCThrow(rc, setError(rc, "Could not initialize EventSource for VirtualBoxClient"));
 
         /* HACK ALERT! This is for DllCanUnloadNow(). */
@@ -195 +195 @@
         mData.m_pVBoxTranslator = VirtualBoxTranslator::instance();
         if (mData.m_pVBoxTranslator == NULL)
-            throw setError(VBOX_E_IPRT_ERROR, tr("Failed to create translator instance"));
+            throw setError(VBOX_E_IPRT_ERROR, "Failed to create translator instance");
 
         char szNlsPath[RTPATH_MAX];

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -939 +939 @@
         return hVfsIosPt;
 
-    setErrorVrc(vrc, "RTManifestEntryAddPassthruIoStream failed with rc=%Rrc", vrc);
+    setErrorVrc(vrc, tr("RTManifestEntryAddPassthruIoStream failed with rc=%Rrc"), vrc);
     return NIL_RTVFSIOSTREAM;
 }

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -1326 +1326 @@
     HRESULT hrc = S_OK;
     bool fKeepDownloadedObject = false;//in the future should be passed from the caller
-    Utf8Str strLastActualErrorDesc("No errors");
 
     /* Clear the list of imported machines, if any */
@@ -1533 +1532 @@
             if (FAILED(hrc))
             {
-                strLastActualErrorDesc = Utf8StrFmt("%s: Cloud import (cloud phase) failed. "
-                        "Used cloud instance is \'%s\'\n", __FUNCTION__, strInsId.c_str());
-
-                LogRel((strLastActualErrorDesc.c_str()));
-                hrc = setError(hrc, strLastActualErrorDesc.c_str());
+                LogRel(("%s: Cloud import (cloud phase) failed. "
+                        "Used cloud instance is \'%s\'\n", __FUNCTION__, strInsId.c_str()));
+                hrc = setError(hrc, tr("%s: Cloud import (cloud phase) failed. "
+                               "Used cloud instance is \'%s\'\n"), __FUNCTION__, strInsId.c_str());
                 break;
             }
@@ -1596 +1594 @@
     if (FAILED(hrc))
     {
-        /** @todo r=bird: Using heap to keep a readonly C-string is a real wonderful
-         *        way to doing things. */
-        Utf8Str generalRollBackErrorMessage("Rollback action for Import Cloud operation failed. "
-                                            "Some leavings may exist on the local disk or in the Cloud.");
+        const char *pszGeneralRollBackErrorMessage = tr("Rollback action for Import Cloud operation failed. "
+                                                        "Some leavings may exist on the local disk or in the Cloud.");
         /*
          * Roll-back actions.
@@ -1620 +1616 @@
                 GET_VSD_DESCRIPTION_BY_TYPE(VirtualSystemDescriptionType_HardDiskImage)//aVBoxValues is set in this #define
                 if (aVBoxValues.size() == 0)
-                    hrc = setErrorVrc(VERR_NOT_FOUND, generalRollBackErrorMessage.c_str());
+                    hrc = setErrorVrc(VERR_NOT_FOUND, pszGeneralRollBackErrorMessage);
                 else
                 {
@@ -1631 +1627 @@
                         if (RT_FAILURE(vrc))
                         {
-                            hrc = setErrorVrc(vrc, generalRollBackErrorMessage.c_str());
+                            hrc = setErrorVrc(vrc, pszGeneralRollBackErrorMessage);
                             LogRel(("%s: Rollback action - the object %s hasn't been deleted\n", __FUNCTION__, vsdData.c_str()));
                         }
@@ -1707 +1703 @@
             vrc = RTVfsIoStrmOpenNormal(strAbsSrcPath.c_str(), RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE, &hVfsIosSrc);
             if (RT_FAILURE(vrc))
-            {
-                strLastActualErrorDesc = Utf8StrFmt("Error opening '%s' for reading (%Rrc)\n", strAbsSrcPath.c_str(), vrc);
-                throw setErrorVrc(vrc, strLastActualErrorDesc.c_str());
-            }
+                throw setErrorVrc(vrc, tr("Error opening '%s' for reading (%Rrc)\n"), strAbsSrcPath.c_str(), vrc);
 
             vrc = RTZipTarFsStreamFromIoStream(hVfsIosSrc, 0 /*fFlags*/, &hVfsFssObject);
             RTVfsIoStrmRelease(hVfsIosSrc);
             if (RT_FAILURE(vrc))
-            {
-                strLastActualErrorDesc = Utf8StrFmt("Error reading the downloaded file '%s' (%Rrc)", strAbsSrcPath.c_str(), vrc);
-                throw setErrorVrc(vrc, strLastActualErrorDesc.c_str());
-            }
+                throw setErrorVrc(vrc, tr("Error reading the downloaded file '%s' (%Rrc)"), strAbsSrcPath.c_str(), vrc);
 
             /* Create a new virtual system and work directly on the list copy. */
@@ -1923 +1913 @@
                         {
                             hrc = aRc;
-                            strLastActualErrorDesc.printf("%s: Processing the downloaded object was failed. The exception (%Rhrc)\n",
-                                                          __FUNCTION__, hrc);
-                            LogRel((strLastActualErrorDesc.c_str()));
+                            LogRel(("%s: Processing the downloaded object was failed. The exception (%Rhrc)\n",
+                                    __FUNCTION__, hrc));
                         }
                         catch (int aRc)
                         {
                             hrc = setErrorVrc(aRc);
-                            strLastActualErrorDesc.printf("%s: Processing the downloaded object was failed. The exception (%Rrc/%Rhrc)\n",
-                                                          __FUNCTION__, aRc, hrc);
-                            LogRel((strLastActualErrorDesc.c_str()));
+                            LogRel(("%s: Processing the downloaded object was failed. The exception (%Rrc/%Rhrc)\n",
+                                    __FUNCTION__, aRc, hrc));
                         }
                         catch (...)
                         {
                             hrc = setErrorVrc(VERR_UNEXPECTED_EXCEPTION);
-                            strLastActualErrorDesc.printf("%s: Processing the downloaded object was failed. The exception (VERR_UNEXPECTED_EXCEPTION/%Rhrc)\n",
-                                                          __FUNCTION__, hrc);
-                            LogRel((strLastActualErrorDesc.c_str()));
+                            LogRel(("%s: Processing the downloaded object was failed. The exception (VERR_UNEXPECTED_EXCEPTION/%Rhrc)\n",
+                                    __FUNCTION__, hrc));
                         }
                     }
@@ -2073 +2060 @@
         {
             hrc = aRc;
-            strLastActualErrorDesc.printf("%s: Cloud import (local phase) failed. The exception (%Rhrc)\n",
-                                          __FUNCTION__, hrc);
-            LogRel((strLastActualErrorDesc.c_str()));
+            LogRel(("%s: Cloud import (local phase) failed. The exception (%Rhrc)\n",
+                    __FUNCTION__, hrc));
         }
         catch (int aRc)
         {
             hrc = setErrorVrc(aRc);
-            strLastActualErrorDesc.printf("%s: Cloud import (local phase) failed. The exception (%Rrc/%Rhrc)\n",
-                                          __FUNCTION__, aRc, hrc);
-            LogRel((strLastActualErrorDesc.c_str()));
+            LogRel(("%s: Cloud import (local phase) failed. The exception (%Rrc/%Rhrc)\n",
+                    __FUNCTION__, aRc, hrc));
         }
         catch (...)
         {
             hrc = setErrorVrc(VERR_UNRESOLVED_ERROR);
-            strLastActualErrorDesc.printf("%s: Cloud import (local phase) failed. The exception (VERR_UNRESOLVED_ERROR/%Rhrc)\n",
-                                          __FUNCTION__, hrc);
-            LogRel((strLastActualErrorDesc.c_str()));
+            LogRel(("%s: Cloud import (local phase) failed. The exception (VERR_UNRESOLVED_ERROR/%Rhrc)\n",
+                    __FUNCTION__, hrc));
         }
 
@@ -3237 +3221 @@
                     }
                     else
-                        hrc = setErrorVrc(vrc, "RTCrX509CertPathsSetValidTimeSpec failed: %Rrc", vrc);
+                        hrc = setErrorVrc(vrc, tr("RTCrX509CertPathsSetValidTimeSpec failed: %Rrc"), vrc);
                 }
                 else if (vrc == VERR_CR_X509_CPV_NO_TRUSTED_PATHS)
@@ -3313 +3297 @@
     if (pSignedData->SignerInfos.cItems > 1)
     {
-        RTStrPrintf(szSignatureBuf, sizeof(szSignatureBuf), tr("%s #%u"), pszSignature, iSigner + 1);
+        RTStrPrintf(szSignatureBuf, sizeof(szSignatureBuf), "%s #%u", pszSignature, iSigner + 1);
         pszSignature = szSignatureBuf;
     }
@@ -4819 +4803 @@
                 throw setError(aRC, Utf8Str(info.getText()).c_str());
             else
-                throw setError(aRC, "Unknown error during OVF import");
+                throw setError(aRC, tr("Unknown error during OVF import"));
         }
     }
@@ -5088 +5072 @@
                 throw setError(aRC, Utf8Str(info.getText()).c_str());
             else
-                throw setError(aRC, "Unknown error during OVF import");
+                throw setError(aRC, tr("Unknown error during OVF import"));
         }
     }

trunk/src/VBox/Main/src-server/CertificateImpl.cpp

@@ -417 +417 @@
     /* Insurance. */
     NOREF(aResult);
-    return setError(E_FAIL, "Unknown item %u", aWhat);
+    return setError(E_FAIL, tr("Unknown item %u"), aWhat);
 }
 
@@ -568 +568 @@
                 vrc = RTAsn1EncodeToBuffer(a_pAsn1Obj, 0, &a_rReturn.front(), a_rReturn.size(), NULL);
                 if (RT_FAILURE(vrc))
-                    hrc = setErrorVrc(vrc, "RTAsn1EncodeToBuffer failed with %Rrc", vrc);
+                    hrc = setErrorVrc(vrc, tr("RTAsn1EncodeToBuffer failed with %Rrc"), vrc);
             }
         }
         else
-            hrc = setErrorVrc(vrc, "RTAsn1EncodePrepare failed with %Rrc", vrc);
+            hrc = setErrorVrc(vrc, tr("RTAsn1EncodePrepare failed with %Rrc"), vrc);
     }
     return hrc;

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -1017 +1017 @@
                 continue;
             }
-            return setErrorBoth(VBOX_E_FILE_ERROR, vrc, "Reading '%s' failed: %Rrc - %s",
+            return setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Reading '%s' failed: %Rrc - %s"),
                                 m->strLeasesFilename.c_str(), vrc, e.what());
         }
@@ -1023 +1023 @@
         {
             if (e.what())
-                return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: %s", m->strLeasesFilename.c_str(), e.what());
-            return setError(VBOX_E_FILE_ERROR, "Reading '%s' failed: RTCError", m->strLeasesFilename.c_str());
+                return setError(VBOX_E_FILE_ERROR, tr("Reading '%s' failed: %s"), m->strLeasesFilename.c_str(), e.what());
+            return setError(VBOX_E_FILE_ERROR, tr("Reading '%s' failed: RTCError"), m->strLeasesFilename.c_str());
         }
         catch (std::bad_alloc &)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -3917 +3917 @@
     {
         RTVfsDirRelease(hVfsDir);
-        return setError(E_OUTOFMEMORY, "Out of memory! (direntry buffer)");
+        return setError(E_OUTOFMEMORY, tr("Out of memory! (direntry buffer)"));
     }
 
@@ -3934 +3934 @@
                 if (pDirEntry)
                     continue;
-                hrc = setError(E_OUTOFMEMORY, "Out of memory! (direntry buffer)");
+                hrc = setError(E_OUTOFMEMORY, tr("Out of memory! (direntry buffer)"));
             }
             else if (rc != VERR_NO_MORE_FILES)
-                hrc = setError(VBOX_E_IPRT_ERROR, "RTVfsDirReadEx failed: %Rrc", rc);
+                hrc = setError(VBOX_E_IPRT_ERROR, tr("RTVfsDirReadEx failed: %Rrc"), rc);
             break;
         }
@@ -3951 +3951 @@
                 try
                 {
-                    aDriveList.push_back(std::pair<com::Utf8Str, com::Utf8Str>(szPhysicalDrive, "Unknown (Access denied)"));
+                    aDriveList.push_back(std::pair<com::Utf8Str, com::Utf8Str>(szPhysicalDrive, tr("Unknown (Access denied)")));
                 }
                 catch (std::bad_alloc &)
                 {
-                    hrc = setError(E_OUTOFMEMORY, "Out of memory");
+                    hrc = setError(E_OUTOFMEMORY, tr("Out of memory"));
                     break;
                 }
@@ -4000 +4000 @@
             catch (std::bad_alloc &)
             {
-                hrc = setError(E_OUTOFMEMORY, "Out of memory");
+                hrc = setError(E_OUTOFMEMORY, tr("Out of memory"));
                 break;
             }

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -620 +620 @@
     if (aIPV6NetworkMaskPrefixLength > 128)
         return mVirtualBox->setErrorBoth(E_INVALIDARG, VERR_INVALID_PARAMETER,
-                   "Invalid IPv6 prefix length");
+                   tr("Invalid IPv6 prefix length"));
 
     int rc;
@@ -631 +631 @@
     if (RT_FAILURE(rc))
     {
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc, "Invalid IPv6 address");
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc, tr("Invalid IPv6 address"));
     }
 

trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp

@@ -214 +214 @@
         {
             if (RT_FAILURE(vrc))
-                hr = pVirtualBox->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, "Failed to get webcam list: %Rrc", vrc);
+                hr = pVirtualBox->setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                               HostVideoInputDevice::tr("Failed to get webcam list: %Rrc"), vrc);
         }
     }

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -2961 +2961 @@
     // get the client's IInternalSessionControl interface
     ComPtr<IInternalSessionControl> pSessionControl = aSession;
-    ComAssertMsgRet(!!pSessionControl, ("No IInternalSessionControl interface"),
+    ComAssertMsgRet(!!pSessionControl, (tr("No IInternalSessionControl interface")),
                     E_INVALIDARG);
 
@@ -3562 +3562 @@
     ComObjPtr<Medium> medium = static_cast<Medium*>(aM);
     if (aMedium && medium.isNull())
-        return setError(E_INVALIDARG, "The given medium pointer is invalid");
+        return setError(E_INVALIDARG, tr("The given medium pointer is invalid"));
 
     AutoCaller mediumCaller(medium);
@@ -4450 +4450 @@
     ComObjPtr<BandwidthGroup> group = static_cast<BandwidthGroup*>(iB);
     if (aBandwidthGroup && group.isNull())
-        return setError(E_INVALIDARG, "The given bandwidth group pointer is invalid");
+        return setError(E_INVALIDARG, tr("The given bandwidth group pointer is invalid"));
 
     AutoWriteLock attLock(pAttach COMMA_LOCKVAL_SRC_POS);
@@ -4530 +4530 @@
     ComObjPtr<Medium> pMedium = static_cast<Medium*>(iM);
     if (aMedium && pMedium.isNull())
-        return setError(E_INVALIDARG, "The given medium pointer is invalid");
+        return setError(E_INVALIDARG, tr("The given medium pointer is invalid"));
 
     AutoCaller mediumCaller(pMedium);
@@ -5267 +5267 @@
         ComObjPtr<Medium> pMedium = static_cast<Medium*>(pIMedium);
         if (pMedium.isNull())
-            return setError(E_INVALIDARG, "The given medium pointer with index %d is invalid", i);
+            return setError(E_INVALIDARG, tr("The given medium pointer with index %d is invalid"), i);
         SafeArray<BSTR> ids;
         rc = pMedium->COMGETTER(MachineIds)(ComSafeArrayAsOutParam(ids));
@@ -13503 +13503 @@
             }
         }
-        ComAssertMsgRet(found, ("The session is not found in the session list!"),
+        ComAssertMsgRet(found, (tr("The session is not found in the session list!")),
                          E_INVALIDARG);
     }

trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

@@ -873 +873 @@
          * IMachine corresponding to a mutable machine as d->pSrcMachine */
         if (d->pSrcMachine->i_isSessionMachine())
-            throw p->setError(E_INVALIDARG, "The source machine is mutable");
+            throw p->setError(E_INVALIDARG, tr("The source machine is mutable"));
 
         /* Handle the special case that someone is requesting a _full_ clone
@@ -1048 +1048 @@
 
         if (RT_FAILURE(vrc))
-            p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, "Could not create machine clone thread (%Rrc)", vrc);
+            p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not create machine clone thread (%Rrc)"), vrc);
     }
     catch (HRESULT rc2)

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -1000 +1000 @@
 
             for (ULONG i = operation + 1; i < operationCount - operation; ++i)
-                taskMoveVM->m_pProgress->SetNextOperation(BstrFmt("Skip the empty operation %d...", i + 1).raw(), 1);
+                taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(tr("Skip the empty operation %d..."), i + 1).raw(), 1);
 
             hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediumsMap);
@@ -1027 +1027 @@
             {
                 Log2(("Rollback scenario: can't delete new destination folder.\n"));
-                throw machine->setErrorVrc(vrc, "Rollback scenario: can't delete new destination folder.");
+                throw machine->setErrorVrc(vrc, tr("Rollback scenario: can't delete new destination folder."));
             }
 
@@ -1101 +1101 @@
 
         for (ULONG i = operation; i < operation + taskMoveVM->m_finalMediumsMap.size() - 1; ++i)
-            taskMoveVM->m_pProgress->SetNextOperation(BstrFmt("Skip the empty operation %d...", i).raw(), 1);
+            taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(tr("Skip the empty operation %d..."), i).raw(), 1);
 
         hrc = taskMoveVM->deleteFiles(originalFiles);
@@ -1341 +1341 @@
     {
         Log2(("Deleting file %s ...\n", listOfFiles.at(i).c_str()));
-        hrc = m_pProgress->SetNextOperation(BstrFmt("Deleting file %s...", listOfFiles.at(i).c_str()).raw(), 1);
+        hrc = m_pProgress->SetNextOperation(BstrFmt(tr("Deleting file %s..."), listOfFiles.at(i).c_str()).raw(), 1);
         if (FAILED(hrc)) return hrc;
 

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -2269 +2269 @@
             ++m->readers;
 
-            ComAssertMsgBreak(m->readers != 0, ("Counter overflow"), rc = E_FAIL);
+            ComAssertMsgBreak(m->readers != 0, (tr("Counter overflow")), rc = E_FAIL);
 
             /* Remember pre-lock state */
@@ -2321 +2321 @@
         case MediumState_LockedRead:
         {
-            ComAssertMsgBreak(m->readers != 0, ("Counter underflow"), rc = E_FAIL);
+            ComAssertMsgBreak(m->readers != 0, (tr("Counter underflow")), rc = E_FAIL);
             --m->readers;
 
@@ -6994 +6994 @@
 {
     RT_NOREF(aTarget);
-    return (m->fMoveThisMedium == true) ? true:false; /** @todo r=bird: this is not an obfuscation contest! */
+    return m->fMoveThisMedium;
 }
 
@@ -7762 +7762 @@
 
                 ComAssertMsgRet(!m->formatObj->i_getFileExtensions().empty(),
-                                ("Must be at least one extension if it is MediumFormatCapabilities_File\n"),
+                                (tr("Must be at least one extension if it is MediumFormatCapabilities_File\n")),
                                 E_FAIL);
 
                 Utf8Str strExt = m->formatObj->i_getFileExtensions().front();
                 ComAssertMsgRet(!strExt.isEmpty(),
-                                ("Default extension must not be empty\n"),
+                                (tr("Default extension must not be empty\n")),
                                 E_FAIL);
 

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -152 +152 @@
 {
     return setError(E_FAIL,
-               "Unable to change settings"
-               " while NATNetwork instance is running");
+                    tr("Unable to change settings"
+                       " while NATNetwork instance is running"));
 }
 
@@ -287 +287 @@
     rc = RTNetStrToIPv4Cidr(aIPv4NetworkCidr.c_str(), &Net, &iPrefix);
     if (RT_FAILURE(rc))
-        return setError(E_FAIL, "%s is not a valid IPv4 CIDR notation",
+        return setError(E_FAIL, tr("%s is not a valid IPv4 CIDR notation"),
                         aIPv4NetworkCidr.c_str());
 
@@ -297 +297 @@
      */
     if (iPrefix > 30)
-        return setError(E_FAIL, "%s network is too small", aIPv4NetworkCidr.c_str());
+        return setError(E_FAIL, tr("%s network is too small"), aIPv4NetworkCidr.c_str());
 
     rc = RTNetPrefixToMaskIPv4(iPrefix, &Mask);
@@ -306 +306 @@
     if ((Net.u & ~Mask.u) != 0)
         return setError(E_FAIL,
-            "%s: the specified address is longer than the specified prefix",
+            tr("%s: the specified address is longer than the specified prefix"),
             aIPv4NetworkCidr.c_str());
 
@@ -442 +442 @@
         if (RT_FAILURE(rc))
             return setError(E_INVALIDARG,
-                            "%s is not a valid IPv6 prefix",
+                            tr("%s is not a valid IPv6 prefix"),
                             aIPv6Prefix.c_str());
 
@@ -450 +450 @@
         else if (iPrefixLength != 64)
             return setError(E_INVALIDARG,
-                            "Invalid IPv6 prefix length %d, must be 64",
+                            tr("Invalid IPv6 prefix length %d, must be 64"),
                             iPrefixLength);
 
@@ -457 +457 @@
             && ((Net6.au8[0] & 0xfe) != 0xfc)) /* local  fc00::/7 */
             return setError(E_INVALIDARG,
-                            "IPv6 prefix %RTnaipv6 is not unicast",
+                            tr("IPv6 prefix %RTnaipv6 is not unicast"),
                             &Net6);
 
@@ -463 +463 @@
         if (Net6.au64[1] != 0)
             return setError(E_INVALIDARG,
-                            "Non-zero bits in the interface ID part"
-                            " of the IPv6 prefix %RTnaipv6/64",
+                            tr("Non-zero bits in the interface ID part"
+                               " of the IPv6 prefix %RTnaipv6/64"),
                             &Net6);
 
@@ -473 +473 @@
                 return setError(E_OUTOFMEMORY);
             else
-                return setError(E_FAIL, "Internal error");
+                return setError(E_FAIL, tr("Internal error"));
         }
     }
@@ -489 +489 @@
         /* only allow prefix to be empty if IPv6 is disabled */
         if (strNormalizedIPv6Prefix.isEmpty() && m->s.fIPv6Enabled)
-            return setError(E_FAIL, "Setting an empty IPv6 prefix when IPv6 is enabled");
+            return setError(E_FAIL, tr("Setting an empty IPv6 prefix when IPv6 is enabled"));
 
         /**

trunk/src/VBox/Main/src-server/PerformanceImpl.cpp

@@ -381 +381 @@
 
     if (FAILED(rc))
-        return setError(E_FAIL, "Failed to setup metrics for '%s'",
+        return setError(E_FAIL, tr("Failed to setup metrics for '%s'"),
                         getFailedGuestName().c_str());
     return rc;
@@ -417 +417 @@
 
     if (FAILED(rc))
-        return setError(E_FAIL, "Failed to enable metrics for '%s'",
+        return setError(E_FAIL, tr("Failed to enable metrics for '%s'"),
                         getFailedGuestName().c_str());
     return rc;
@@ -453 +453 @@
 
     if (FAILED(rc))
-        return setError(E_FAIL, "Failed to disable metrics for '%s'",
+        return setError(E_FAIL, tr("Failed to disable metrics for '%s'"),
                         getFailedGuestName().c_str());
     return rc;

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -1520 +1520 @@
 {
     if (mpInstaller == NULL)
-        return setErrorBoth(E_FAIL, VERR_WRONG_ORDER, "prepare() not yet called");
+        return setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("prepare() not yet called"));
 
     // Fetch all available storage controllers
@@ -2368 +2368 @@
 {
     if (aAuxiliaryBasePath.isEmpty())
-        return setError(E_INVALIDARG, "Empty base path is not allowed");
+        return setError(E_INVALIDARG, tr("Empty base path is not allowed"));
     if (!RTPathStartsWithRoot(aAuxiliaryBasePath.c_str()))
-        return setError(E_INVALIDARG, "Base path must be absolute");
+        return setError(E_INVALIDARG, tr("Base path must be absolute"));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);

trunk/src/VBox/Main/src-server/VRDEServerImpl.cpp

@@ -686 +686 @@
 
         if (FAILED(hrc))
-            return setError(hrc, "failed to query the library setting\n");
+            return setError(hrc, tr("failed to query the library setting\n"));
     }
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1394 +1394 @@
     NOREF(aSharedFolders);
 
-    return setError(E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, tr("Not yet implemented"));
 }
 
@@ -2441 +2441 @@
 
             if (format.isEmpty())
-                return setError(E_INVALIDARG, "Format must be Valid Type%s", format.c_str());
+                return setError(E_INVALIDARG, tr("Format must be Valid Type%s"), format.c_str());
 
             // enforce read-only for DVDs even if caller specified ReadWrite
@@ -2457 +2457 @@
 
          default:
-             return setError(E_INVALIDARG, "Device type must be HardDisk, DVD or Floppy %d", aDeviceType);
+             return setError(E_INVALIDARG, tr("Device type must be HardDisk, DVD or Floppy %d"), aDeviceType);
     }
 
@@ -2514 +2514 @@
 
         default:
-            return setError(E_INVALIDARG, "Device type must be HardDisk, DVD or Floppy %d", aDeviceType);
+            return setError(E_INVALIDARG, tr("Device type must be HardDisk, DVD or Floppy %d"), aDeviceType);
     }
 
@@ -2589 +2589 @@
     NOREF(aAutoMountPoint);
 
-    return setError(E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, tr("Not yet implemented"));
 }
 
@@ -2595 +2595 @@
 {
     NOREF(aName);
-    return setError(E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, tr("Not yet implemented"));
 }
 
@@ -4223 +4223 @@
                 if (mediumType == DeviceType_DVD)
                     return setError(E_INVALIDARG,
-                                    "Cannot mount DVD medium '%s' as floppy", strLocationFull.c_str());
+                                    tr("Cannot mount DVD medium '%s' as floppy"), strLocationFull.c_str());
                 else
                     return setError(E_INVALIDARG,
-                                    "Cannot mount floppy medium '%s' as DVD", strLocationFull.c_str());
+                                    tr("Cannot mount floppy medium '%s' as DVD"), strLocationFull.c_str());
             }
 

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -39 +39 @@
 #include "ProgressImpl.h"
 #include "VirtualBoxImpl.h"
+#include "VBoxNls.h"
 #include "Global.h"
 #include "netif.h"
 
 #define VBOXNETADPCTL_NAME "VBoxNetAdpCtl"
+
+DECLARE_TRANSLATION_CONTEXT(NetIfGeneric);
+
 
 static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char *pszOption, const char *pszMask)
@@ -204 +208 @@
     {
         hrc = progress->init(pVirtualBox, host,
-                             "Creating host only network interface",
+                             NetIfGeneric::tr("Creating host only network interface"),
                              FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
@@ -217 +221 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to get program path, vrc=%Rrc\n", vrc);
+                                           NetIfGeneric::tr("Failed to get program path, vrc=%Rrc\n"), vrc);
                 return vrc;
             }
@@ -266 +270 @@
                                                        COM_IIDOF(IHostNetworkInterface),
                                                        HostNetworkInterface::getStaticComponentName(),
-                                                       "Failed to get config info for %s (as reported by '" VBOXNETADPCTL_NAME " add')\n", szBuf);
+                                                       NetIfGeneric::tr("Failed to get config info for %s (as reported by 'VBoxNetAdpCtl add')\n"),
+                                                       szBuf);
                         }
                         else
@@ -285 +290 @@
                                                    COM_IIDOF(IHostNetworkInterface),
                                                    HostNetworkInterface::getStaticComponentName(),
-                                                   "Failed to execute '%s' - exit status: %d", szAdpCtl, vrc);
+                                                   NetIfGeneric::tr("Failed to execute '%s' - exit status: %d"), szAdpCtl, vrc);
                         vrc = VERR_INTERNAL_ERROR;
                     }
@@ -295 +300 @@
                                                COM_IIDOF(IHostNetworkInterface),
                                                HostNetworkInterface::getStaticComponentName(),
-                                               "Failed to execute '%s' (errno %d). Check permissions!",
+                                               NetIfGeneric::tr("Failed to execute '%s' (errno %d). Check permissions!"),
                                                szAdpCtl, errno);
                     pclose(fp);
@@ -307 +312 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to execute '%s' (errno %d / %Rrc). Check permissions!",
+                                           NetIfGeneric::tr("Failed to execute '%s' (errno %d / %Rrc). Check permissions!"),
                                            szAdpCtl, errno, vrc);
             }
@@ -352 +357 @@
         Utf8Str strIfName(ifname);
 
-        hrc = progress->init(pVirtualBox, host, "Removing host network interface", FALSE /* aCancelable */);
+        hrc = progress->init(pVirtualBox, host, NetIfGeneric::tr("Removing host network interface"), FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
         {
@@ -361 +366 @@
                                            COM_IIDOF(IHostNetworkInterface),
                                            HostNetworkInterface::getStaticComponentName(),
-                                           "Failed to execute '" VBOXNETADPCTL_NAME " %s remove' (%Rrc)",
+                                           NetIfGeneric::tr("Failed to execute 'VBoxNetAdpCtl %s remove' (%Rrc)"),
                                            strIfName.c_str(), vrc);
             else

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -46 +46 @@
 #include "ProgressImpl.h"
 #include "VirtualBoxImpl.h"
+#include "VBoxNls.h"
 #include "Global.h"
 #include "netif.h"
 #include "ThreadTask.h"
+
+DECLARE_TRANSLATION_CONTEXT(NetIfWin);
 
 #ifdef VBOX_WITH_NETFLT
@@ -1163 +1166 @@
     {
         hrc = progress->init(pVirtualBox, host,
-                             Bstr(_T("Creating host only network interface")).raw(),
+                             Bstr(NetIfWin::tr("Creating host only network interface")).raw(),
                              FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
@@ -1211 +1214 @@
     {
         hrc = progress->init(pVirtualBox, host,
-                             Bstr(_T("Removing host network interface")).raw(),
+                             Bstr(NetIfWin::tr("Removing host network interface")).raw(),
                              FALSE /* aCancelable */);
         if (SUCCEEDED(hrc))
@@ -1258 +1261 @@
             {
                 rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr("Enabling Dynamic Ip Configuration").raw(),
+                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
                                     FALSE /* aCancelable */);
                 if (SUCCEEDED(rc))
@@ -1316 +1319 @@
             {
                 rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr("Enabling Dynamic Ip Configuration").raw(),
+                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
                                     FALSE /* aCancelable */);
                 if (SUCCEEDED(rc))
@@ -1373 +1376 @@
             {
                 rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr("Enabling Dynamic Ip Configuration").raw(),
+                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
                                     FALSE /* aCancelable */);
                 if (SUCCEEDED(rc))
@@ -1428 +1431 @@
             {
                 rc = progress->init(pVBox, (IHostNetworkInterface*)pIf,
-                                    Bstr("Enabling Dynamic Ip Configuration").raw(),
+                                    Bstr(NetIfWin::tr("Enabling Dynamic Ip Configuration")).raw(),
                                     FALSE /* aCancelable */);
                 if (SUCCEEDED(rc))