Index: /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 67883)
+++ /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 67884)
@@ -332,5 +332,5 @@
 
     if (!test.isZero() && test.isValid())
-        return setError(E_INVALIDARG,  tr("A machine cannot have a UUID as its name"));
+        return setError(E_INVALIDARG, tr("A machine cannot have a UUID as its name"));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2900,5 +2900,5 @@
                     {
                         rc = setError(E_FAIL,
-                                      tr(" Unable to merge storage '%s'. Can't get storage UID "),
+                                      tr("Unable to merge storage '%s'. Can't get storage UID"),
                                       pTarget_local->i_getLocationFull().c_str());
                         throw rc;
@@ -2933,8 +2933,8 @@
                 if (it_sm == serialMapToStoragePath.end())
                 {
-                    LogFlowThisFunc((" Path to the storage wasn't found...\n "));
+                    LogFlowThisFunc(("Path to the storage wasn't found...\n"));
 
                     rc = setError(E_INVALIDARG,
-                                  tr(" Unable to merge storage '%s'. Path to the storage wasn't found. "),
+                                  tr("Unable to merge storage '%s'. Path to the storage wasn't found"),
                                   it_sm->second);
                     throw rc;
@@ -2945,5 +2945,5 @@
                 {
                     rc = setError(E_FAIL,
-                                  tr(" Unable to merge storage '%s'. Can't get the storage size. "),
+                                  tr("Unable to merge storage '%s'. Can't get the storage size"),
                                   it_sm->second);
                     throw rc;
@@ -2952,8 +2952,8 @@
                 if (commonSourceStoragesSize > (uint64_t)pcbFree)
                 {
-                    LogFlowThisFunc((" Not enough free space to merge...\n "));
+                    LogFlowThisFunc(("Not enough free space to merge...\n"));
 
                     rc = setError(E_OUTOFMEMORY,
-                                  tr(" Unable to merge storage '%s' - not enough free storage space. "),
+                                  tr("Unable to merge storage '%s'. Not enough free storage space"),
                                   it_sm->second);
                     throw rc;