Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38055)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38056)
@@ -1456,5 +1456,5 @@
                 || (iHighestId >= mHWData->mCPUCount))
                 return setError(E_INVALIDARG,
-                                tr("CPU hotplugging can't be disabled because the maximum number of CPUs is not equal to the amount of CPUs attached\n"));
+                                tr("CPU hotplugging can't be disabled because the maximum number of CPUs is not equal to the amount of CPUs attached"));
 
             setModified(IsModified_MachineData);
@@ -6255,4 +6255,10 @@
     CheckComArgOutPointerValid(pProgress);
 
+    /** @todo r=klaus disabled as there are apparently still cases which are
+     * not handled correctly */
+    if (mode == CloneMode_MachineAndChildStates)
+        return setError(VBOX_E_NOT_SUPPORTED,
+                        tr("The clone mode \"Machine and child states\" is not yet supported. Please try again in the next VirtualBox maintenance update"));
+
     /* Convert the options. */
     RTCList<CloneOptions_T> optList;
@@ -6264,8 +6270,8 @@
         if (!isSnapshotMachine())
             return setError(E_INVALIDARG,
-                            tr("Linked clone can only be created from a snapshot\n"));
+                            tr("Linked clone can only be created from a snapshot"));
         if (mode != CloneMode_MachineState)
             return setError(E_INVALIDARG,
-                            tr("Linked clone can only be created for a single machine state\n"));
+                            tr("Linked clone can only be created for a single machine state"));
     }
     AssertReturn(!(optList.contains(CloneOptions_KeepAllMACs) && optList.contains(CloneOptions_KeepNATMACs)), E_INVALIDARG);